Merge lp:~unifield-team/unifield-addons/addons-uf-1055-internal-request into lp:unifield-addons

[Matthieu Choplin]

This merge proposal is linked to the UF-1055 about internal request and also the branch https://code.launchpad.net/~unifield-team/unifield-wm/uf-1055.

As it affects different very important methods such as action_ship_create in sale/sale.py, with added hooks, it may be a critical change.

Please keep me update if some things seem awkward so that I will change the code.

[lp:~unifield-team/unifield-addons/addons-uf-1055-internal-request]

4553. By <email address hidden> on 2012-08-14

Merge

4554. By Duy VO on 2012-09-18

[uf-1055] merged with trunk

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-08-10 09:01:42 +0000
+++ sale/sale.py	2012-09-18 22:17:21 +0000
@@ -739,6 +739,24 @@
         result = line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu')
         return result
 
+    def _hook_ship_create_product_id(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 modifiy product especially for internal request which type is "make_to_order"
+        '''
+        pass
+    
+    def _hook_ship_create_uom_id(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  modifiy uom especially for internal request which type is "make_to_order"
+        '''
+        pass
+
     def _hook_execute_action_assign(self, cr, uid, *args, **kwargs):
         '''
         Please copy this to your module's method also.
@@ -811,17 +829,20 @@
                     # 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)
-                    
                     # customer code execution position 02
                     self._hook_ship_create_execute_specific_code_02(cr, uid, ids, context=context, order=order, line=line, move_id=move_id)
-                    
-                if line.product_id and self._hook_procurement_create_line_condition(cr, uid, ids, context=context, line=line, order=order):
+                # the hook _hook_ship_create_product_id is useful when we make an IR with the type "make_to_order" => we take a 'ghost' product because it is required in procurement and we do not have product
+                product_id = self._hook_ship_create_product_id(cr, uid, ids, context=context, line=line)
+                if product_id \
+                and self._hook_procurement_create_line_condition(cr, uid, ids, context=context, line=line, order=order) :
+                    # the hook _hook_ship_create_uom_id is useful when we make an IR with the type "make_to_order"
+                    product_uom = self._hook_ship_create_uom_id(cr, uid, ids, context=context, line=line)
                     proc_data = {'name': line.name,
                                  'origin': order.name,
                                  'date_planned': date_planned,
-                                 'product_id': line.product_id.id,
+                                 'product_id': product_id,
                                  'product_qty': line.product_uom_qty,
-                                 'product_uom': line.product_uom.id,
+                                 'product_uom': product_uom,
                                  '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)\

=== modified file 'stock/board_warehouse_view.xml'
--- stock/board_warehouse_view.xml	2011-01-14 00:11:01 +0000
+++ stock/board_warehouse_view.xml	2012-09-18 22:17:21 +0000
@@ -4,8 +4,7 @@
         <record id="note_warehouse_type" model="board.note.type">
             <field name="name">Warehouse</field>
         </record>
-
-
+        
         <record id="action_incoming_product_board" model="ir.actions.act_window">
             <field name="name">Incoming Product</field>
             <field name="res_model">stock.move</field>
@@ -50,7 +49,7 @@
                 <form string="Warehouse board">
                     <hpaned position="200">
                         <child1>
-                            <action colspan="4" name="%(action_incoming_product_board)d" string="Incoming Product"  width="510"/>
+                            <action colspan="4" name="%(stock.action_incoming_product_board)d" string="Incoming Product"  width="510"/>
                             <action colspan="4" name="%(action_outgoing_product_board)d" string="Outgoing Product" width="510"/>
                         </child1>