[IMP] some view should not have group_by...
bzr revid: fp@tinyerp.com-20111001211529-0g2jccon81tbjrry
This commit is contained in:
parent
eee9eac9bd
commit
ff61502272
|
@ -156,14 +156,13 @@
|
|||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">res.users</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">form</field>
|
||||
<field name="view_id" ref="base.view_users_form"/>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" eval="False"/>
|
||||
</record>
|
||||
<record id="config_wizard_action_config_user_form" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_config_access_other_user"/>
|
||||
<field name="category_id" ref="base.category_administration_config"/>
|
||||
<field name="sequence">1000</field>
|
||||
<field name="state">done</field>
|
||||
</record>
|
||||
|
||||
|
||||
|
|
|
@ -71,6 +71,7 @@ class crm_case_stage(osv.osv):
|
|||
'on_change': fields.boolean('Change Probability Automatically', help="Setting this stage will change the probability automatically on the opportunity."),
|
||||
'requirements': fields.text('Requirements'),
|
||||
'section_ids':fields.many2many('crm.case.section', 'section_stage_rel', 'stage_id', 'section_id', 'Sections'),
|
||||
'case_default': fields.boolean('Common to All Teams', help="If you check this field, this stage will be proposed by default on each sales team. It will not assign this stage to existing teams."),
|
||||
}
|
||||
|
||||
_defaults = {
|
||||
|
@ -106,10 +107,14 @@ class crm_case_section(osv.osv):
|
|||
'working_hours': fields.float('Working Hours', digits=(16,2 )),
|
||||
'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'),
|
||||
}
|
||||
def _get_stage_common(self, cr, uid, context):
|
||||
ids = self.pool.get('crm.case.stage').search(cr, uid, [('case_default','=',1)], context=context)
|
||||
return ids
|
||||
|
||||
_defaults = {
|
||||
'active': lambda *a: 1,
|
||||
'allow_unlink': lambda *a: 1,
|
||||
'stage_ids': _get_stage_common
|
||||
}
|
||||
|
||||
_sql_constraints = [
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
<field name="action_id" ref="crm_case_stage_form_installer"/>
|
||||
<field name="category_id" ref="base.category_sales_management_config"/>
|
||||
<field name="groups_id" eval="[(6, 0, [ref('base.group_extended')])]" />
|
||||
<field name="sequence">10</field>
|
||||
<field name="sequence">9</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -154,12 +154,12 @@
|
|||
<field name="priority" eval="1"/>
|
||||
<field name="arch" type="xml">
|
||||
<form string="Stage">
|
||||
<separator string="Stage Definition" colspan="4"/>
|
||||
<field name="name" select="1"/>
|
||||
<field name="sequence"/>
|
||||
<field name="probability"/>
|
||||
<group colspan="4" col="2" >
|
||||
<group colspan="4" col="6">
|
||||
<field name="name" select="1"/>
|
||||
<field name="probability"/>
|
||||
<field name="on_change"/>
|
||||
<field name="case_default"/>
|
||||
<field name="sequence"/>
|
||||
</group>
|
||||
<separator string="Requirements" colspan="4"/>
|
||||
<field name="requirements" nolabel="1" colspan="4"/>
|
||||
|
|
|
@ -81,13 +81,6 @@
|
|||
<filter string="SSL" icon="terp-camera_test" domain="[('is_ssl','=',True)]" help="If SSL required."/>
|
||||
<separator orientation="vertical"/>
|
||||
<field name="name"/>
|
||||
<field name="object_id"/>
|
||||
<newline/>
|
||||
<group expand="0" string="Group By..." groups="base.group_extended">
|
||||
<filter string="Type" icon="terp-stock_symbol-selection" domain="[]" context="{'group_by':'type'}"/>
|
||||
<separator orientation="vertical"/>
|
||||
<filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
|
||||
</group>
|
||||
</search>
|
||||
</field>
|
||||
</record>
|
||||
|
|
|
@ -43,17 +43,16 @@
|
|||
<record id="config_wizard_action_create_hr_employee_installer" model="ir.actions.todo">
|
||||
<field name="action_id" ref="action_create_hr_employee_installer"/>
|
||||
<field name="category_id" ref="category_hr_management_config"/>
|
||||
</record>
|
||||
|
||||
</record>
|
||||
|
||||
<record model="ir.actions.act_window" id="view_department_form_installer">
|
||||
<field name="name">Define Your Department Structure</field>
|
||||
<field name="name">Create Your Departments</field>
|
||||
<field name="type">ir.actions.act_window</field>
|
||||
<field name="res_model">hr.department</field>
|
||||
<field name="view_type">form</field>
|
||||
<field name="view_mode">tree,form</field>
|
||||
<field name="view_id" ref="hr.view_department_tree"/>
|
||||
<field name="help">Your Company's Department Structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
|
||||
<field name="help">Your departments structure is used to manage all documents related to employees by departments: expenses and timesheet validation, leaves management, recruitments, etc.</field>
|
||||
</record>
|
||||
|
||||
<record id="view_department_form_todo" model="ir.actions.todo">
|
||||
|
|
Loading…
Reference in New Issue