diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py
index c072b821196..5ca53a2d95c 100644
--- a/addons/mrp/report/price.py
+++ b/addons/mrp/report/price.py
@@ -62,7 +62,7 @@ class report_custom(report_rml):
'uom': prod.uom_po_id.id,
'date': time.strftime('%Y-%m-%d'),
})[pricelist.id]
- main_sp_price = """"""+rml_obj.formatLang(price)+' '+ company_currency.symbol+"""\r\n"""
+ main_sp_price = """"""+rml_obj.formatLang(price)+' '+ (company_currency.symbol or company_currency.name)+"""\r\n"""
sum += prod_qtty*price
std_price = product_uom_pool._compute_price(cr, uid, prod.uom_id.id, prod.standard_price, to_uom_id=product_uom.id)
main_strd_price = str(std_price) + '\r\n'
@@ -75,11 +75,11 @@ class report_custom(report_rml):
'uom': prod.uom_po_id.id,
'date': time.strftime('%Y-%m-%d'),
})[pricelist.id]
- sellers_price += """"""+rml_obj.formatLang(price) +' '+ company_currency.symbol +"""\r\n"""
+ sellers_price += """"""+rml_obj.formatLang(price) +' '+ (company_currency.symbol or company_currency.name) +"""\r\n"""
xml += """
"""+ prod_name +"""
"""+ main_sp_name + sellers + """
"""+ rml_obj.formatLang(prod_qtty) +' '+ product_uom_name +"""
- """+ rml_obj.formatLang(float(main_strd_price)) +' '+ company_currency.symbol +"""
+ """+ rml_obj.formatLang(float(main_strd_price)) +' '+ (company_currency.symbol or company_currency.name) +"""
""" + main_sp_price + sellers_price + """'"""
xml += ''
@@ -93,9 +93,9 @@ class report_custom(report_rml):
xml = ''
xml += "" + to_xml(workcenter.name) + ''
xml += ""
- xml += """"""+rml_obj.formatLang(cost_cycle)+' '+ company_currency.symbol + """"""
- xml += """"""+rml_obj.formatLang(cost_hour)+' '+ company_currency.symbol + """"""
- xml += """"""+rml_obj.formatLang(cost_hour + cost_cycle)+' '+ company_currency.symbol + """"""
+ xml += """"""+rml_obj.formatLang(cost_cycle)+' '+ (company_currency.symbol or company_currency.name) + """"""
+ xml += """"""+rml_obj.formatLang(cost_hour)+' '+ (company_currency.symbol or company_currency.name) + """"""
+ xml += """"""+rml_obj.formatLang(cost_hour + cost_cycle)+' '+ (company_currency.symbol or company_currency.name) + """"""
xml += '
'
return xml, total
@@ -159,8 +159,8 @@ class report_custom(report_rml):
""" + _('Total Cost of %s %s') % (str(number), product_uom_name) + """:
- """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """
- """+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ (company_currency.symbol or company_currency.name) + """
+ """+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ (company_currency.symbol or company_currency.name) + """
'"""
else:
bom = bom_pool.browse(cr, uid, bom_id, context=context)
@@ -186,7 +186,7 @@ class report_custom(report_rml):
""" + _('Components Cost of %s %s') % (str(number), product_uom_name) + """:
- """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ (company_currency.symbol or company_currency.name) + """
'"""
@@ -204,13 +204,13 @@ class report_custom(report_rml):
- """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +"""
+ """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ (company_currency.symbol or company_currency.name) +"""
'"""
xml += """
""" + _('Total Cost of %s %s') % (str(number), product_uom_name) + """:
- """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """
+ """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ (company_currency.symbol or company_currency.name) + """
'"""