Merge lp:~unifield-team/unifield-addons/uf-619-expiry_date-prodlot into lp:unifield-addons

[Patrick Amstutz]

[lp:~unifield-team/unifield-addons/uf-619-expiry_date-prodlot]

4504. By chloups208 <chloups208@chloups208-laptop> on 2011-10-31

procurement hook from order_ship_create for specifying purchase location

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-10-03 07:27:27 +0000
+++ purchase/purchase.py	2011-10-31 20:30:29 +0000
@@ -476,18 +476,25 @@
             wf_service = netsvc.LocalService("workflow")
             wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
         return picking_id
+    
+    def _hook_copy_name(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        HOOK from purchase>purchase.py for COPY function. Modification of default copy values
+        define which name value will be used
+        '''
+        return {'state':'draft',
+                'shipped':False,
+                'invoiced':False,
+                'invoice_ids': [],
+                'picking_ids': [],
+                'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
+                }
 
     def copy(self, cr, uid, id, default=None, context=None):
         if not default:
             default = {}
-        default.update({
-            'state':'draft',
-            'shipped':False,
-            'invoiced':False,
-            'invoice_ids': [],
-            'picking_ids': [],
-            'name': self.pool.get('ir.sequence').get(cr, uid, 'purchase.order'),
-        })
+        update_values = self._hook_copy_name(cr, uid, [id], context=context, default=default)
+        default.update(update_values)
         return super(purchase_order, self).copy(cr, uid, id, default, context)
 
 

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-09-20 14:38:02 +0000
+++ sale/sale.py	2011-10-31 20:30:29 +0000
@@ -791,7 +791,7 @@
                                  'property_ids': [(6, 0, [x.id for x in line.property_ids])],
                                  'company_id': order.company_id.id,
                                  }
-                    proc_data = self._hook_ship_create_procurement_order(cr, uid, ids, context=context, proc_data=proc_data, line=line,)
+                    proc_data = self._hook_ship_create_procurement_order(cr, uid, ids, context=context, proc_data=proc_data, line=line, order=order,)
                     proc_id = self.pool.get('procurement.order').create(cr, uid, proc_data)
                     proc_ids.append(proc_id)
                     self.pool.get('sale.order.line').write(cr, uid, [line.id], {'procurement_id': proc_id})

=== modified file 'stock/test/stock_test.yml'
--- stock/test/stock_test.yml	2011-01-14 00:11:01 +0000
+++ stock/test/stock_test.yml	2011-10-31 20:30:29 +0000
@@ -281,7 +281,8 @@
     product_id=product_obj.search(cr,uid,[('name','=','HP CD writers')])
     move_ids=move_obj.search(cr,uid,[('product_id','in',product_id)])
     self.split_lot(cr, uid, [ref("stock_move_split_0")], {"lang": 'en_US', "active_model":
-      "stock.move", "active_ids": move_ids, "tz": False, "active_id":move_ids[0]
+      "stock.move", "active_ids": move_ids, "tz": False, "active_id":move_ids[0],
+      'update_mode': 'init',
       })
 -