From 0ec541f6f46f52eb700ade3dd03c98f34277bbfc Mon Sep 17 00:00:00 2001
From: "Rifakat Haradwala (Open ERP)" <rha@tinyerp.com>
Date: Wed, 9 Mar 2011 11:30:25 +0530
Subject: [PATCH] [IMP] : mrp: string formatting

bzr revid: rha@tinyerp.com-20110309060025-7klq1juri4ho2f1z
---
 addons/mrp/report/price.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index 85063c1a335..393797e43cb 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -147,12 +147,14 @@ class report_custom(report_rml):
                     <col para='yes'>-</col>
                     </row></lines>"""
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> Total Cost of %d %s: </col>
                     <col/>
                     <col f='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
-                    <col t='yes'>"""+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
-                    </row></lines>'"""
+                    <col t='yes'>%s %s</col>
+                    <col t='yes'>%s %s</col>
+                    </row></lines>'""" %(number, product.uom_id.name, rml_obj.formatLang(total_strd, digits=purchase_price_digits),
+                                       company_currency.symbol, rml_obj.formatLang(total, digits=purchase_price_digits),company_currency.symbol)
+
             else:
                 bom = bom_pool.browse(cr, uid, bom_id, context=context)
                 factor = number * product.uom_id.factor / bom.product_uom.factor
@@ -191,19 +193,22 @@ class report_custom(report_rml):
                     xml += workcenter_header
                     xml += "<lines style='lines'>" + xml_tmp + '</lines>'
                     xml += """<lines style='sub_total'> <row>
-                    <col> """ + _('Work Cost of ') + str(number) +' '+ product.uom_id.name +""": </col>
+                    <col> Work Cost of %d "%s: </col>
                     <col/>
                     <col/>
                     <col/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""</col>
-                    </row></lines>'"""
+                    <col t='yes'>%s %s</col>
+                    </row></lines>'""" %(number, product.uom_id.name, rml_obj.formatLang(total2, digits=purchase_price_digits),
+                                         company_currency.symbol)
+
                 xml += """<lines style='total'> <row>
-                    <col> """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: </col>
+                    <col> Total Cost of %d %s: </col>
                     <col/>
                     <col t='yes'/>
-                    <col t='yes'>"""+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """</col>
+                    <col t='yes'>%s %s</col>
                     <col t='yes'></col>
-                    </row></lines>'"""
+                    </row></lines>'""" %(number, product.uom_id.name, rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits),
+                                         company_currency.symbol)
 
         xml = '<?xml version="1.0" ?><report>' + config_start + config_stop + xml + '</report>'