Merge lp:~unifield-team/unifield-addons/uf-655 into lp:unifield-addons

[jftempo]

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2011-11-21 13:19:03 +0000
+++ purchase/purchase.py	2011-12-29 13:27:27 +0000
@@ -791,9 +791,22 @@
         
         return result
     
+    def po_line_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
+        
+        - allow to modify the data for purchase order line creation
+        '''
+        line = kwargs['line']
+        return line
+    
     def po_values_hook(self, cr, uid, ids, context=None, *args, **kwargs):
         '''
-        data for the purchase order creation
+        Please copy this to your module's method also.
+        This hook belongs to the make_po method from purchase>purchase.py>procurement_order
+        
+        - allow to modify the data for purchase order creation
         '''
         values = kwargs['values']
         return values
@@ -862,6 +875,9 @@
                 'move_dest_id': res_id,
                 'notes': product.description_purchase,
             }
+            
+            # line values modification from hook
+            line = self.po_line_values_hook(cr, uid, ids, context=context, line=line, procurement=procurement,)
 
             taxes_ids = procurement.product_id.product_tmpl_id.supplier_taxes_id
             taxes = acc_pos_obj.map_tax(cr, uid, partner.property_account_position, taxes_ids)
@@ -879,7 +895,7 @@
                       'fiscal_position': partner.property_account_position and partner.property_account_position.id or False,
                       }
             # values modification from hook
-            values = self.po_values_hook(cr, uid, ids, context=context, values=values, procurement=procurement)
+            values = self.po_values_hook(cr, uid, ids, context=context, values=values, procurement=procurement, line=line,)
             # purchase creation from hook
             purchase_id = self.create_po_hook(cr, uid, ids, context=context, values=values, procurement=procurement)
             res[procurement.id] = purchase_id
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2011-12-14 15:30:47 +0000
+++ stock/stock.py	2011-12-29 13:27:27 +0000
@@ -659,11 +659,24 @@
         'date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'stock.picking', context=c)
     }
+    
+    def _stock_picking_action_process_hook(self, cr, uid, ids, context=None, *args, **kwargs):
+        '''
+        Please copy this to your module's method also.
+        This hook belongs to the action_process method from stock>stock.py>stock_picking
+        
+        - allow to modify the data for wizard display
+        '''
+        if context is None:
+            context = {}
+        res = kwargs['res']
+        return res
+    
     def action_process(self, cr, uid, ids, context=None):
         if context is None: context = {}
         partial_id = self.pool.get("stock.partial.picking").create(
             cr, uid, {}, context=dict(context, active_ids=ids))
-        return {
+        res = {
             'name':_("Products to Process"),
             'view_mode': 'form',
             'view_id': False,
@@ -676,6 +689,9 @@
             'domain': '[]',
             'context': dict(context, active_ids=ids)
         }
+        # hook on view dic
+        res = self._stock_picking_action_process_hook(cr, uid, ids, context=context, res=res,)
+        return res
 
     def _erase_prodlot_hook(self, cr, uid, id, context=None, *args, **kwargs):
         '''