[PYTHON] ~fix update_membership_state function

diff --git a/__init__.py b/__init__.py
index 13e9a86..ed36709 100644 (file)
--- a/__init__.py
+++ b/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #

diff --git a/__openerp__.py b/__openerp__.py
index 7a09100..e5fb7b7 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #
@@ -34,7 +34,9 @@
     """,
     'author': 'L\'Heureux Cyclage - LHC',
     'website': 'http://www.heureux-cyclage.org',
-    'depends': ['membership'],
+    'depends': [
+        'membership',
+    ],
     'init_xml': [],
     'data': [
         'security/ir.model.access.csv',

diff --git a/data/membership.xml b/data/membership.xml
index 9b85ec9..7d120ab 100644 (file)
--- a/data/membership.xml
+++ b/data/membership.xml
@@ -9,7 +9,7 @@
         <record id="member_ident_sequence" model="ir.sequence">
             <field name="name">Member identifier</field>
             <field name="code">member_ident</field>
-            <field name="padding">0</field>
+            <field name="padding">6</field>
             <field name="number_next">1</field>
             <field name="number_increment">1</field>
         </record>

diff --git a/remembership.py b/remembership.py
index 7a03490..c8d8b46 100644 (file)
--- a/remembership.py
+++ b/remembership.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #
@@ -21,7 +21,8 @@
 #
 ##############################################################################
 
-from openerp.osv import fields, osv
+from openerp.osv import osv
+from openerp.osv import fields
 import time
 from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
@@ -212,13 +213,21 @@ class Partner(osv.osv):
         partner_obj = self.pool.get('res.partner')
         today = date.today()
         ids = partner_obj.search(cr, uid, [('membership_state', '=', 'paid'), ('membership_stop', '<', today)], context=None)
-        self.write(cr, uid, ids, {'membership_state': 'old'}, context=None)
+        for id in ids:
+            self.write(cr, uid, id, {'membership_state': 'old'}, context=None)
+
+    def copy(self, cr, uid, id, default=None, context=None):
+        if default is None:
+            default = {}
+        default['member_ident'] = None
+        return super(Partner, self).copy(cr, uid, id, default, context)
+
 
 Partner()
 
 
 class Product(osv.osv):
-    _inherit = 'product.template'
+    _inherit = 'product.product'
 
     _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 321417b..8d7cd21 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.template</field>
+            <field name="model">product.product</field>
             <field name="inherit_id" ref="membership.membership_products_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='categ_id']" position="after">
@@ -24,6 +24,26 @@
                 </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>

diff --git a/view/partner.xml b/view/partner.xml
index 4455763..e4d4184 100644 (file)
--- a/view/partner.xml
+++ b/view/partner.xml
@@ -19,18 +19,6 @@
                 </xpath>
             </field>
         </record>
-        <record id="view_remembership_members_simple_tree" model="ir.ui.view">
-            <field name="name">res.partner.tree</field>
-            <field name="model">res.partner</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="1"/>
-            <field name="arch" type="xml">
-            <tree string="Members">
-                <field name="member_ident"/>
-                <field name="name"/>
-            </tree>
-            </field>
-        </record>
         <record id="view_remembership_members_tree" model="ir.ui.view">
             <field name="name">Members</field>
             <field name="model">res.partner</field>

diff --git a/wizard/__init__.py b/wizard/__init__.py
index 1089ea6..aabe2a3 100644 (file)
--- a/wizard/__init__.py
+++ b/wizard/__init__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #

diff --git a/wizard/remembership_invoice.py b/wizard/remembership_invoice.py
index 08a999c..f1a63ce 100644 (file)
--- a/wizard/remembership_invoice.py
+++ b/wizard/remembership_invoice.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
+#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #