diff options
| author | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-20 11:42:03 +0530 |
|---|---|---|
| committer | Purnendu Singh (OpenERP) <psi@tinyerp.com> | 2012-07-20 11:42:03 +0530 |
| commit | ec27d7e44fab5b39ea8577de7bfa7b9f3a5b5bf2 (patch) | |
| tree | cdf1c0b60fefc14bd1769a437f9ac09b70783e1a /addons/project/res_partner_view.xml | |
| parent | c45d68d6b80c3a339463d37ecc3bbd766ef101d3 (diff) | |
| parent | 7df568d138348aa00be74340d2c5d408dd239da6 (diff) | |
[MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
Diffstat (limited to 'addons/project/res_partner_view.xml')
| -rw-r--r-- | addons/project/res_partner_view.xml | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml index 3b019e51af6..09170c43434 100644 --- a/addons/project/res_partner_view.xml +++ b/addons/project/res_partner_view.xml @@ -3,35 +3,29 @@ <data> <!-- Partners inherited form --> - <record id="base.view_crm_partner_info_History" model="ir.ui.view"> - <field name="name">res.partner.crm.history.inherit1</field> - <field name="model">res.partner</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.view_partner_form"/> - <field name="arch" type="xml"> - <xpath expr="//page[@string='History']" position="attributes"> - <attribute name="invisible">False</attribute> - </xpath> - </field> - </record> <record id="view_task_partner_info_form" model="ir.ui.view"> <field name="name">res.partner.task.info.inherit</field> <field name="model">res.partner</field> <field name="type">form</field> <field name="inherit_id" ref="base.view_partner_form"/> <field name="arch" type="xml"> - <page string="History" position="inside"> - <field name="task_ids" colspan="4" nolabel="1"> - <tree string="Tasks" editable="bottom"> - <field name="name"/> - <field name="user_id"/> - <field name="date_deadline"/> - <field name="state" invisible="1"/> - <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> - <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> - </tree> - </field> - </page> + <xpath expr="//page[@name='page_history']" position="attributes"> + <attribute name="invisible">False</attribute> + </xpath> + <xpath expr="//page[@name='page_history']" position="inside"> + <group name="grp_task" string="Tasks"> + <field name="task_ids" colspan="4" nolabel="1"> + <tree string="Tasks" editable="bottom"> + <field name="name"/> + <field name="user_id"/> + <field name="date_deadline"/> + <field name="state" invisible="1"/> + <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> + <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> + </tree> + </field> + </group> + </xpath> </field> </record> |