Merge branch '7.0'

diff --git a/remembership.py b/remembership.py
index 14b7f4e..5560fbf 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -21,8 +21,7 @@
 #
 ##############################################################################
 
-from openerp.osv import osv
-from openerp.osv import fields
+from openerp.osv import fields, osv
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
@@ -226,7 +225,7 @@ Partner()
 
 
 class Product(osv.osv):
-    _inherit = 'product.product'
+    _inherit = 'product.template'
 
     _columns = {
         'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),

diff --git a/view/membership.xml b/view/membership.xml
index 8d7cd21..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">
@@ -24,26 +24,6 @@
                 </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>
-                <xpath expr="//group[child::field[@name='membership_date_from']]" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('membership','=',False),('membership_date2date','=',True)]}</attribute>
-                </xpath>
-                <xpath expr="//group/field[@name='membership_date_from']" position="attributes">
-                    <attribute name="attrs">{'required':['&amp;',('membership','=',True),('membership_date2date','=',False)]}</attribute>
-                </xpath>
-                <xpath expr="//group/field[@name='membership_date_to']" position="attributes">
-                    <attribute name="attrs">{'required':['&amp;',('membership','=',True),('membership_date2date','=',False)]}</attribute>
-                </xpath>
-            </field>
-        </record>
 
         <record id="view_membership_membership_line_tree" model="ir.ui.view">
             <field name="name">membership.membership_line.tree</field>