pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag

Browse Source 
bzr revid: rpa@tinyerp.com-20110131094331-j1yg8x7fj7y2g97s
This commit is contained in:
rpa (Open ERP)
2011-01-31 15:13:31 +05:30
parent 50ea822ab5 21857a343c
commit aa87da8b5b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mrp/mrp.py
+2 -1
View File
@@ -573,6 +573,7 @@ class mrp_production(osv.osv):
"""
results = []
bom_obj = self.pool.get('mrp.bom')
uom_obj = self.pool.get('product.uom')
prod_line_obj = self.pool.get('mrp.production.product.line')
workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
for production in self.browse(cr, uid, ids):
@@ -590,7 +591,7 @@ class mrp_production(osv.osv):
if not bom_id:
raise osv.except_osv(_('Error'), _("Couldn't find bill of material for product"))
factor = production.product_qty * production.product_uom.factor / bom_point.product_uom.factor
factor = uom_obj._compute_qty(cr, uid, production.product_uom.id, production.product_qty, bom_point.product_uom.id)
res = bom_obj._bom_explode(cr, uid, bom_point, factor / bom_point.product_qty, properties)
results = res[0]
results2 = res[1]