X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=remembership.py;h=aee965a4795ef05c2e56e56ed8d565e055a638df;hb=06296bf7ad9ed35f1fa54732a21f6b4b31f65061;hp=e0aba07daed2c395936c0eda810e55c1a86259d9;hpb=1b1e3987c2f63421b973068fb6a53c3c45ec20c1;p=burette%2Fremembership.git

diff --git a/remembership.py b/remembership.py
index e0aba07..aee965a 100644
--- a/remembership.py
+++ b/remembership.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    Remembership module for OpenERP, Overload membership module
-#    Copyright (C) 2012 L'Heureux Cyclage (<http://www.heureux-cyclage.org>) Ludovic CHEVALIER
+#    Copyright (C) 2012-2013 L'Heureux Cyclage (<http://www.heureux-cyclage.org>)
 #
 #    This file is a part of Remembership
 #
@@ -144,8 +144,8 @@ 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
-        ctx = context and context.copy() or {}
-        ctx['date_from'] = datas.get('date_from', None)
+        context = context and context.copy() or {}
+        context['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')
@@ -315,7 +315,7 @@ class account_invoice_line(osv.osv):
                       and context['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(days = +364) # TODO: parameterize this delta?
                     date_from = date_from.strftime("%Y-%m-%d")
                     date_to   = date_to  .strftime("%Y-%m-%d")
                 print ("DEV: [create] date_from: %s" % str(date_from))
@@ -351,22 +351,4 @@ class account_invoice_line(osv.osv):
         return res
 
 account_invoice_line()
-
-
-class pos_make_payment(osv.osv_memory):
-    _inherit = 'pos.make.payment'
-
-    def check(self, cr, uid, ids, context=None):
-        """
-        Auto invoice orders. Temporarly solution before make partner members just with orders, without invoice.
-        """
-        res = super(pos_make_payment, self).check(cr, uid, ids, context=context)
-
-        order_obj = self.pool.get('pos.order')
-        order_obj.action_invoice(cr, uid, ids, context=context)
-
-        return res
-
-pos_make_payment()
-
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: