Merge lp:~vauxoo/addons-vauxoo/6.1_patch_product_in_raice_cons_prod_dev_luis into lp:addons-vauxoo

[Luis Torres - http://www.vauxoo.com]

Se agregarón 2 parches, para aplicar en los addons de Open, para que agregue el nombre del producto cuando se quiere consumir la produccion, y la unidad de medida que se coloco al producto pertenece a otra categoria.

Unmerged revisions

620. By Luis Torres - http://www.vauxoo.com on 2013-05-09

[ADD][mrp_consume_produce]Add files .patch

=== modified file 'mrp_consume_produce/__openerp__.py'
--- mrp_consume_produce/__openerp__.py	2012-09-18 22:20:16 +0000
+++ mrp_consume_produce/__openerp__.py	2013-05-09 22:20:35 +0000
@@ -31,7 +31,7 @@
     "category": "Generic Modules/Production",
     "website" : "http://www.vauxoo.com/",
     "description": """ Add wizard to consume and produce.It will be necesary to apply the patch 
-        patch/stock.patch located in this module ( useatch -b stock.py  stock.patch )
+        patch/stock.patch, product_py & stock_py located in this module ( useatch -b stock.py  stock.patch )
     """,
     'depends': ['mrp'],
     'init_xml': [],
 
=== added file 'mrp_consume_produce/patch/product_py.patch'
--- mrp_consume_produce/patch/product_py.patch	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/patch/product_py.patch	2013-05-09 22:20:35 +0000
@@ -0,0 +1,34 @@
+=== modified file 'product/product.py'
+--- product/product.py	2012-04-03 13:05:28 +0000
++++ product/product.py	2013-05-09 20:38:53 +0000
+@@ -125,7 +125,7 @@
+         ('factor_gt_zero', 'CHECK (factor!=0)', 'The conversion ratio for a unit of measure cannot be 0!')
+     ]
+ 
+-    def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False):
++    def _compute_qty(self, cr, uid, from_uom_id, qty, to_uom_id=False, context=None):
+         if not from_uom_id or not qty or not to_uom_id:
+             return qty
+         uoms = self.browse(cr, uid, [from_uom_id, to_uom_id])
+@@ -133,14 +133,17 @@
+             from_unit, to_unit = uoms[0], uoms[-1]
+         else:
+             from_unit, to_unit = uoms[-1], uoms[0]
+-        return self._compute_qty_obj(cr, uid, from_unit, qty, to_unit)
++        return self._compute_qty_obj(cr, uid, from_unit, qty, to_unit, context=context)
+ 
+     def _compute_qty_obj(self, cr, uid, from_unit, qty, to_unit, context=None):
+-        if context is None:
++        product_name = ''
++        if context:
++            product_name = context.get('product_name')
++        else:
+             context = {}
+         if from_unit.category_id.id <> to_unit.category_id.id:
+             if context.get('raise-exception', True):
+-                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM %s to Default UoM %s is not possible as they both belong to different Category!.') % (from_unit.name,to_unit.name,))
++                raise osv.except_osv(_('Error !'), _('Conversion from Product UoM %s of product %s to Default UoM %s is not possible as they both belong to different Category!.') % (from_unit.name, product_name, to_unit.name,))
+             else:
+                 return qty
+         amount = qty / from_unit.factor
+
 
=== added file 'mrp_consume_produce/patch/stock_py.patch'
--- mrp_consume_produce/patch/stock_py.patch	1970-01-01 00:00:00 +0000
+++ mrp_consume_produce/patch/stock_py.patch	2013-05-09 22:20:35 +0000
@@ -0,0 +1,16 @@
+=== modified file 'stock/stock.py'
+--- stock/stock.py	2012-10-22 09:29:02 +0000
++++ stock/stock.py	2013-05-09 20:35:01 +0000
+@@ -2153,8 +2153,9 @@
+         reference_currency_id = move.company_id.currency_id.id
+ 
+         default_uom = move.product_id.uom_id.id
+-        qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom)
+-
++        context.update({'product_name' : move.product_id.name})
++        qty = product_uom_obj._compute_qty(cr, uid, move.product_uom.id, move.product_qty, default_uom, context=context)
++        context.pop('product_name')
+         # if product is set to average price and a specific value was entered in the picking wizard,
+         # we use it
+         if move.product_id.cost_method == 'average' and move.price_unit:
+