savoirfairelinux-openerp team mailing list archive

["elhadji.dem@xxxxxxxxxxxxxxxxxxxx" <elhadji.dem@xxxxxxxxxxxxxxxxxxxx>]

elhadji.dem@xxxxxxxxxxxxxxxxxxxx has proposed merging lp:~savoirfairelinux-openerp/openerp-icm/sale_commission_context into lp:~savoirfairelinux-openerp/openerp-icm/bug1160750.

Requested reviews:
  Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)

For more details, see:
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-icm/sale_commission_context/+merge/201460

[IMP] add context and PEP8 fixes
-- 
https://code.launchpad.net/~savoirfairelinux-openerp/openerp-icm/sale_commission_context/+merge/201460
Your team Savoir-faire Linux' OpenERP is subscribed to branch lp:~savoirfairelinux-openerp/openerp-icm/bug1160750.

=== modified file 'sale_commission/stock_picking.py'
--- sale_commission/stock_picking.py	2013-12-16 22:05:58 +0000
+++ sale_commission/stock_picking.py	2014-01-13 17:01:27 +0000
@@ -22,10 +22,17 @@
 
 """Modificamos la creación de factura desde albarán para incluir el comportamiento de comisiones"""
 
+<<<<<<< TREE
 from osv import orm, fields
 
 
 class product_product(orm.Model):
+=======
+from osv import osv, fields
+
+
+class product_product(osv.osv):
+>>>>>>> MERGE-SOURCE
     _inherit = 'product.product'
     _columns = {
         'commission_exent': fields.boolean('Commission exent')
@@ -33,9 +40,16 @@
     _defaults = {
         'commission_exent': False,
     }
+<<<<<<< TREE
 
 
 class stock_picking(orm.Model):
+=======
+product_product()
+
+
+class stock_picking(osv.osv):
+>>>>>>> MERGE-SOURCE
     """Modificamos la creación de factura desde albarán para incluir el comportamiento de comisiones"""
 
     _inherit = 'stock.picking'
@@ -43,16 +57,29 @@
         'agent_ids': fields.many2many('sale.agent', 'sale_agent_clinic_rel', 'agent_id', 'clinic_id', 'Agentes')
     }
 
+<<<<<<< TREE
     def _invoice_line_hook(self, cr, uid, move_line, invoice_line_id, context=None):
+=======
+    def _invoice_line_hook(self, cursor, user, move_line, invoice_line_id, context=None):
+>>>>>>> MERGE-SOURCE
         '''Call after the creation of the invoice line'''
+<<<<<<< TREE
         if context is None:
             context = {}
         agent_pool = self.pool.get('invoice.line.agent')
         super(stock_picking, self)._invoice_line_hook(cr, uid, move_line, invoice_line_id, context=context)
         if move_line and move_line.sale_line_id and not move_line.sale_line_id.product_id.commission_exent:
+=======
+        if context is None:
+            context = {}
+        super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id, context=context)
+
+        if move_line and move_line.sale_line_id and move_line.sale_line_id.product_id.commission_exent != True :
+>>>>>>> MERGE-SOURCE
             so_ref = move_line.sale_line_id.order_id
             for so_agent_id in so_ref.sale_agent_ids:
                 vals = {
+<<<<<<< TREE
                     'invoice_line_id': invoice_line_id,
                     'agent_id': so_agent_id.agent_id.id,
                     'commission_id': so_agent_id.commission_id.id,
@@ -60,3 +87,16 @@
                 }
                 line_agent_id = agent_pool.create(cr, uid, vals, context=context)
                 agent_pool.calculate_commission(cr, uid, [line_agent_id], context=context)
+=======
+                    'invoice_line_id': invoice_line_id,
+                    'agent_id': so_agent_id.agent_id.id,
+                    'commission_id': so_agent_id.commission_id.id,
+                    'settled': False
+                }
+
+                line_agent_id = self.pool.get('invoice.line.agent').create(cursor, user, vals, context=context)
+                self.pool.get('invoice.line.agent').calculate_commission(cursor, user, [line_agent_id])
+        return
+
+stock_picking()
+>>>>>>> MERGE-SOURCE