Merge lp:~savoirfairelinux-openerp/openerp-icm/sale_commossion_context into lp:~openerp-icm/openerp-icm/7.0

[El Hadji Dem (http://www.savoirfairelinux.com)]

[IMP] remove context for _invoice_line_hook method

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

Your description is non informative.
Explain why context is removed.

review: Needs Information

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Approve (code review)

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

Sandy,

Here is the error message we get without this fix :

Server Traceback (most recent call last):
File "/opt/openerp7/bzr/web/addons/web/session.py", line 89, in send
return openerp.netsvc.dispatch_rpc(service_name, method, args)
File "/opt/openerp7/bzr/server/openerp/netsvc.py", line 292, in dispatch_rpc
result = ExportService.getService(service_name).dispatch(method, params)
File "/opt/openerp7/bzr/server/openerp/service/web_services.py", line 626, in dispatch
res = fn(db, uid, *params)
File "/opt/openerp7/bzr/server/openerp/osv/osv.py", line 188, in execute_kw
return self.execute(db, uid, obj, method, *args, **kw or {})
File "/opt/openerp7/bzr/server/openerp/osv/osv.py", line 131, in wrapper
return f(self, dbname, *args, **kwargs)
File "/opt/openerp7/bzr/server/openerp/osv/osv.py", line 197, in execute
res = self.execute_cr(cr, uid, obj, method, *args, **kw)
File "/opt/openerp7/bzr/addons/audittrail/audittrail.py", line 514, in execute_cr
return fct_src(cr, uid, model, method, *args, **kw)
File "/opt/openerp7/bzr/server/openerp/osv/osv.py", line 185, in execute_cr
return getattr(object, method)(cr, uid, *args, **kw)
File "/opt/openerp7/bzr/addons/stock/wizard/stock_invoice_onshipping.py", line 106, in open_invoice
res = self.create_invoice(cr, uid, ids, context=context)
File "/opt/openerp7/bzr/addons/stock/wizard/stock_invoice_onshipping.py", line 146, in create_invoice
context=context)
File "/opt/openerp7/bzr/addons/delivery/stock.py", line 128, in action_invoice_create
context=context)
File "/opt/openerp7/bzr/addons/account_anglo_saxon/stock.py", line 34, in action_invoice_create
res = super(stock_picking,self).action_invoice_create(cr, uid, ids, journal_id, group, type, context=context)
File "/opt/openerp7/bzr/addons/stock/stock.py", line 1160, in action_invoice_create
self._invoice_line_hook(cr, uid, move_line, invoice_line_id)
File "/opt/openerp7/bzr/addons/sale_stock/stock.py", line 122, in _invoice_line_hook
return super(stock_picking, self)._invoice_line_hook(cursor, user, move_line, invoice_line_id)
File "/opt/openerp7/bzr/icm/sale_commission/stock_picking.py", line 51, in _invoice_line_hook
super(stock_picking, self)._invoice_line_hook(cr, uid, move_line, invoice_line_id, context=context)
TypeError: _invoice_line_hook() got an unexpected keyword argument 'context'

[Sandy Carter (http://www.savoirfairelinux.com) (sandy-carter)]

review: Approve

[Davide Corio (enlightx-deactivatedaccount)]

I proposed a different fix here: lp:~enlightx/openerp-icm/7.0_fix_1180743
AFAIK, context propagation is mandatory then we should never remove context from attrs.

[Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)]

review: Disapprove

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Disapprove

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Seems superseeded by lp:~enlightx/openerp-icm/7.0_fix_1180743

Thus I reject this MP

Unmerged revisions

16. By El Hadji Dem (http://www.savoirfairelinux.com) on 2014-01-13

[IMP] remove context for _invoice_line_hook method

=== 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 18:31:29 +0000
@@ -48,7 +48,7 @@
         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)
+        super(stock_picking, self)._invoice_line_hook(cr, uid, move_line, invoice_line_id)
         if move_line and move_line.sale_line_id and not move_line.sale_line_id.product_id.commission_exent:
             so_ref = move_line.sale_line_id.order_id
             for so_agent_id in so_ref.sale_agent_ids: