[MERGE] lp:~openerp-commiter/openobject-addons/trunk-res-partner-view-pna

bzr revid: kjo@tinyerp.com-20120704130646-k86b5dehe4x6uybq
This commit is contained in:
Kuldeep Joshi (OpenERP) 2012-07-04 18:36:46 +05:30
commit 9e7621c8c6
4 changed files with 29 additions and 9 deletions

View File

@ -257,6 +257,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//group[@string='Claim']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_claim_partner_info_form1" model="ir.ui.view">
@ -267,7 +270,7 @@
<field name="priority">20</field>
<field name="arch" type="xml">
<data>
<xpath expr="//page[@string='History']" position="inside">
<xpath expr="//group[@string='Claim']" position="inside">
<field name="claims_ids" colspan="4" nolabel="1">
<tree string="Partners Claim" editable="bottom">
<field name="name"/>

View File

@ -13,6 +13,15 @@
<field name="supplier" position="after">
<field name="speaker"/>
</field>
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//group[@string='Event']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//group[@string='Registration']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_event_partner_info_form" model="ir.ui.view">
@ -21,13 +30,15 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<group string="Event" position="inside">
<field name="event_ids" colspan="4" nolabel="1">
<tree string="Events">
<field name="name" string="Event"/>
<field name="main_speaker_id"/>
</tree>
</field>
</group>
<group string="Registration" position="inside">
<field name="event_registration_ids" colspan="4" nolabel="1">
<tree string="Events Registration">
<field name="event_begin_date" string="Date"/>
@ -39,7 +50,7 @@
<button name="check_confirm" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
</tree>
</field>
</page>
</group>
</field>
</record>

View File

@ -3,8 +3,8 @@
<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>
<record id="base.view_crm_partner_info_History2" model="ir.ui.view">
<field name="name">res.partner.crm.history.inherit2</field>
<field name="model">res.partner</field>
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
@ -12,6 +12,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//group[@string='Campaign']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_workitem_partner_info_form" model="ir.ui.view">
@ -20,9 +23,9 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<group string="Campaign" position="inside">
<field name="workitem_ids" colspan="4" nolabel="1"/>
</page>
</group>
</field>
</record>
</data>

View File

@ -12,6 +12,9 @@
<xpath expr="//page[@string='History']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
<xpath expr="//group[@string='Tasks']" position="attributes">
<attribute name="invisible">False</attribute>
</xpath>
</field>
</record>
<record id="view_task_partner_info_form" model="ir.ui.view">
@ -20,7 +23,7 @@
<field name="type">form</field>
<field name="inherit_id" ref="base.view_partner_form"/>
<field name="arch" type="xml">
<page string="History" position="inside">
<group string="Tasks" position="inside">
<field name="task_ids" colspan="4" nolabel="1">
<tree string="Tasks" editable="bottom">
<field name="name"/>
@ -31,7 +34,7 @@
<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>
</group>
</field>
</record>