[MODULE] ~start migration
authorLudovic CHEVALIER <ludovic@beurresarrasin.net>
Fri, 26 Jun 2020 14:10:10 +0000 (16:10 +0200)
committerLudovic CHEVALIER <ludovic@beurresarrasin.net>
Fri, 26 Jun 2020 14:24:36 +0000 (16:24 +0200)
__init__.py
__manifest__.py [new file with mode: 0644]
__openerp__.py [deleted file]
models/__init__.py [new file with mode: 0644]
models/remembership.py [new file with mode: 0644]
remembership.py [deleted file]
view/membership.xml [deleted file]
view/partner.xml [deleted file]
views/membership.xml [new file with mode: 0644]
views/partner.xml [new file with mode: 0644]

index ed36709..a7d817b 100644 (file)
@@ -1,27 +1,6 @@
 # -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
-#
-#    This file is a part of Remembership
-#
-#    Remembership is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    Remembership is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
+# Copyright 2012-2020 L'Heureux Cyclage
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-import remembership
-import wizard
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+from . import models
+from . import wizard
diff --git a/__manifest__.py b/__manifest__.py
new file mode 100644 (file)
index 0000000..c4011c1
--- /dev/null
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Copyright 2012-2020 L'Heureux Cyclage
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'ReMembership',
+    'version': '0.1',
+    'category': 'Generic Modules/Association',
+    'description': """
+    This module overload official OpenERP membership module for adding some
+    functionnalities that could be useful:
+        - grouped membership;
+        - date to date membership;
+        - members identfication number;
+        - cron job to update membership status.
+    """,
+    'author': 'L\'Heureux Cyclage - LHC',
+    'website': 'http://www.heureux-cyclage.org',
+    'depends': [
+        'membership',
+    ],
+    'data': [
+        'security/ir.model.access.csv',
+        'data/membership.xml',
+        'views/partner.xml',
+        'views/membership.xml',
+        'wizard/remembership_invoice_view.xml',
+    ],
+    'test': [],
+}
diff --git a/__openerp__.py b/__openerp__.py
deleted file mode 100644 (file)
index e5fb7b7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
-#
-#    This file is a part of Remembership
-#
-#    Remembership is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    Remembership is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-{
-    'name': 'ReMembership',
-    'version': '0.1',
-    'category': 'Generic Modules/Association',
-    'description': """
-    This module overload official OpenERP membership module for adding some functionnalities that could be useful:
-        - grouped membership;
-        - date to date membership;
-        - members identfication number;
-        - cron job to update membership status.
-    """,
-    'author': 'L\'Heureux Cyclage - LHC',
-    'website': 'http://www.heureux-cyclage.org',
-    'depends': [
-        'membership',
-    ],
-    'init_xml': [],
-    'data': [
-        'security/ir.model.access.csv',
-        'data/membership.xml',
-        'view/partner.xml',
-        'view/membership.xml',
-        'wizard/remembership_invoice_view.xml',
-    ],
-    'update_xml': [],
-    'demo_xml': [],
-    'test': [],
-    'installable': True,
-    'active': False,
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/models/__init__.py b/models/__init__.py
new file mode 100644 (file)
index 0000000..532a18a
--- /dev/null
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Copyright 2012-2020 L'Heureux Cyclage
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import remembership
diff --git a/models/remembership.py b/models/remembership.py
new file mode 100644 (file)
index 0000000..7bbc9bb
--- /dev/null
@@ -0,0 +1,353 @@
+# -*- coding: utf-8 -*-
+# Copyright 2012-2020 L'Heureux Cyclage
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp.osv import fields, osv
+import time
+from datetime import datetime, date
+from dateutil.relativedelta import relativedelta
+from openerp.tools.translate import _
+
+class Partner(osv.osv):
+    _inherit = 'res.partner'
+
+    # XXX: copied from openerp/addons/membership/membership.py
+    def _membership_date(self, cr, uid, ids, name, args, context=None):
+        """Return  date of membership"""
+        name = name[0]
+        res = {}
+        member_line_obj = self.pool.get('membership.membership_line')
+        print ("DEV: [remembership] [_membership_date]")
+        for partner in self.browse(cr, uid, ids, context=context):
+            # XXX: commented part from openerp/addons/membership/membership.py
+            #if partner.associate_member:
+            #     partner_id = partner.associate_member.id
+            #else:
+            # NOTE: hmm, ça devrait être toujours partner.id
+            partner_id = partner.id
+            res[partner.id] = {
+                 'membership_start': False,
+                 'membership_stop': False,
+                 'membership_cancel': False
+            }
+            if name == 'membership_start':
+                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
+                            limit=1, order='date_from', context=context)
+                if line_id:
+                    res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
+                            ['date_from'], context=context)['date_from']
+                    if partner.associate_member:
+                        print ("DEV: [_membership_date] [associate] date_from: %s" % str(res[partner.id]['membership_start']))
+                    else:
+                        print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
+
+            if name == 'membership_stop':
+                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
+                            limit=1, order='date_to desc', context=context)
+                if line_id1:
+                    res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
+                              ['date_to'], context=context)['date_to']
+                    if partner.associate_member:
+                        print ("DEV: [_membership_date] [associate] date_to: %s" % str(res[partner.id]['membership_stop']))
+                    else:
+                        print ("DEV: [_membership_date] date_to: %s" % str(res[partner.id]['membership_stop']))
+
+            if name == 'membership_cancel':
+                if partner.membership_state == 'canceled':
+                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
+                    if line_id2:
+                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
+        return res
+    # XXX: copied from openerp/addons/membership/membership.py
+    def _get_partner_id(self, cr, uid, ids, context=None):
+        member_line_obj = self.pool.get('membership.membership_line')
+        res_obj =  self.pool.get('res.partner')
+        data_inv = member_line_obj.browse(cr, uid, ids, context=context)
+        list_partner = []
+        for data in data_inv:
+            list_partner.append(data.partner.id)
+        ids2 = list_partner
+        while ids2:
+            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
+            list_partner += ids2
+        return list_partner
+    # XXX: copied from openerp/addons/membership/membership.py
+    def _get_invoice_partner(self, cr, uid, ids, context=None):
+        inv_obj = self.pool.get('account.invoice')
+        res_obj = self.pool.get('res.partner')
+        data_inv = inv_obj.browse(cr, uid, ids, context=context)
+        list_partner = []
+        for data in data_inv:
+            list_partner.append(data.partner_id.id)
+        ids2 = list_partner
+        while ids2:
+            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
+            list_partner += ids2
+        return list_partner
+
+    _columns = {
+        'member_ident': fields.char('Member identifier', size=64),
+        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
+        # XXX: copied from openerp/addons/membership/membership.py
+        'membership_start': fields.function(
+                    _membership_date, multi = 'membership_start',
+                    string = 'Membership Start Date', type = 'date',
+                    store = {
+                        'account.invoice': (_get_invoice_partner, ['state'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10, ),
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
+                    }, help="Date from which membership becomes active."),
+        # XXX: copied from openerp/addons/membership/membership.py
+        'membership_stop': fields.function(
+                    _membership_date,
+                    string = 'Membership End Date', type='date', multi='membership_stop',
+                    store = {
+                        'account.invoice': (_get_invoice_partner, ['state'], 10),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
+                    }, help="Date until which membership remains active."),
+        # XXX: copied from openerp/addons/membership/membership.py
+        'membership_cancel': fields.function(
+                    _membership_date,
+                    string = 'Cancel Membership Date', type='date', multi='membership_cancel',
+                    store = {
+                        'account.invoice': (_get_invoice_partner, ['state'], 11),
+                        'membership.membership_line': (_get_partner_id, ['state'], 10),
+                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
+                    }, help="Date on which membership has been cancelled"),
+    }
+
+    _sql_constraints = [
+        ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
+    ]
+
+    def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
+        # NOTE: use context to supply date_from to account_invoice_line.create
+        context = context and context.copy() or {}
+        context.update({'date_from': datas.get('date_from', None)});
+        # XXX: copied from openerp/addons/membership/membership.py to fix account_invoice_line creation
+        print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s" % str(ids))
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        invoice_tax_obj = self.pool.get('account.invoice.tax')
+        product_id = product_id or datas.get('membership_product_id', False)
+        amount = datas.get('amount', 0.0)
+        invoice_list = []
+        if type(ids) in (int, long,):
+            ids = [ids]
+        for partner in self.browse(cr, uid, ids, context=context):
+            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s" % (str(ids),str(partner.id)))
+            account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
+            fpos_id = partner.property_account_position and partner.property_account_position.id or False
+            addr = self.address_get(cr, uid, [partner.id], ['invoice'])
+            if partner.free_member:
+                raise osv.except_osv(_('Error!'),
+                        _("Partner is a free Member."))
+            if not addr.get('invoice', False):
+                raise osv.except_osv(_('Error!'),
+                        _("Partner doesn't have an address to make the invoice."))
+            quantity = 1
+            line_value =  {
+                'product_id': product_id,
+            }
+
+            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [product_id_change]" % (str(ids),str(partner.id)))
+            line_dict = invoice_line_obj.product_id_change(cr, uid, {},
+                            product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
+            line_value.update(line_dict['value'])
+            line_value['price_unit'] = amount
+            if line_value.get('invoice_line_tax_id', False):
+                tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
+                line_value['invoice_line_tax_id'] = tax_tab
+
+            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_obj] [create] account=%s" % (str(ids),str(partner.id),str(account_id)))
+            # NOTE: let account_invoice_obj.create() call account_invoice_line.create()
+            #       to have a correct membership_state: becauce now fields.function 'store' watchdogs
+            #       are triggered after account_invoice_line.create().
+            invoice_id = invoice_obj.create(cr, uid, {
+                'partner_id': partner.id,
+                'account_id': account_id,
+                'fiscal_position': fpos_id or False,
+                'invoice_line':[(0, 0, line_value)]
+                }, context=context)
+            #line_value['invoice_id'] = invoice_id
+            #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [create]" % (str(ids),str(partner.id)))
+            #invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
+            #invoice_obj.write(cr, uid, invoice_id, {'invoice_line': line_value}, context=context)
+            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : pre")
+            invoice_list.append(invoice_id)
+            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : post")
+            if line_value['invoice_line_tax_id']:
+                tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
+                for tax in tax_value:
+                       invoice_tax_obj.create(cr, uid, tax, context=context)
+        # NOTE: this wasn't working, and is not needed now.
+        #recompute the membership_state of those partners
+        #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s [recompute states]" % str(ids))
+        #self.pool.get('res.partner').write(cr, uid, ids, {}, context=context)
+        print ("DEV: [remembership] [partner] [create_membership_invoice] return=%s" % str(invoice_list))
+        return invoice_list
+
+    def update_membership_status(self, cr, uid):
+        """Action for updating old members status with scheduled cron job"""
+        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)
+
+    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'
+
+    _columns = {
+        'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),
+        'membership_date2date': fields.boolean('Date to date membership product', required=False, help='Check if it\'s a date to date membership product.'),
+    }
+
+Product()
+
+
+class account_invoice_line(osv.osv):
+    _inherit = 'account.invoice.line'
+
+    def write(self, cr, uid, ids, vals, context=None):
+        member_line_obj = self.pool.get('membership.membership_line')
+        res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
+        for line in self.browse(cr, uid, ids, context=context):
+            if line.invoice_id.type == 'out_invoice':
+                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context)
+                if line.product_id and line.product_id.membership:
+                    member_line_id = member_line_obj.search(cr, uid
+                      , [('partner'             , '=', line.invoice_id.partner_id.id)
+                        ,('account_invoice_line', '=', line.id)]
+                      , limit=1
+                      , context=context)
+                    for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
+                      # NOTE: get member_line created in membership.account_invoice_line.create
+                        date_from = member_line.date_from
+                        date_to   = member_line.date_to
+                        if line.product_id.membership_date2date:
+                            date_from = ('date_from' in context
+                              and context.get('date_from')
+                              and datetime.strptime(context('date_from'), "%Y-%m-%d")
+                              or date.today())
+                            date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
+                            date_from = date_from.strftime("%Y-%m-%d")
+                            date_to   = date_to  .strftime("%Y-%m-%d")
+                        print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from))
+                        print ("DEV: [remembership] [account_invoice_line] [write] date_to  : %s" % str(date_to))
+                        member_line_obj.write(cr, uid, member_line.id
+                          , {'date_from': date_from
+                            ,'date_to'  : date_to
+                            }
+                          , context=context)
+                    if line.product_id.membership_grouped:
+                        if line.invoice_id.partner_id.associate_members:
+                            associate_member_line_ids = member_line_obj.search(cr, uid
+                              , [ ('account_invoice_line', '=', line.id)
+                                , ('partner', '!=', line.invoice_id.partner_id.id)
+                                ]
+                              , context=context)
+                            for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context):
+                                print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_from: %s" % str(date_from))
+                                print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_to  : %s" % str(date_to))
+                                member_line_obj.write(cr, uid, associate_member_line.id
+                                  , {'date_from': date_from
+                                    ,'date_to'  : date_to
+                                    }
+                                  , context=context)
+                        else:
+                            print("DEV: mettre une contrainte pour l'objet\
+                                  membership.membership_line interdisant les\
+                                  adhésions groupées reliées à des partenaires\
+                                  sans membres associés")
+                    else:
+                        associate_member_line_ids = member_line_obj.search(cr, uid
+                          , [ ('account_invoice_line', '=', line.id)
+                            , ('partner', '!=', line.invoice_id.partner_id.id)
+                            ]
+                          , context=context)
+                        member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context)
+                    #Define member ident if it's necessary
+                    partners = [line.invoice_id.partner_id]
+                    if line.invoice_id.partner_id.associate_members:
+                        partners.extend(line.invoice_id.partner_id.associate_members)
+                    for i in partners:
+                        if not i.member_ident:
+                            mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
+                            self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id})
+                if line.product_id and not line.product_id.membership and ml_ids:
+                    # Product line has changed to a non membership product
+                    member_line_obj.unlink(cr, uid, ml_ids, context=context)
+        print ("DEV: [remembership] [account_invoice_line] [write] : return=%s" % str(res))
+        return res
+
+    def create(self, cr, uid, vals, context=None):
+        member_line_obj = self.pool.get('membership.membership_line')
+        res = super(account_invoice_line, self).create(cr, uid, vals, context=context)
+        print ("DEV: [remembership] [account_invoice_line] [create] : begin res=%s" % str(res))
+        line = self.browse(cr, uid, res, context=context)
+
+        if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership:
+            member_line_id = member_line_obj.search(cr, uid
+              , [('partner'             , '=', line.invoice_id.partner_id.id)
+                ,('account_invoice_line', '=', line.id)]
+              , limit=1
+              , context=context)
+            for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
+              # NOTE: get member_line created in membership.account_invoice_line.create
+                date_from = member_line.date_from
+                date_to   = member_line.date_to
+                if line.product_id.membership_date2date:
+                    date_from = ('date_from' in context
+                      and context.get('date_from')
+                      and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
+                      or date.today())
+                    print("#DEBUG: Date de début - %s" % str(date_from))
+                    date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
+                    date_from = date_from.strftime("%Y-%m-%d")
+                    date_to   = date_to  .strftime("%Y-%m-%d")
+                print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from))
+                print ("DEV: [remembership] [account_invoice_line] [create] date_to  : %s" % str(date_to))
+                member_line_obj.write(cr, uid, member_line.id
+                  , {'date_from': date_from
+                    ,'date_to'  : date_to
+                    }
+                  , context=context)
+            partners = [line.invoice_id.partner_id]
+            if line.product_id.membership_grouped and line.invoice_id.partner_id.associate_members:
+                partners.extend(line.invoice_id.partner_id.associate_members)
+                #Adding membership lines just for associate partners
+                for associate_member in line.invoice_id.partner_id.associate_members:
+                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_from: %s" % str(date_from))
+                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_to  : %s" % str(date_to))
+                    member_line_obj.create(cr, uid, {
+                        'partner': associate_member.id,
+                        'membership_id': line.product_id.id,
+                        'member_price': line.price_unit,
+                        'date': time.strftime('%Y-%m-%d'),
+                        'date_from': date_from,
+                        'date_to': date_to,
+                        'account_invoice_line': line.id,
+                    }, context=context)
+            elif line.product_id.membership_grouped and not line.invoice_id.partner_id.associate_members:
+                raise osv.except_osv(_('Error!!!'), _('You try to invoice grouped membership product to a partner who hasn\'t associated partners.'))
+            #Define member ident if it's necessary
+            for i in partners:
+                if not i.member_ident:
+                    mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
+                    self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id})
+        print ("DEV: [remembership] [account_invoice_line] [create] : return=%s" % str(res))
+        return res
+
+account_invoice_line()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/remembership.py b/remembership.py
deleted file mode 100644 (file)
index 5560fbf..0000000
+++ /dev/null
@@ -1,372 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    Remembership module for OpenERP, Membership module enhancement and bug fixes
-#    Copyright (C) 2012-2018 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
-#
-#    This file is a part of Remembership
-#
-#    Remembership is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    Remembership is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import fields, osv
-import time
-from datetime import datetime, date
-from dateutil.relativedelta import relativedelta
-from openerp.tools.translate import _
-
-class Partner(osv.osv):
-    _inherit = 'res.partner'
-
-    # XXX: copied from openerp/addons/membership/membership.py
-    def _membership_date(self, cr, uid, ids, name, args, context=None):
-        """Return  date of membership"""
-        name = name[0]
-        res = {}
-        member_line_obj = self.pool.get('membership.membership_line')
-        print ("DEV: [remembership] [_membership_date]")
-        for partner in self.browse(cr, uid, ids, context=context):
-            # XXX: commented part from openerp/addons/membership/membership.py
-            #if partner.associate_member:
-            #     partner_id = partner.associate_member.id
-            #else:
-            # NOTE: hmm, ça devrait être toujours partner.id
-            partner_id = partner.id
-            res[partner.id] = {
-                 'membership_start': False,
-                 'membership_stop': False,
-                 'membership_cancel': False
-            }
-            if name == 'membership_start':
-                line_id = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
-                            limit=1, order='date_from', context=context)
-                if line_id:
-                    res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
-                            ['date_from'], context=context)['date_from']
-                    if partner.associate_member:
-                        print ("DEV: [_membership_date] [associate] date_from: %s" % str(res[partner.id]['membership_start']))
-                    else:
-                        print ("DEV: [_membership_date] date_from: %s" % str(res[partner.id]['membership_start']))
-
-            if name == 'membership_stop':
-                line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('state','!=','canceled')],
-                            limit=1, order='date_to desc', context=context)
-                if line_id1:
-                    res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
-                              ['date_to'], context=context)['date_to']
-                    if partner.associate_member:
-                        print ("DEV: [_membership_date] [associate] date_to: %s" % str(res[partner.id]['membership_stop']))
-                    else:
-                        print ("DEV: [_membership_date] date_to: %s" % str(res[partner.id]['membership_stop']))
-
-            if name == 'membership_cancel':
-                if partner.membership_state == 'canceled':
-                    line_id2 = member_line_obj.search(cr, uid, [('partner', '=', partner.id)], limit=1, order='date_cancel', context=context)
-                    if line_id2:
-                        res[partner.id]['membership_cancel'] = member_line_obj.read(cr, uid, line_id2[0], ['date_cancel'], context=context)['date_cancel']
-        return res
-    # XXX: copied from openerp/addons/membership/membership.py
-    def _get_partner_id(self, cr, uid, ids, context=None):
-        member_line_obj = self.pool.get('membership.membership_line')
-        res_obj =  self.pool.get('res.partner')
-        data_inv = member_line_obj.browse(cr, uid, ids, context=context)
-        list_partner = []
-        for data in data_inv:
-            list_partner.append(data.partner.id)
-        ids2 = list_partner
-        while ids2:
-            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
-            list_partner += ids2
-        return list_partner
-    # XXX: copied from openerp/addons/membership/membership.py
-    def _get_invoice_partner(self, cr, uid, ids, context=None):
-        inv_obj = self.pool.get('account.invoice')
-        res_obj = self.pool.get('res.partner')
-        data_inv = inv_obj.browse(cr, uid, ids, context=context)
-        list_partner = []
-        for data in data_inv:
-            list_partner.append(data.partner_id.id)
-        ids2 = list_partner
-        while ids2:
-            ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
-            list_partner += ids2
-        return list_partner
-
-    _columns = {
-        'member_ident': fields.char('Member identifier', size=64),
-        'associate_members': fields.one2many('res.partner', 'associate_member', 'Associate members', help='Members who are associated to this partner.'),
-        # XXX: copied from openerp/addons/membership/membership.py
-        'membership_start': fields.function(
-                    _membership_date, multi = 'membership_start',
-                    string = 'Membership Start Date', type = 'date',
-                    store = {
-                        'account.invoice': (_get_invoice_partner, ['state'], 10),
-                        'membership.membership_line': (_get_partner_id, ['state'], 10, ),
-                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
-                    }, help="Date from which membership becomes active."),
-        # XXX: copied from openerp/addons/membership/membership.py
-        'membership_stop': fields.function(
-                    _membership_date,
-                    string = 'Membership End Date', type='date', multi='membership_stop',
-                    store = {
-                        'account.invoice': (_get_invoice_partner, ['state'], 10),
-                        'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
-                    }, help="Date until which membership remains active."),
-        # XXX: copied from openerp/addons/membership/membership.py
-        'membership_cancel': fields.function(
-                    _membership_date,
-                    string = 'Cancel Membership Date', type='date', multi='membership_cancel',
-                    store = {
-                        'account.invoice': (_get_invoice_partner, ['state'], 11),
-                        'membership.membership_line': (_get_partner_id, ['state'], 10),
-                        'res.partner': (lambda self, cr, uid, ids, c={}: ids, ['free_member'], 10)
-                    }, help="Date on which membership has been cancelled"),
-    }
-
-    _sql_constraints = [
-        ('member_ident_uniq', 'unique(member_ident, company_id)', 'The member identifier must be unique !'),
-    ]
-
-    def create_membership_invoice(self, cr, uid, ids, product_id=None, datas=None, context=None):
-        # NOTE: use context to supply date_from to account_invoice_line.create
-        context = context and context.copy() or {}
-        context.update({'date_from': datas.get('date_from', None)});
-        # XXX: copied from openerp/addons/membership/membership.py to fix account_invoice_line creation
-        print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s" % str(ids))
-        invoice_obj = self.pool.get('account.invoice')
-        invoice_line_obj = self.pool.get('account.invoice.line')
-        invoice_tax_obj = self.pool.get('account.invoice.tax')
-        product_id = product_id or datas.get('membership_product_id', False)
-        amount = datas.get('amount', 0.0)
-        invoice_list = []
-        if type(ids) in (int, long,):
-            ids = [ids]
-        for partner in self.browse(cr, uid, ids, context=context):
-            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s" % (str(ids),str(partner.id)))
-            account_id = partner.property_account_receivable and partner.property_account_receivable.id or False
-            fpos_id = partner.property_account_position and partner.property_account_position.id or False
-            addr = self.address_get(cr, uid, [partner.id], ['invoice'])
-            if partner.free_member:
-                raise osv.except_osv(_('Error!'),
-                        _("Partner is a free Member."))
-            if not addr.get('invoice', False):
-                raise osv.except_osv(_('Error!'),
-                        _("Partner doesn't have an address to make the invoice."))
-            quantity = 1
-            line_value =  {
-                'product_id': product_id,
-            }
-
-            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [product_id_change]" % (str(ids),str(partner.id)))
-            line_dict = invoice_line_obj.product_id_change(cr, uid, {},
-                            product_id, False, quantity, '', 'out_invoice', partner.id, fpos_id, price_unit=amount, context=context)
-            line_value.update(line_dict['value'])
-            line_value['price_unit'] = amount
-            if line_value.get('invoice_line_tax_id', False):
-                tax_tab = [(6, 0, line_value['invoice_line_tax_id'])]
-                line_value['invoice_line_tax_id'] = tax_tab
-
-            print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_obj] [create] account=%s" % (str(ids),str(partner.id),str(account_id)))
-            # NOTE: let account_invoice_obj.create() call account_invoice_line.create()
-            #       to have a correct membership_state: becauce now fields.function 'store' watchdogs
-            #       are triggered after account_invoice_line.create().
-            invoice_id = invoice_obj.create(cr, uid, {
-                'partner_id': partner.id,
-                'account_id': account_id,
-                'fiscal_position': fpos_id or False,
-                'invoice_line':[(0, 0, line_value)]
-                }, context=context)
-            #line_value['invoice_id'] = invoice_id
-            #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s partner=%s [invoice_line_obj] [create]" % (str(ids),str(partner.id)))
-            #invoice_line_id = invoice_line_obj.create(cr, uid, line_value, context=context)
-            #invoice_obj.write(cr, uid, invoice_id, {'invoice_line': line_value}, context=context)
-            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : pre")
-            invoice_list.append(invoice_id)
-            print ("DEV: [remembership] [partner] [create_membership_invoice] : invoice_list.append(invoice_id) : post")
-            if line_value['invoice_line_tax_id']:
-                tax_value = invoice_tax_obj.compute(cr, uid, invoice_id).values()
-                for tax in tax_value:
-                       invoice_tax_obj.create(cr, uid, tax, context=context)
-        # NOTE: this wasn't working, and is not needed now.
-        #recompute the membership_state of those partners
-        #print ("DEV: [remembership] [partner] [create_membership_invoice] ids=%s [recompute states]" % str(ids))
-        #self.pool.get('res.partner').write(cr, uid, ids, {}, context=context)
-        print ("DEV: [remembership] [partner] [create_membership_invoice] return=%s" % str(invoice_list))
-        return invoice_list
-
-    def update_membership_status(self, cr, uid):
-        """Action for updating old members status with scheduled cron job"""
-        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)
-
-    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'
-
-    _columns = {
-        'membership_grouped': fields.boolean('Grouped membership product', help='Check if it\'s a grouped membership product.'),
-        'membership_date2date': fields.boolean('Date to date membership product', required=False, help='Check if it\'s a date to date membership product.'),
-    }
-
-Product()
-
-
-class account_invoice_line(osv.osv):
-    _inherit = 'account.invoice.line'
-
-    def write(self, cr, uid, ids, vals, context=None):
-        member_line_obj = self.pool.get('membership.membership_line')
-        res = super(account_invoice_line, self).write(cr, uid, ids, vals, context=context)
-        for line in self.browse(cr, uid, ids, context=context):
-            if line.invoice_id.type == 'out_invoice':
-                ml_ids = member_line_obj.search(cr, uid, [('account_invoice_line', '=', line.id)], context=context)
-                if line.product_id and line.product_id.membership:
-                    member_line_id = member_line_obj.search(cr, uid
-                      , [('partner'             , '=', line.invoice_id.partner_id.id)
-                        ,('account_invoice_line', '=', line.id)]
-                      , limit=1
-                      , context=context)
-                    for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
-                      # NOTE: get member_line created in membership.account_invoice_line.create
-                        date_from = member_line.date_from
-                        date_to   = member_line.date_to
-                        if line.product_id.membership_date2date:
-                            date_from = ('date_from' in context
-                              and context.get('date_from')
-                              and datetime.strptime(context('date_from'), "%Y-%m-%d")
-                              or date.today())
-                            date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
-                            date_from = date_from.strftime("%Y-%m-%d")
-                            date_to   = date_to  .strftime("%Y-%m-%d")
-                        print ("DEV: [remembership] [account_invoice_line] [write] date_from: %s" % str(date_from))
-                        print ("DEV: [remembership] [account_invoice_line] [write] date_to  : %s" % str(date_to))
-                        member_line_obj.write(cr, uid, member_line.id
-                          , {'date_from': date_from
-                            ,'date_to'  : date_to
-                            }
-                          , context=context)
-                    if line.product_id.membership_grouped:
-                        if line.invoice_id.partner_id.associate_members:
-                            associate_member_line_ids = member_line_obj.search(cr, uid
-                              , [ ('account_invoice_line', '=', line.id)
-                                , ('partner', '!=', line.invoice_id.partner_id.id)
-                                ]
-                              , context=context)
-                            for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context):
-                                print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_from: %s" % str(date_from))
-                                print ("DEV: [remembership] [account_invoice_line] [write] [associate] date_to  : %s" % str(date_to))
-                                member_line_obj.write(cr, uid, associate_member_line.id
-                                  , {'date_from': date_from
-                                    ,'date_to'  : date_to
-                                    }
-                                  , context=context)
-                        else:
-                            print("DEV: mettre une contrainte pour l'objet\
-                                  membership.membership_line interdisant les\
-                                  adhésions groupées reliées à des partenaires\
-                                  sans membres associés")
-                    else:
-                        associate_member_line_ids = member_line_obj.search(cr, uid
-                          , [ ('account_invoice_line', '=', line.id)
-                            , ('partner', '!=', line.invoice_id.partner_id.id)
-                            ]
-                          , context=context)
-                        member_line_obj.unlink(cr, uid, associate_member_line_ids, context=context)
-                    #Define member ident if it's necessary
-                    partners = [line.invoice_id.partner_id]
-                    if line.invoice_id.partner_id.associate_members:
-                        partners.extend(line.invoice_id.partner_id.associate_members)
-                    for i in partners:
-                        if not i.member_ident:
-                            mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
-                            self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id})
-                if line.product_id and not line.product_id.membership and ml_ids:
-                    # Product line has changed to a non membership product
-                    member_line_obj.unlink(cr, uid, ml_ids, context=context)
-        print ("DEV: [remembership] [account_invoice_line] [write] : return=%s" % str(res))
-        return res
-
-    def create(self, cr, uid, vals, context=None):
-        member_line_obj = self.pool.get('membership.membership_line')
-        res = super(account_invoice_line, self).create(cr, uid, vals, context=context)
-        print ("DEV: [remembership] [account_invoice_line] [create] : begin res=%s" % str(res))
-        line = self.browse(cr, uid, res, context=context)
-
-        if line.invoice_id.type == 'out_invoice' and line.product_id and line.product_id.membership:
-            member_line_id = member_line_obj.search(cr, uid
-              , [('partner'             , '=', line.invoice_id.partner_id.id)
-                ,('account_invoice_line', '=', line.id)]
-              , limit=1
-              , context=context)
-            for member_line in member_line_obj.browse(cr, uid, member_line_id, context=context):
-              # NOTE: get member_line created in membership.account_invoice_line.create
-                date_from = member_line.date_from
-                date_to   = member_line.date_to
-                if line.product_id.membership_date2date:
-                    date_from = ('date_from' in context
-                      and context.get('date_from')
-                      and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
-                      or date.today())
-                    print("#DEBUG: Date de début - %s" % str(date_from))
-                    date_to   = date_from + relativedelta(months=+12, days=-1) # TODO: parameterize this delta?
-                    date_from = date_from.strftime("%Y-%m-%d")
-                    date_to   = date_to  .strftime("%Y-%m-%d")
-                print ("DEV: [remembership] [account_invoice_line] [create] date_from: %s" % str(date_from))
-                print ("DEV: [remembership] [account_invoice_line] [create] date_to  : %s" % str(date_to))
-                member_line_obj.write(cr, uid, member_line.id
-                  , {'date_from': date_from
-                    ,'date_to'  : date_to
-                    }
-                  , context=context)
-            partners = [line.invoice_id.partner_id]
-            if line.product_id.membership_grouped and line.invoice_id.partner_id.associate_members:
-                partners.extend(line.invoice_id.partner_id.associate_members)
-                #Adding membership lines just for associate partners
-                for associate_member in line.invoice_id.partner_id.associate_members:
-                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_from: %s" % str(date_from))
-                    print ("DEV: [remembership] [account_invoice_line] [create] [associate] date_to  : %s" % str(date_to))
-                    member_line_obj.create(cr, uid, {
-                        'partner': associate_member.id,
-                        'membership_id': line.product_id.id,
-                        'member_price': line.price_unit,
-                        'date': time.strftime('%Y-%m-%d'),
-                        'date_from': date_from,
-                        'date_to': date_to,
-                        'account_invoice_line': line.id,
-                    }, context=context)
-            elif line.product_id.membership_grouped and not line.invoice_id.partner_id.associate_members:
-                raise osv.except_osv(_('Error!!!'), _('You try to invoice grouped membership product to a partner who hasn\'t associated partners.'))
-            #Define member ident if it's necessary
-            for i in partners:
-                if not i.member_ident:
-                    mbr_id = self.pool.get('ir.sequence').get(cr, uid, 'member_ident')
-                    self.pool.get('res.partner').write(cr, uid, i.id, {'member_ident': mbr_id})
-        print ("DEV: [remembership] [account_invoice_line] [create] : return=%s" % str(res))
-        return res
-
-account_invoice_line()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/view/membership.xml b/view/membership.xml
deleted file mode 100644 (file)
index 321417b..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <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="inherit_id" ref="membership.membership_products_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='categ_id']" position="after">
-                    <field name="membership_grouped"/>
-                    <field name="membership_date2date"/>
-                </xpath>
-                <xpath expr="//label[@for='membership_date_from']" position="attributes">
-                    <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
-                </xpath>
-                <xpath expr="//div[child::field[@name='membership_date_from']]" position="attributes">
-                    <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
-                </xpath>
-                <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="//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>
-
-        <record id="view_membership_membership_line_tree" model="ir.ui.view">
-            <field name="name">membership.membership_line.tree</field>
-            <field name="model">membership.membership_line</field>
-            <field name="type">tree</field>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-            <tree string="Memberships">
-                <field name="partner"/>
-                <field name="membership_id"/>
-                <field name="date_from"/>
-                <field name="date_to"/>
-                <field name="member_price"/>
-                <field name="state"/>
-            </tree>
-            </field>
-        </record>
-        
-        <record id="view_membership_membership_line_form" model="ir.ui.view">
-            <field name="name">membership.membership_line.form</field>
-            <field name="model">membership.membership_line</field>
-            <field name="type">form</field>
-            <field name="priority" eval="8"/>
-            <field name="arch" type="xml">
-            <form string="Memberships">
-                <field name="partner" readonly="1"/>
-                <field name="membership_id" readonly="1"/>
-                <field name="date_from" readonly="1"/>
-                <field name="date_to" readonly="1"/>
-                <field name="member_price" readonly="1"/>
-                <field name="state" readonly="1"/>
-            </form>
-            </field>
-        </record>
-        
-        <record id="view_membership_membership_line_search" model="ir.ui.view">
-            <field name="name">membership.membership_line.search</field>
-            <field name="model">membership.membership_line</field>
-            <field name="type">search</field>
-            <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"/>
-            </search>
-            </field>
-        </record>
-        
-        <record model="ir.actions.act_window" id="act_open_membership_membership_line_view">
-            <field name="name">Memberships</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">membership.membership_line</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
-            <field name="search_view_id" ref="view_membership_membership_line_search"/>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
-        </record>
-        
-        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_form">
-            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
-            <field name="sequence" eval="20"/>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="view_membership_membership_line_form"/>
-        </record>
-        
-        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_tree">
-            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
-            <field name="sequence" eval="10"/>
-            <field name="view_mode">tree</field>
-            <field name="view_id" ref="view_membership_membership_line_tree"/>
-        </record>
-        
-        <menuitem id="menu_membership_membership_line"
-            parent="membership.menu_membership"
-            sequence="20"
-            action="act_open_membership_membership_line_view"/>
-    </data>
-</openerp>
diff --git a/view/partner.xml b/view/partner.xml
deleted file mode 100644 (file)
index e4d4184..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<openerp>
-    <data>
-        <record id="view_remembership_partner_form" model="ir.ui.view">
-            <field name="name">res.partner.form - Remembership</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="membership.view_partner_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='free_member']" position="before">
-                    <field name="member_ident" readonly="1"/>
-                    <newline/>
-                </xpath>
-                <xpath expr="//field[@name='associate_member']" position="replace">
-                    <field name="associate_members" widget="many2many"/>
-                </xpath>
-                <xpath expr="//field/tree/field[@name='date']" position="replace">
-                    <field name="date_from"/>
-                    <field name="date_to"/>
-                </xpath>
-            </field>
-        </record>
-        <record id="view_remembership_members_tree" model="ir.ui.view">
-            <field name="name">Members</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="membership.membership_members_tree"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='name']" position="after">
-                    <field name="member_ident"/>
-                </xpath>
-            </field>
-        </record>
-        <record id="view_remembership_res_partner_member_filter" model="ir.ui.view">
-            <field name="name">res.partner.select</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="membership.view_res_partner_member_filter"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='membership_stop']" position="before">
-                    <field name="name"/>
-                    <field name="member_ident"/>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/views/membership.xml b/views/membership.xml
new file mode 100644 (file)
index 0000000..321417b
--- /dev/null
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <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="inherit_id" ref="membership.membership_products_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='categ_id']" position="after">
+                    <field name="membership_grouped"/>
+                    <field name="membership_date2date"/>
+                </xpath>
+                <xpath expr="//label[@for='membership_date_from']" position="attributes">
+                    <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
+                </xpath>
+                <xpath expr="//div[child::field[@name='membership_date_from']]" position="attributes">
+                    <attribute name="attrs">{'invisible': [('membership_date2date','=',True)]}</attribute>
+                </xpath>
+                <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="//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>
+
+        <record id="view_membership_membership_line_tree" model="ir.ui.view">
+            <field name="name">membership.membership_line.tree</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">tree</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <tree string="Memberships">
+                <field name="partner"/>
+                <field name="membership_id"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="member_price"/>
+                <field name="state"/>
+            </tree>
+            </field>
+        </record>
+        
+        <record id="view_membership_membership_line_form" model="ir.ui.view">
+            <field name="name">membership.membership_line.form</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">form</field>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+            <form string="Memberships">
+                <field name="partner" readonly="1"/>
+                <field name="membership_id" readonly="1"/>
+                <field name="date_from" readonly="1"/>
+                <field name="date_to" readonly="1"/>
+                <field name="member_price" readonly="1"/>
+                <field name="state" readonly="1"/>
+            </form>
+            </field>
+        </record>
+        
+        <record id="view_membership_membership_line_search" model="ir.ui.view">
+            <field name="name">membership.membership_line.search</field>
+            <field name="model">membership.membership_line</field>
+            <field name="type">search</field>
+            <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"/>
+            </search>
+            </field>
+        </record>
+        
+        <record model="ir.actions.act_window" id="act_open_membership_membership_line_view">
+            <field name="name">Memberships</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">membership.membership_line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="view_membership_membership_line_search"/>
+            <field name="domain">[]</field>
+            <field name="context">{}</field>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_form">
+            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
+            <field name="sequence" eval="20"/>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_membership_membership_line_form"/>
+        </record>
+        
+        <record model="ir.actions.act_window.view" id="act_open_membership_membership_line_view_tree">
+            <field name="act_window_id" ref="act_open_membership_membership_line_view"/>
+            <field name="sequence" eval="10"/>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_membership_membership_line_tree"/>
+        </record>
+        
+        <menuitem id="menu_membership_membership_line"
+            parent="membership.menu_membership"
+            sequence="20"
+            action="act_open_membership_membership_line_view"/>
+    </data>
+</openerp>
diff --git a/views/partner.xml b/views/partner.xml
new file mode 100644 (file)
index 0000000..e4d4184
--- /dev/null
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<openerp>
+    <data>
+        <record id="view_remembership_partner_form" model="ir.ui.view">
+            <field name="name">res.partner.form - Remembership</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="membership.view_partner_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='free_member']" position="before">
+                    <field name="member_ident" readonly="1"/>
+                    <newline/>
+                </xpath>
+                <xpath expr="//field[@name='associate_member']" position="replace">
+                    <field name="associate_members" widget="many2many"/>
+                </xpath>
+                <xpath expr="//field/tree/field[@name='date']" position="replace">
+                    <field name="date_from"/>
+                    <field name="date_to"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_remembership_members_tree" model="ir.ui.view">
+            <field name="name">Members</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="membership.membership_members_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='name']" position="after">
+                    <field name="member_ident"/>
+                </xpath>
+            </field>
+        </record>
+        <record id="view_remembership_res_partner_member_filter" model="ir.ui.view">
+            <field name="name">res.partner.select</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="membership.view_res_partner_member_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='membership_stop']" position="before">
+                    <field name="name"/>
+                    <field name="member_ident"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</openerp>