[PYTHON] -Debug messages

diff --git a/pos_membership.py b/pos_membership.py
index cb81c4c..3513176 100644 (file)
--- a/pos_membership.py
+++ b/pos_membership.py
@@ -66,7 +66,6 @@ class pos_order(osv.osv):
     _inherit = 'pos.order'
 
     def create_partner_from_ui(self, cr, uid, partners, context=None):
-        print ("DEV: [pos_membership] [create_partner_from_ui] partners=%s" % str(partners))
         partner_ids = []
         partner_obj = self.pool.get('res.partner')
         for tmp_partner in partners:
@@ -81,7 +80,6 @@ class pos_order(osv.osv):
     def create_from_ui(self, cr, uid, orders, context=None):
         # NOTE: copied from openerp/addons/point_of_sale/point_of_sale.py
         #_logger.info("orders: %r", orders)
-        print ("DEV: [pos_membership] [create_from_ui] order=", str(orders))
         order_ids = []
         for tmp_order in orders:
             order = tmp_order['data']
@@ -140,7 +138,6 @@ class membership_line(osv.osv):
         for partner in self.pool.get('res.partner').browse(cr, uid, ids, context=context):
             if partner.member_lines:
                 list_membership_line += member_line_obj.search(cr, uid, [('id', 'in', [l.id for l in partner.member_lines])], context=context)
-        print("DEV: [pos_membership] [membership_line] [_get_partners]: ids=%s res=%s" % (str(ids), str(list_membership_line)))
         return list_membership_line
 
     #def _get_membership_lines_from_account_invoice(self, cr, uid, ids, context=None):
@@ -159,7 +156,6 @@ class membership_line(osv.osv):
     def _get_membership_lines_from_pos_order(self, cr, uid, ids, context=None):
         list_membership_line = []
         member_line_obj = self.pool.get('membership.membership_line')
-        print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: ids=%s context=%s" % (str(ids), str(context)))
         for order in self.pool.get('pos.order').browse(cr, uid, ids, context=context):
             if order.lines:
                 list_membership_line += member_line_obj.search(cr, uid, [('pos_order_line', 'in', [l.id for l in order.lines])], context=context)
@@ -168,7 +164,6 @@ class membership_line(osv.osv):
         # , 'ids': list_membership_line
         # }
         res = list_membership_line
-        print("DEV: [pos_membership] [membership_line] [_get_membership_lines_from_pos_order]: res=%s" % str(res))
         return res
 
     def _check_membership_date(self, cr, uid, ids, context=None):
@@ -219,7 +214,6 @@ class membership_line(osv.osv):
         @param return: Dictionary of state Value
         """
         res = {}
-        print("DEV: [pos_membership] [membership_line] [_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context)))
         inv_obj = self.pool.get('account.invoice')
         ord_obj = self.pool.get('pos.order')
         for line in self.browse(cr, uid, ids, context=context):
@@ -273,7 +267,6 @@ class membership_line(osv.osv):
                 if not fetched:
                     res[line.id] = 'canceled'
                     continue
-                print("DEV: [pos_membership] [membership_line] [_state]: line.partner.id=%s" % (str(line.partner.id)))
                 self.write(cr, uid, line.id, {'partner': line.partner.id})
                 # NOTE: force une mise à jour du partner,
                 #       car il n'y en a pas lors de la création du pos.order
@@ -290,7 +283,6 @@ class membership_line(osv.osv):
                 elif (ostate == 'done') | (ostate == 'invoiced'):
                     state = 'paid'
                     # XXX: regarder l'équivalent de out_refund pour un pos.order
-                    print("DEV: [pos_membership] [membership_line] [_state]: paid: TODO")
                     #inv = ord_obj.browse(cr, uid, fetched[1], context=context)
                     #for payment in inv.payment_ids:
                     #    if payment.invoice and payment.invoice.type == 'out_refund':
@@ -298,20 +290,15 @@ class membership_line(osv.osv):
                 elif ostate == 'cancel':
                     state = 'canceled'
                 res[line.id] = state
-        print("DEV: [pos_membership] [membership_line] [_state]: return=%s" % (str(res)))
         return res
 
     def write(self, cr, uid, ids, vals, context=None):
-        print("DEV: [pos_membership] [membership_line] [write]: ids=%s vals=%s" % (str(ids), str(vals)))
         res = super(membership_line, self).write(cr, uid, ids, vals, context=context)
-        print("DEV: [pos_membership] [membership_line] [write]: res=%s" % str(res))
         return res
 
     def create(self, cr, uid, vals, context=None):
-        print("DEV: [pos_membership] [membership_line] [create]: vals=%s" % (str(vals)))
         member_line_obj = self.pool.get('membership.membership_line')
         res = super(membership_line, self).create(cr, uid, vals, context=context)
-        print("DEV: [pos_membership] [membership_line] [create]: res=%s" % (str(res)))
         return res
 
     _columns = {
@@ -344,7 +331,6 @@ class Partner(osv.osv):
     _inherit = 'res.partner'
 
     def _get_partner_id(self, cr, uid, ids, context=None):
-        print("DEV: [pos_membership] [Partner] [_get_partner_id]: ids=%s context=%s" % (str(ids), str(context)))
         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)
@@ -355,7 +341,6 @@ class Partner(osv.osv):
         while ids2:
             ids2 = res_obj.search(cr, uid, [('associate_member', 'in', ids2)], context=context)
             list_partner += ids2
-        print("DEV: [pos_membership] [Partner] [_get_partner_id]: res=%s" % (str(list_partner)))
         return list_partner
 
     def _get_invoice_partner(self, cr, uid, ids, context=None):
@@ -395,12 +380,10 @@ class Partner(osv.osv):
         @param return: Dictionary of Membership state Value
         """
         res = {}
-        print("DEV: [pos_membership] [Partner] [_membership_state]: name=%s ids=%s args=%s context=%s" % (str(name), str(ids), str(args), str(context)))
         for id in ids:
             res[id] = 'none'
         today = time.strftime('%Y-%m-%d')
         for id in ids:
-            print("DEV: [pos_membership] [Partner] [_membership_state] id=%s" % (str(id)))
             partner_data = self.browse(cr, uid, id, context=context)
             if partner_data.membership_cancel and today > partner_data.membership_cancel:
                 res[id] = 'canceled'
@@ -409,15 +392,11 @@ class Partner(osv.osv):
                 res[id] = 'old'
                 continue
             s = 4
-            print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines] [test]")
             if partner_data.member_lines:
-                print("DEV: [pos_membership] [Partner] [_membership_state] [partner_data] [member_lines]" % ())
                 for mline in partner_data.member_lines:
-                    print("DEV: [pos_membership] [Partner] [_membership_state] [mline]: id=%s" % str(mline.id))
                     if mline.date_to >= today:
                         if mline.account_invoice_line and mline.account_invoice_line.invoice_id:
                             istate = mline.account_invoice_line.invoice_id.state
-                            print("DEV: [pos_membership] [Partner] [_membership_state] [account_invoice_line]: id=%s istate=%s" % (str(mline.account_invoice_line.invoice_id.id), str(istate)))
                             if istate == 'paid':
                                 s = 0
                                 inv = mline.account_invoice_line.invoice_id
@@ -433,7 +412,6 @@ class Partner(osv.osv):
                                 s = 3
                         elif mline.pos_order_line and mline.pos_order_line.order_id:
                             ostate = mline.pos_order_line.order_id.state
-                            print("DEV: [pos_membership] [Partner] [_membership_state] [pos_order_line]: id=%s ostate=%s" % (str(mline.pos_order_line.order_id.id), str(ostate)))
                             if ostate == 'paid' and s != 0 and s != 1:
                                 s = 3
                             if ostate == 'invoiced':
@@ -441,7 +419,6 @@ class Partner(osv.osv):
                             if ostate == 'done':
                                 s = 0
                                 # XXX: regarder l'équivalent de out_refund pour un pos.order
-                                print("DEV: [pos_membership] [partner] [_membership_state]: paid: TODO")
                                 #inv = mline.pos_order_line.order_id
                                 #for payment in inv.payment_ids:
                                 #    if payment.invoice.type == 'out_refund':
@@ -449,7 +426,6 @@ class Partner(osv.osv):
                                 break
                             elif ostate == 'open' and s != 0:
                                 # XXX: 1 donne invoiced, c'est pitet pas bon
-                                print("DEV: [pos_membership] [partner] [_membership_state]: invoiced: TODO")
                                 s = 1
                             elif ostate == 'cancel' and s != 0 and s != 1:
                                 s = 2
@@ -485,7 +461,6 @@ class Partner(osv.osv):
             if partner_data.associate_member:
                 res_state = self._membership_state(cr, uid, [partner_data.associate_member.id], name, args, context=context)
                 res[id] = res_state[partner_data.associate_member.id]
-        print("DEV: [pos_membership] [Partner] [_membership_state]: res=%s" % (str(res)))
         return res
 
     def _membership_date(self, cr, uid, ids, name, args, context=None):
@@ -493,7 +468,6 @@ class Partner(osv.osv):
         name = name[0]
         res = {}
         member_line_obj = self.pool.get('membership.membership_line')
-        print("DEV: [pos_membership] [Partner] [_membership_date]: ids=%s" % (str(ids)))
         for partner in self.browse(cr, uid, ids, context=context):
             if partner.associate_member:
                  partner_id = partner.associate_member.id
@@ -510,7 +484,6 @@ class Partner(osv.osv):
                 if line_id:
                         res[partner.id]['membership_start'] = member_line_obj.read(cr, uid, line_id[0],
                                 ['date_from'], context=context)['date_from']
-                        print("DEV: [pos_membership] [Partner] [_membership_date] [membership_start]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_start'])))
 
             if name == 'membership_stop':
                 line_id1 = member_line_obj.search(cr, uid, [('partner', '=', partner_id),('date_cancel','=',False)],
@@ -518,15 +491,12 @@ class Partner(osv.osv):
                 if line_id1:
                       res[partner.id]['membership_stop'] = member_line_obj.read(cr, uid, line_id1[0],
                                 ['date_to'], context=context)['date_to']
-                      print("DEV: [pos_membership] [Partner] [_membership_date] [membership_stop]: ids=%s date=%s" % (str(ids), 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']
-                        print("DEV: [pos_membership] [Partner] [_membership_date] [membership_cancel]: ids=%s date=%s" % (str(ids), str(res[partner.id]['membership_cancel'])))
-        print("DEV: [pos_membership] [Partner] [_membership_date]: res=%s" % (str(res)))
         return res
 
     def _get_partners(self, cr, uid, ids, context=None):
@@ -595,7 +565,6 @@ class pos_order(osv.osv):
 
     # XXX: copied from openerp/addons/point_of_sale/point_of_sale.py
     def action_invoice(self, cr, uid, ids, context=None):
-        print ("DEV: [pos_membership] [pos_order] [action_invoice]")
         wf_service = netsvc.LocalService("workflow")
         inv_ref = self.pool.get('account.invoice')
         inv_line_ref = self.pool.get('account.invoice.line')
@@ -675,17 +644,13 @@ class pos_order(osv.osv):
         }
 
     def write(self, cr, uid, ids, vals, context=None):
-        print("DEV: [pos_membership] [pos_order] [write]: ids=%s vals=%s" % (str(ids), str(vals)))
         pos_order_obj = self.pool.get('pos.order')
         res = super(pos_order, self).write(cr, uid, ids, vals, context=context)
-        print("DEV: [pos_membership] [pos_order] [write]: res=%s" % str(res))
         return res
 
     def create(self, cr, uid, vals, context=None):
-        print("DEV: [pos_membership] [pos_order] [create]: vals=%s" % (str(vals)))
         pos_order_obj = self.pool.get('pos.order')
         res = super(pos_order, self).create(cr, uid, vals, context=context)
-        print("DEV: [pos_membership] [pos_order] [create]: res=%s" % (str(res)))
         return res
 
     def onchange_partner_id(self, cr, uid, ids, part=False, context=None):
@@ -717,10 +682,8 @@ class pos_order_line(osv.osv):
     _inherit = 'pos.order.line'
 
     def write(self, cr, uid, ids, vals, context=None):
-        print("DEV: [pos_membership] [pos_order_line] [write]: ids=%s vals=%s context=%s" % (str(ids), str(vals), str(context)))
         member_line_obj = self.pool.get('membership.membership_line')
         res = super(pos_order_line, self).write(cr, uid, ids, vals, context=context)
-        print ("DEV: [pos_membership] [pos_order_line] [write] [super] : res=%s" % str(res))
         for line in self.browse(cr, uid, ids, context=context):
             ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context)
             if line.product_id and line.product_id.membership:
@@ -741,8 +704,6 @@ class pos_order_line(osv.osv):
                         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: [pos_membership] [pos_order_line] [write] date_from: %s" % str(date_from))
-                    print ("DEV: [pos_membership] [pos_order_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
@@ -756,8 +717,6 @@ class pos_order_line(osv.osv):
                         ]
                       , context=context)
                     for associate_member_line in member_line_obj.browse(cr, uid, associate_member_line_ids, context=context):
-                        print ("DEV: [pos_membership] [pos_order_line] [write] [associate] date_from: %s" % str(date_from))
-                        print ("DEV: [pos_membership] [pos_order_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
@@ -786,7 +745,6 @@ class pos_order_line(osv.osv):
         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: [pos_membership] [pos_order_line] [write] : return=%s" % str(res))
         return res
 
     def unlink(self, cr, uid, ids, context=None):
@@ -800,9 +758,7 @@ class pos_order_line(osv.osv):
 
     def create(self, cr, uid, vals, context=None):
         member_line_obj = self.pool.get('membership.membership_line')
-        print("DEV: [pos_membership] [pos_order_line] [create]: vals=%s context=%s" % (str(vals), str(context)))
         res = super(pos_order_line, self).create(cr, uid, vals, context=context)
-        print ("DEV: [pos_membership] [pos_order_line] [create] [super] : res=%s" % str(res))
         line = self.browse(cr, uid, res, context=context)
 
         ml_ids = member_line_obj.search(cr, uid, [('pos_order_line', '=', line.id)], context=context)
@@ -819,8 +775,6 @@ class pos_order_line(osv.osv):
                 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: [pos_membership] [pos_order_line] [create] date_from: %s" % str(date_from))
-            print ("DEV: [pos_membership] [pos_order_line] [create] date_to  : %s" % str(date_to))
             member_line_obj.create(cr, uid, {
                         'partner': line.order_id.partner_id and line.order_id.partner_id.id or False,
                         'membership_id': line.product_id.id,
@@ -835,8 +789,6 @@ class pos_order_line(osv.osv):
                 partners.extend(line.order_id.partner_id.associate_members)
                 #Adding membership lines just for associate partners
                 for associate_member in line.order_id.partner_id.associate_members:
-                    print ("DEV: [pos_membership] [pos_order_line] [create] [associate] date_from: %s" % str(date_from))
-                    print ("DEV: [pos_membership] [pos_order_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,
@@ -851,13 +803,10 @@ class pos_order_line(osv.osv):
             #Define member ident if it's necessary
             for i in partners:
                 if not i:
-                    print ("\033[7mXXX: [pos_membership] [pos_order_line] [create] : pos_order_line has no partner_id!\033[0m")
                     break
                 if not i.member_ident:
-                    print ("DEV: [pos_membership] [pos_order_line] [create] [partners] : i=%s i.id=%s" % (str(i), str(i.id)))
                     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: [pos_membership] [pos_order_line] [create] : return=%s" % str(res))
         return res
 
 pos_order_line()