X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=ca1070cd1cc8e249e32faeba053c13c38208ad84;hb=refs%2Fheads%2Ffix_allow_partner_without_payment_info;hp=178fd4ba82ac31929123ccf6ce8c81b292f01496;hpb=eb053822b2fcc9541abe974209ebf8b89c12fd3b;p=burette%2Fremembership.git

diff --git a/remembership.py b/remembership.py
index 178fd4b..ca1070c 100644
--- a/remembership.py
+++ b/remembership.py
@@ -28,7 +28,6 @@ from datetime import datetime, date
 from dateutil.relativedelta import relativedelta
 from openerp.tools.translate import _
 
-
 class Partner(osv.osv):
     _inherit = 'res.partner'
 
@@ -106,6 +105,35 @@ class Partner(osv.osv):
             list_partner += ids2
         return list_partner
 
+
+    def _membership_state(self, cr, uid, ids, name, args, context=None):
+        res = super(Partner, self)._membership_state(cr, uid, ids, name, args, context)
+        today = time.strftime('%Y-%m-%d')
+
+        # special case when the partner is imported from a file,
+        # in this case is has a valid membership line but
+        # no payment information associated to it, consider it valid
+        for id in ids:
+            if res[id] == 'none':
+
+                partner_data = self.browse(cr, uid, id, context=context)
+
+                no_payment_info_at_all = True
+                valid_line = False
+
+                for mline in partner_data.member_lines:
+                    if mline.date_to >= today:
+                        valid_line = True
+
+                    if mline.account_invoice_line:
+                        no_payment_info_at_all = False
+
+                if no_payment_info_at_all and valid_line:
+                    res[id] = 'paid'
+
+        return res
+
+
     _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.'),
@@ -145,7 +173,7 @@ class Partner(osv.osv):
     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)});
+        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')
@@ -209,6 +237,13 @@ class Partner(osv.osv):
         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)
+
 Partner()
 
 
@@ -247,7 +282,7 @@ class account_invoice_line(osv.osv):
                               and context.get('date_from')
                               and datetime.strptime(context('date_from'), "%Y-%m-%d")
                               or date.today())
-                            date_to   = date_from + relativedelta(months = +12) # TODO: parameterize this delta?
+                            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))
@@ -319,7 +354,8 @@ class account_invoice_line(osv.osv):
                       and context.get('date_from')
                       and datetime.strptime(context.get('date_from'), "%Y-%m-%d")
                       or date.today())
-                    date_to   = date_from + relativedelta(days = +364) # TODO: parameterize this delta?
+                    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))