diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 0c470d5b0aa..6758f7bed14 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -50,14 +50,15 @@ class report_custom(report_rml): sum_strd = 0 prod = product_pool.browse(cr, uid, bom['product_id']) - prod_name = to_xml(tools.ustr(bom['name'])) + 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) main_sp_price, main_sp_name , main_strd_price = '','','' sellers, sellers_price = '','' if prod.seller_id: - main_sp_name = "%s\r\n" %(prod.seller_id.name) + main_sp_name = "%s\r\n" %to_xml(prod.seller_id.name) pricelist = prod.seller_id.property_product_pricelist_purchase price = pricelist_pool.price_get(cr,uid,[pricelist.id], prod.id, number*prod_qtty or 1.0, prod.seller_id.id, { @@ -70,7 +71,7 @@ class report_custom(report_rml): main_strd_price = str(std_price) + '\r\n' sum_strd = prod_qtty*std_price for seller_id in prod.seller_ids: - sellers += '- '+ seller_id.name.name +'\r\n' + sellers += '- '+ to_xml(seller_id.name.name) +'\r\n' pricelist = seller_id.name.property_product_pricelist_purchase price = pricelist_pool.price_get(cr,uid,[pricelist.id], prod.id, number*prod_qtty or 1.0, seller_id.name.id, { @@ -78,9 +79,9 @@ class report_custom(report_rml): 'date': time.strftime('%Y-%m-%d'), })[pricelist.id] sellers_price += """"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""\r\n""" - xml += """ """+ to_xml(tools.ustr(prod_name)) +""" - """+ to_xml(tools.ustr(main_sp_name)) + to_xml(tools.ustr(sellers)) + """ - """+ rml_obj.formatLang(prod_qtty) +' '+ to_xml(tools.ustr(product_uom.name)).replace('&', '&') +""" + xml += """ """+ to_xml(prod_name) +""" + """+ to_xml(main_sp_name) + to_xml(sellers) + """ + """+ rml_obj.formatLang(prod_qtty) +' '+ to_xml(uom_id) +""" """+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +""" """ + main_sp_price + sellers_price + """'""" @@ -89,11 +90,12 @@ class report_custom(report_rml): def process_workcenter(wrk): workcenter = workcenter_pool.browse(cr, uid, wrk['workcenter_id']) + workcenter_name = to_xml(workcenter.name) cost_cycle = wrk['cycle']*workcenter.costs_cycle cost_hour = wrk['hour']*workcenter.costs_hour total = cost_cycle + cost_hour xml = '' - xml += "" + to_xml(tools.ustr(workcenter.name)).replace('&', '&') + '' + xml += "" + to_xml(workcenter_name) + '' xml += "" xml += """"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """""" xml += """"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """""" @@ -142,9 +144,11 @@ 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): + product_name = to_xml(product.name) + uom_id = 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(tools.ustr(product.name))).replace('&', '&') + title += "%s" % (to_xml(product_name)) xml += "" + title + prod_header + "" if not bom_id: total_strd = number * product.standard_price @@ -157,7 +161,7 @@ class report_custom(report_rml): - """ xml += """ - """ + _('Total Cost of %s %s') % (str(number), to_xml(tools.ustr(product.uom_id.name)).replace('&', '&')) + """: + """ + _('Total Cost of %s %s') % (str(number), to_xml(uom_id)) + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -184,7 +188,7 @@ class report_custom(report_rml): xml += "" + xml_tmp + '' xml += """ - """ + _('Components Cost of %s %s') % (str(number), to_xml(tools.ustr(product.uom_id.name)).replace('&', '&')) + """: + """ + _('Components Cost of %s %s') % (str(number), to_xml(uom_id)) + """: """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ @@ -201,14 +205,14 @@ class report_custom(report_rml): xml += workcenter_header xml += "" + xml_tmp + '' xml += """ - """ + _('Work Cost of %s %s') % (str(number), to_xml(tools.ustr(product.uom_id.name)).replace('&', '&')) +""": + """ + _('Work Cost of %s %s') % (str(number), to_xml(uom_id)) +""": """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +""" '""" xml += """ - """ + _('Total Cost of %s %s') % (str(number), to_xml(tools.ustr(product.uom_id.name)).replace('&', '&')) + """: + """ + _('Total Cost of %s %s') % (str(number), to_xml(uom_id)) + """: """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """