diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 52bcf3bcd4a..d41ee26bba9 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -120,7 +120,7 @@ class report_custom(report_rml): %s - """ % (_('Work Center name'), _('Cycles Cost')+'('+company_currency.code+')', _('Hourly Cost')+'('+company_currency.code+')',_('Work Cost')+'('+company_currency.code+')') + """ % (_('Work Center name'), _('Cycles Cost'), _('Hourly Cost'),_('Work Cost')) prod_header = """ %s @@ -129,7 +129,7 @@ class report_custom(report_rml): %s %s - """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom')+'('+company_currency.code+')', _('Supplier Price per Uom')+'('+company_currency.code+')') + """ % (_('Component'), _('Component suppliers'), _('Quantity'),_('Cost Price per Uom'), _('Supplier Price per Uom')) purchase_price_digits = rml_obj.get_digits(dp='Purchase Price') @@ -149,7 +149,7 @@ class report_custom(report_rml): - """ xml += """ - """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: + """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -176,7 +176,7 @@ class report_custom(report_rml): xml += "" + xml_tmp + '' xml += """ - """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'(' + company_currency.code +')'+ """: + """ + _('Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -193,14 +193,14 @@ class report_custom(report_rml): xml += workcenter_header xml += "" + xml_tmp + '' xml += """ - """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+""": + """ + _('Work Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +""": """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +""" '""" xml += """ - """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name +'('+company_currency.code+')'+ """: + """ + _('Total Cost ') + _('of ') + str(number) +' '+ product.uom_id.name + """: """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """