[MODULE] ~v8 migration

[burette/remembership.git] / view / membership.xml

diff --git a/view/membership.xml b/view/membership.xml
index 63a838c..321417b 100644 (file)
--- a/view/membership.xml
+++ b/view/membership.xml
@@ -3,7 +3,7 @@
     <data>
         <record id="view_remembership_products_form" model="ir.ui.view">
             <field name="name">Membership product</field>
-            <field name="model">product.product</field>
+            <field name="model">product.template</field>
             <field name="inherit_id" ref="membership.membership_products_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='categ_id']" position="after">
@@ -16,19 +16,11 @@
                 <xpath expr="//div[child::field[@name='membership_date_from']]" position="attributes">
                     <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
                 </xpath>
-            </field>
-        </record>
-        <record id="view_remembership_product_normal_form" model="ir.ui.view">
-            <field name="name">product.product.form</field>
-            <field name="model">product.product</field>
-            <field name="inherit_id" ref="membership.product_normal_form_view"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='membership']" position="after">
-                    <field name="membership_grouped" attrs="{'invisible': [('membership','=', False)]}"/>
-                    <field name="membership_date2date" attrs="{'invisible': [('membership','=', False)]}"/>
+                <xpath expr="//field[@name='membership_date_from']" position="replace">
+                    <field name="membership_date_from" class="oe_inline" attrs="{'required': ['&amp;', ('membership', '=', True), ('membership_date2date','=', False)]}"/>
                 </xpath>
-                <xpath expr="//group[child::field[@name='membership_date_from']]" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('membership','=',False),('membership_date2date','=',True)]}</attribute>
+                <xpath expr="//field[@name='membership_date_to']" position="replace">
+                    <field name="membership_date_to" class="oe_inline" attrs="{'required': ['&amp;', ('membership', '=', True), ('membership_date2date','=', False)]}"/>
                 </xpath>
             </field>
         </record>
@@ -74,6 +66,7 @@
             <field name="priority" eval="8"/>
             <field name="arch" type="xml">
             <search string="Memberships">
+                <field name="partner"/>
                 <field name="membership_id"/>
                 <field name="date_from"/>
                 <field name="date_to"/>