Merge lp:~unifield-team/unifield-addons/modification-of-stock-for-shipment into lp:unifield-addons

[Patrick Amstutz]

ne pas oublier les tests yaml dans sale, merci.

[lp:~unifield-team/unifield-addons/modification-of-stock-for-shipment]

4494. By chloups208 <chloups208@chloups208-laptop> on 2011-09-21

[UF-390]one more hook for stock_picking>action_assign

=== modified file 'sale/sale.py'
--- sale/sale.py	2011-07-07 10:50:50 +0000
+++ sale/sale.py	2011-09-21 12:33:24 +0000
@@ -649,14 +649,76 @@
             if notcanceled:
                 return False
             return canceled
-
-    def action_ship_create(self, cr, uid, ids, *args):
+    
+    def _hook_ship_create_stock_move(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to modify the data for stock move creation
+        '''
+        move_data = kwargs['move_data']
+        return move_data
+
+    def _hook_ship_create_procurement_order(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to modify the data for procurement order creation
+        '''
+        proc_data = kwargs['proc_data']
+        return proc_data
+    
+    def _hook_ship_create_stock_picking(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to modify the data for stock picking creation
+        '''
+        picking_data = kwargs['picking_data']
+        return picking_data
+    
+    def _hook_ship_create_execute_picking_workflow(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to avoid the stock picking workflow execution
+        '''
+        picking_id = kwargs['picking_id']
+        return picking_id
+    
+    def _hook_ship_create_execute_specific_code_01(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to execute specific code at position 01
+        '''
+        pass
+    
+    def _hook_ship_create_line_condition(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_ship_create method from sale>sale.py
+        
+        - allow to customize the execution condition
+        '''
+        line = kwargs['line']
+        result = line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu')
+        return result
+
+    def action_ship_create(self, cr, uid, ids, context=None, *args):
+        if context is None:
+            context = {}
         wf_service = netsvc.LocalService("workflow")
         picking_id = False
         move_obj = self.pool.get('stock.move')
         proc_obj = self.pool.get('procurement.order')
         company = self.pool.get('res.users').browse(cr, uid, uid).company_id
-        for order in self.browse(cr, uid, ids, context={}):
+        for order in self.browse(cr, uid, ids, context=context):
             proc_ids = []
             output_id = order.shop_id.warehouse_id.lot_output_id.id
             picking_id = False
@@ -668,63 +730,69 @@
                 if line.state == 'done':
                     continue
                 move_id = False
-                if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'):
+                if self._hook_ship_create_line_condition(cr, uid, ids, context=context, line=line,):
                     location_id = order.shop_id.warehouse_id.lot_stock_id.id
                     if not picking_id:
                         pick_name = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking.out')
-                        picking_id = self.pool.get('stock.picking').create(cr, uid, {
-                            'name': pick_name,
-                            'origin': order.name,
-                            'type': 'out',
-                            'state': 'auto',
-                            'move_type': order.picking_policy,
-                            'sale_id': order.id,
-                            'address_id': order.partner_shipping_id.id,
-                            'note': order.note,
-                            'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
-                            'company_id': order.company_id.id,
-                        })
-                    move_id = self.pool.get('stock.move').create(cr, uid, {
-                        'name': line.name[:64],
-                        'picking_id': picking_id,
-                        'product_id': line.product_id.id,
-                        'date': date_planned,
-                        'date_expected': date_planned,
-                        'product_qty': line.product_uom_qty,
-                        'product_uom': line.product_uom.id,
-                        'product_uos_qty': line.product_uos_qty,
-                        'product_uos': (line.product_uos and line.product_uos.id)\
-                                or line.product_uom.id,
-                        'product_packaging': line.product_packaging.id,
-                        'address_id': line.address_allotment_id.id or order.partner_shipping_id.id,
-                        'location_id': location_id,
-                        'location_dest_id': output_id,
-                        'sale_line_id': line.id,
-                        'tracking_id': False,
-                        'state': 'draft',
-                        #'state': 'waiting',
-                        'note': line.notes,
-                        'company_id': order.company_id.id,
-                    })
+                        picking_data = {'name': pick_name,
+                                        'origin': order.name,
+                                        'type': 'out',
+                                        'state': 'auto',
+                                        'move_type': order.picking_policy,
+                                        'sale_id': order.id,
+                                        'address_id': order.partner_shipping_id.id,
+                                        'note': order.note,
+                                        'invoice_state': (order.order_policy=='picking' and '2binvoiced') or 'none',
+                                        'company_id': order.company_id.id,
+                                        }
+                        picking_data = self._hook_ship_create_stock_picking(cr, uid, ids, context=context, picking_data=picking_data, order=order,)
+                        picking_id = self.pool.get('stock.picking').create(cr, uid, picking_data, context=context)
+                        
+                    move_data = {'name': line.name[:64],
+                                 'picking_id': picking_id,
+                                 'product_id': line.product_id.id,
+                                 'date': date_planned,
+                                 'date_expected': date_planned,
+                                 'product_qty': line.product_uom_qty,
+                                 'product_uom': line.product_uom.id,
+                                 'product_uos_qty': line.product_uos_qty,
+                                 'product_uos': (line.product_uos and line.product_uos.id)\
+                                 or line.product_uom.id,
+                                 'product_packaging': line.product_packaging.id,
+                                 'address_id': line.address_allotment_id.id or order.partner_shipping_id.id,
+                                 'location_id': location_id,
+                                 'location_dest_id': output_id,
+                                 'sale_line_id': line.id,
+                                 'tracking_id': False,
+                                 'state': 'draft',
+                                 #'state': 'waiting',
+                                 'note': line.notes,
+                                 'company_id': order.company_id.id,
+                                 }
+                    
+                    # hook for stock move data modification
+                    move_data = self._hook_ship_create_stock_move(cr, uid, ids, context=context, move_data=move_data, line=line, order=order,)
+                    move_id = self.pool.get('stock.move').create(cr, uid, move_data, context=context)
 
                 if line.product_id:
-                    proc_id = self.pool.get('procurement.order').create(cr, uid, {
-                        'name': line.name,
-                        'origin': order.name,
-                        'date_planned': date_planned,
-                        'product_id': line.product_id.id,
-                        'product_qty': line.product_uom_qty,
-                        'product_uom': line.product_uom.id,
-                        'product_uos_qty': (line.product_uos and line.product_uos_qty)\
-                                or line.product_uom_qty,
-                        'product_uos': (line.product_uos and line.product_uos.id)\
-                                or line.product_uom.id,
-                        'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
-                        'procure_method': line.type,
-                        'move_id': move_id,
-                        'property_ids': [(6, 0, [x.id for x in line.property_ids])],
-                        'company_id': order.company_id.id,
-                    })
+                    proc_data = {'name': line.name,
+                                 'origin': order.name,
+                                 'date_planned': date_planned,
+                                 'product_id': line.product_id.id,
+                                 'product_qty': line.product_uom_qty,
+                                 'product_uom': line.product_uom.id,
+                                 'product_uos_qty': (line.product_uos and line.product_uos_qty)\
+                                 or line.product_uom_qty,
+                                 'product_uos': (line.product_uos and line.product_uos.id)\
+                                 or line.product_uom.id,
+                                 'location_id': order.shop_id.warehouse_id.lot_stock_id.id,
+                                 'procure_method': line.type,
+                                 'move_id': move_id,
+                                 '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_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})
                     if order.state == 'shipping_except':
@@ -739,11 +807,12 @@
 
             val = {}
 
-            if picking_id:
+            if self._hook_ship_create_execute_picking_workflow(cr, uid, ids, context=context, picking_id=picking_id,):
                 wf_service.trg_validate(uid, 'stock.picking', picking_id, 'button_confirm', cr)
 
             for proc_id in proc_ids:
                 wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr)
+                self._hook_ship_create_execute_specific_code_01(cr, uid, ids, context=context, order=order, proc_id=proc_id,)
 
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
 
=== modified file 'sale/test/invoice_on_shipped_qty.yml'
--- sale/test/invoice_on_shipped_qty.yml	2011-01-14 00:11:01 +0000
+++ sale/test/invoice_on_shipped_qty.yml	2011-09-21 12:33:24 +0000
@@ -86,19 +86,22 @@
   I verify that an invoice is created on the basis of shipped quantities 100 not ordered quantities 200
 -
   !python {model: account.invoice}: |
-    sale_order_obj = self.pool.get('sale.order')
-    so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
-    picking_obj = self.pool.get('stock.picking')
-    ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out'),('state','=','done')])
-    qty = qty1 = 0.0
-    for pick_brw in picking_obj.browse(cr,uid, ids):
-        for lines in pick_brw.move_lines:
-            qty=lines.product_qty
-    inv_id = self.search(cr, uid, [('origin', 'like', so.name)])
-    inv_brw = self.browse(cr,uid,inv_id)[0]
-    for inv_lines in inv_brw.invoice_line:
-        qty1=inv_lines.quantity
-    assert (qty1 == qty), "Quantities are not the same"
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+    if not mod_pur:
+      sale_order_obj = self.pool.get('sale.order')
+      so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
+      picking_obj = self.pool.get('stock.picking')
+      ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out'),('state','=','done')])
+      qty = qty1 = 0.0
+      for pick_brw in picking_obj.browse(cr,uid, ids):
+          for lines in pick_brw.move_lines:
+              qty=lines.product_qty
+      inv_id = self.search(cr, uid, [('origin', 'like', so.name)])
+      inv_brw = self.browse(cr,uid,inv_id)[0]
+      for inv_lines in inv_brw.invoice_line:
+          qty1=inv_lines.quantity
+      assert (qty1 == qty), "Quantities are not the same"
 -
   I open the Invoice for the SO.
 -
 
=== modified file 'sale/test/manual_order_policy.yml'
--- sale/test/manual_order_policy.yml	2011-01-14 00:11:01 +0000
+++ sale/test/manual_order_policy.yml	2011-09-21 12:33:24 +0000
@@ -244,14 +244,16 @@
         ids = picking_obj.search(cr, uid, [('purchase_id', '=', po.id ),('state', '=', 'done')])
         assert(ids),"Picking is not in the done state!"
 -
-  Then I done the picking
+  Then I done the picking, if msf_outgoing module is not installed
 -
   !python {model: stock.picking }: |
    import time
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
+   if picking_id and not mod_pur:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
       partial_datas = {
@@ -270,11 +272,14 @@
   I verify that picking for sale order is in done state.
 -
   !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if not mod_pur:
+      sale_order_obj = self.pool.get('sale.order')
+      so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+      picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+      pick = self.browse(cr,uid,picking_id[0])
+      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
   Then I done the delivery order
 -
@@ -302,11 +307,14 @@
   I verify that delivery state is done
 -
   !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if not mod_pur:
+      sale_order_obj = self.pool.get('sale.order')
+      so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
+      picking_id = self.search(cr, uid, [('origin','=',so.name)])
+      pick = self.browse(cr,uid,picking_id[0])
+      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
   I verify that a "Picked" has been set to true
 -
 
=== modified file 'sale/test/picking_order_policy.yml'
--- sale/test/picking_order_policy.yml	2011-01-14 00:11:01 +0000
+++ sale/test/picking_order_policy.yml	2011-09-21 12:33:24 +0000
@@ -286,7 +286,9 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
    picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if picking_id and not mod_pur:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
 
=== modified file 'sale/test/postpaid_order_policy.yml'
--- sale/test/postpaid_order_policy.yml	2011-01-14 00:11:01 +0000
+++ sale/test/postpaid_order_policy.yml	2011-09-21 12:33:24 +0000
@@ -64,7 +64,9 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if picking_id and not mod_pur:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state == 'done'), "Picking for SO is not in done state."
 -
@@ -105,7 +107,9 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
    picking_id = self.search(cr, uid, [('origin','=',so.name)])
-   if picking_id:
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if picking_id and not mod_pur:
      pick = self.browse(cr,uid,picking_id[0])
      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
 
=== modified file 'sale/test/prepaid_order_policy.yml'
--- sale/test/prepaid_order_policy.yml	2011-01-14 00:11:01 +0000
+++ sale/test/prepaid_order_policy.yml	2011-09-21 12:33:24 +0000
@@ -98,7 +98,9 @@
    sale_order_obj = self.pool.get('sale.order')
    so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
    picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   if picking_id:
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if picking_id and not mod_pur:
       pick=self.browse(cr,uid,picking_id[0])
       pick.force_assign(cr, uid)
       partial_datas = {
@@ -117,11 +119,14 @@
   I verify that picking order is in done state.
 -
   !python {model: stock.picking }: |
-   sale_order_obj = self.pool.get('sale.order')
-   so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
-   picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
-   pick = self.browse(cr,uid,picking_id[0])
-   assert (pick.state) =='done', "Picking for SO is not in done state."
+   modules = self.pool.get('ir.module.module')
+   mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+   if not mod_pur:
+      sale_order_obj = self.pool.get('sale.order')
+      so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
+      picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
+      pick = self.browse(cr,uid,picking_id[0])
+      assert (pick.state) =='done', "Picking for SO is not in done state."
 -
   I verify that a procurement has been generated for so
 -
@@ -256,11 +261,17 @@
   I verify that a "Picked" has been set to true
 -
   !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert (so.shipped == True), "Picking is not done."
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+    if not mod_pur:
+      so = self.browse(cr, uid, ref("sale_order_so1"))
+      assert (so.shipped == True), "Picking is not done."
 -
   I verify that a sale order is in done state
 -
    !python {model: sale.order}: |
-    so = self.browse(cr, uid, ref("sale_order_so1"))
-    assert (so.state == 'done'), "Sale order is not in the done state."
+    modules = self.pool.get('ir.module.module')
+    mod_pur = modules.search(cr, uid, [('name','=','msf_outgoing'), ('state', 'in', ['installed', 'to upgrade', 'to install'])])
+    if not mod_pur:
+      so = self.browse(cr, uid, ref("sale_order_so1"))
+      assert (so.state == 'done'), "Sale order is not in the done state."
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-09-20 12:14:48 +0000
+++ stock/stock.py	2011-09-21 12:33:24 +0000
@@ -677,7 +677,7 @@
             'context': dict(context, active_ids=ids)
         }
 
-    def _keep_prodlot_hook(self, cr, uid, id, context, *args, **kwargs):
+    def _erase_prodlot_hook(self, cr, uid, id, context=None, *args, **kwargs):
         '''
         hook to keep the production lot when a stock move is copied
         '''
@@ -689,6 +689,8 @@
     def copy(self, cr, uid, id, default=None, context=None):
         if default is None:
             default = {}
+        if context is None:
+            context = {}
         default = default.copy()
         picking_obj = self.browse(cr, uid, id, context=context)
         move_obj = self.pool.get('stock.move')
@@ -698,7 +700,7 @@
             default['origin'] = ''
             default['backorder_id'] = False
         res = super(stock_picking, self).copy(cr, uid, id, default, context)
-        if self._keep_prodlot_hook(cr, uid, id, context, res=res):
+        if self._erase_prodlot_hook(cr, uid, id, context=context, res=res):
             picking_obj = self.browse(cr, uid, res, context=context)
             for move in picking_obj.move_lines:
                 move_obj.write(cr, uid, [move.id], {'tracking_id': False,'prodlot_id':False})
@@ -731,16 +733,28 @@
     def test_auto_picking(self, cr, uid, ids):
         # TODO: Check locations to see if in the same location ?
         return True
+    
+    def _hook_action_assign_raise_exception(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_assign method from stock>stock.py>stock_picking class
+        
+        - allow to choose wether or not an exception should be raised in case of no stock move
+        '''
+        return True
 
-    def action_assign(self, cr, uid, ids, *args):
+    def action_assign(self, cr, uid, ids, context=None, *args):
         """ Changes state of picking to available if all moves are confirmed.
         @return: True
         """
+        if context is None:
+            context = {}
         move_obj = self.pool.get('stock.move')
         for pick in self.browse(cr, uid, ids):
             move_ids = [x.id for x in pick.move_lines if x.state == 'confirmed']
             if not move_ids:
-                raise osv.except_osv(_('Warning !'),_('Not enough stock, unable to reserve the products.'))
+                if self._hook_action_assign_raise_exception(cr, uid, ids, context=context,):
+                    raise osv.except_osv(_('Warning !'),_('Not enough stock, unable to reserve the products.'))
             move_obj.action_assign(cr, uid, move_ids)
         return True