Merge lp:~akretion-team/openobject-addons/sale-modular-picking-better-context into lp:openobject-addons

[Raphaël Valyi - http://www.akretion.com]

better signature for methods introduced during recent refactoring to have more modular picking creation in sale and purchase modules.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

we will however double check those two commit internally at Akretion before requesting the merge

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello,

According to the discussion we had about methods called by workflow ( https://code.launchpad.net/~openerp-community/openobject-server/context-in-workflows/+merge/85518 ), I just normalized the methods signatures of all methods touched and created by the sale/purchase picking modularization so they now have a standard context argument as their last argument.

We may probably not have perfect signatures everywhere in 6.1, but I think it's normal that at least new methods/refactored methods have the correct signature, at least that's a step in the right direction, so could you please merge it now?

review: Needs Resubmitting

[Olivier Dony (Odoo) (odo-openerp)]

Looks good, but while merging I will also change the context passing to use the usual kwargs (making future API evolution easier), and also correct existing modules who already override the current API with *args (delivery, project_mrp, sale_journal). In most cases this is a good opportunity to replace the old override of action_ship_create with a simpler/cleaner _prepare* override.

Will complete the merge asap today.

Thanks for the clean and simple contribution!

PS: online diff is not up to date to due an ongoing LP bug that seems to affect addons branches randomly: bug 904683 / bug 808930 - hope it will be solved soon

review: Approve (offline ;-))

[lp:~akretion-team/openobject-addons/sale-modular-picking-better-context]

6027. By Raphaël Valyi - http://www.akretion.com on 2011-12-21

[MERGE] merged with trunk: added context arg in sale.order#get_date_planned (from 20/12 merge)

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-11-17 15:40:04 +0000
+++ purchase/purchase.py	2011-11-21 22:44:24 +0000
@@ -453,7 +453,7 @@
             self.log(cr, uid, id, message)
         return True
 
-    def _prepare_order_picking(self, cr, uid, order, *args):
+    def _prepare_order_picking(self, cr, uid, order, context=None):
         return {
             'name': self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.in'),
             'origin': order.name + ((order.origin and (':' + order.origin)) or ''),
@@ -466,7 +466,7 @@
             'move_lines' : [],
         }
          
-    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, *args):
+    def _prepare_order_line_move(self, cr, uid, order, order_line, picking_id, context=None):
         return {
             'name': order.name + ': ' + (order_line.name or ''),
             'product_id': order_line.product_id.id,
@@ -487,7 +487,7 @@
             'price_unit': order_line.price_unit
         }
 
-    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, *args):
+    def _create_pickings(self, cr, uid, order, order_lines, picking_id=False, context=None):
         """Creates pickings and appropriate stock moves for given order lines, then
         confirms the moves, makes them available, and confirms the picking.
 
@@ -507,7 +507,7 @@
         :return: list of IDs of pickings used/created for the given order lines (usually just one)
         """
         if not picking_id: 
-            picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
+            picking_id = self.pool.get('stock.picking').create(cr, uid, self._prepare_order_picking(cr, uid, order, context))
         todo_moves = []
         stock_move = self.pool.get('stock.move')
         wf_service = netsvc.LocalService("workflow")
@@ -515,7 +515,7 @@
             if not order_line.product_id:
                 continue
             if order_line.product_id.type in ('product', 'consu'):
-                move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, *args))
+                move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, context))
                 if order_line.move_dest_id:
                     order_line.move_dest_id.write({'location_id': order.location_id.id})
                 todo_moves.append(move)
@@ -527,7 +527,7 @@
     def action_picking_create(self,cr, uid, ids, *args):
         picking_ids = []
         for order in self.browse(cr, uid, ids):
-            picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, *args))
+            picking_ids.extend(self._create_pickings(cr, uid, order, order.order_line, None, {}))#TODO propagate context the day we have it
 
         # Must return one unique picking ID: the one to connect in the subflow of the purchase order.
         # In case of multiple (split) pickings, we should return the ID of the critical one, i.e. the

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-11-18 13:14:04 +0000
+++ sale/sale.py	2011-11-21 22:44:24 +0000
@@ -676,7 +676,7 @@
                 return False
             return canceled
 
-    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, *args):
+    def _prepare_order_line_procurement(self, cr, uid, order, line, move_id, date_planned, context=None):
         return {
             'name': line.name,
             'origin': order.name,
@@ -695,7 +695,7 @@
             'company_id': order.company_id.id,
         }
 
-    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, *args):
+    def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None):
         location_id = order.shop_id.warehouse_id.lot_stock_id.id
         output_id = order.shop_id.warehouse_id.lot_output_id.id
         return {
@@ -722,7 +722,7 @@
             'price_unit': line.product_id.standard_price or 0.0
         }
 
-    def _prepare_order_picking(self, cr, uid, order, *args):
+    def _prepare_order_picking(self, cr, uid, order, context=None):
         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
         return {
             'name': pick_name,
@@ -772,13 +772,13 @@
             if line.product_id:
                 if line.product_id.product_tmpl_id.type in ('product', 'consu'):
                     if not picking_id:
-                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, *args))
-                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, *args))
+                        picking_id = picking_obj.create(cr, uid, self._prepare_order_picking(cr, uid, order, {})) #TODO pass context if present
+                    move_id = move_obj.create(cr, uid, self._prepare_order_line_move(cr, uid, order, line, picking_id, date_planned, {}))
                 else:
                     # a service has no stock move
                     move_id = False
 
-                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, *args))
+                proc_id = procurement_obj.create(cr, uid, self._prepare_order_line_procurement(cr, uid, order, line, move_id, date_planned, {}))
                 proc_ids.append(proc_id)
                 line.write({'procurement_id': proc_id})