[VIEW] ~rename all res_partner_view_form and move kit_sent field in the right inherit...

diff --git a/view/membership.xml b/view/membership.xml
index 3495e65..54a25ed 100644 (file)
--- a/view/membership.xml
+++ b/view/membership.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="view_partner_form" model="ir.ui.view">
+        <record id="view_membership_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="membership.view_partner_form"/>
@@ -9,9 +9,12 @@
                 <xpath expr="//button[@name='%(membership.action_membership_invoice_view)d']" position="attributes">
                     <attribute name="invisible">1</attribute>
                 </xpath>
+                <xpath expr="//page[@string='Membership']/group/group/div" position="after">
+                    <field name="kit_sent"/>
+                </xpath>
             </field>
         </record>
-        <record id="view_partner_form" model="ir.ui.view">
+        <record id="view_remembership_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="remembership.view_remembership_partner_form"/>
@@ -19,14 +22,6 @@
                 <field name="member_ident" position="replace"/>
             </field>
         </record>
-        <record id="view_members_simple_tree" model="ir.ui.view">
-            <field name="name">res.partner.tree</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="remembership.view_remembership_members_simple_tree"/>
-            <field name="arch" type="xml">
-                <field name="member_ident" position="replace"/>
-            </field>
-        </record>
         <record id="view_members_tree" model="ir.ui.view">
             <field name="name">res.partner.tree</field>
             <field name="model">res.partner</field>

diff --git a/view/res_partner.xml b/view/res_partner.xml
index c2382a3..1fb6310 100644 (file)
--- a/view/res_partner.xml
+++ b/view/res_partner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
-        <record id="view_partner_form" model="ir.ui.view">
+        <record id="view_base_partner_form" model="ir.ui.view">
             <field name="name">res.partner.form</field>
             <field name="model">res.partner</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
@@ -9,9 +9,6 @@
                 <xpath expr="//field[@name='title']" position="after">
                     <field name="usual_contact" groups="lhc.group_employee_lhc"/>
                 </xpath>
-                <xpath expr="//page[@string='Membership']/group/group/div" position="after">
-                    <field name="kit_sent" attrs="{'invisible': [('membership_state','not in', ('old', 'waiting', 'invoiced', 'free', 'paid'))]}"/>
-                </xpath>
             </field>
         </record>
         <record id="view_res_partner_search" model="ir.ui.view">