From cdbbae8c6c554464ea956c8f1dd24da30284a8b4 Mon Sep 17 00:00:00 2001 From: "Kirti Savalia (OpenERP)" Date: Thu, 3 Nov 2011 18:33:55 +0530 Subject: [PATCH] [IMP]:variable name bzr revid: ksa@tinyerp.com-20111103130355-tw26yki5shg2wy0s --- addons/mrp/report/price.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 47d6554f801..edaa2d02ef9 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -51,7 +51,7 @@ class report_custom(report_rml): prod_name = to_xml(bom['name']) prod_qtty = factor * bom['product_qty'] product_uom = product_uom_pool.browse(cr, uid, bom['product_uom'], context=context) - uom_id = to_xml(product_uom.name) + product_uom_name = to_xml(product_uom.name) main_sp_price, main_sp_name , main_strd_price = '','','' sellers, sellers_price = '','' @@ -79,7 +79,7 @@ class report_custom(report_rml): sellers_price += """"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""\r\n""" xml += """ """+ prod_name +""" """+ main_sp_name + sellers + """ - """+ rml_obj.formatLang(prod_qtty) +' '+ uom_id +""" + """+ rml_obj.formatLang(prod_qtty) +' '+ product_uom_name +""" """+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +""" """ + main_sp_price + sellers_price + """'""" @@ -141,7 +141,7 @@ class report_custom(report_rml): purchase_price_digits = rml_obj.get_digits(dp='Purchase Price') for product in product_pool.browse(cr, uid, ids, context=context): - uom_id = to_xml(product.uom_id.name) + product_uom_name = to_xml(product.uom_id.name) bom_id = bom_pool._bom_find(cr, uid, product.id, product.uom_id.id) title = "%s" %(_("Cost Structure")) title += "%s" % (to_xml(product.name)) @@ -157,7 +157,7 @@ class report_custom(report_rml): - """ xml += """ - """ + _('Total Cost of %s %s') % (str(number), uom_id) + """: + """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -184,7 +184,7 @@ class report_custom(report_rml): xml += "" + xml_tmp + '' xml += """ - """ + _('Components Cost of %s %s') % (str(number), uom_id) + """: + """ + _('Components Cost of %s %s') % (str(number), product_uom_name) + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -201,14 +201,14 @@ class report_custom(report_rml): xml += workcenter_header xml += "" + xml_tmp + '' xml += """ - """ + _('Work Cost of %s %s') % (str(number), uom_id) +""": + """ + _('Work Cost of %s %s') % (str(number), product_uom_name) +""": """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +""" '""" xml += """ - """ + _('Total Cost of %s %s') % (str(number), uom_id) + """: + """ + _('Total Cost of %s %s') % (str(number), product_uom_name) + """: """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """