diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 67aae0f1b91..615b5cee009 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -283,7 +283,7 @@ mrp.routing.search mrp.routing - tree + search diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml index 3f44ef2afb3..a4eab5aa86d 100644 --- a/addons/sale/report/sale_order.rml +++ b/addons/sale/report/sale_order.rml @@ -312,7 +312,7 @@ Net Total : - [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_untaxed, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] @@ -325,7 +325,7 @@ Taxes : - [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] @@ -338,7 +338,7 @@ Total : - [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id. symbol ]] + [[ formatLang(o.amount_total, digits=get_digits(dp='Account')) ]] [[ o.pricelist_id.currency_id. symbol ]] @@ -361,4 +361,4 @@ - \ No newline at end of file + diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py index 78c07f97046..3e61a6cd3e9 100755 --- a/addons/sale_layout/report/report_sale_layout.py +++ b/addons/sale_layout/report/report_sale_layout.py @@ -62,11 +62,11 @@ class sale_order_1(report_sxw.rml_parse): if entry.layout_type == 'article': res['tax_id'] = ', '.join(map(lambda x: x.name, entry.tax_id)) or '' res['name'] = entry.name - res['product_uom_qty'] = self.digits_fmt(entry, 'product_uos') % (entry.product_uos and entry.product_uos_qty or entry.product_uom_qty or 0.00) + res['product_uom_qty'] = entry.product_uos and entry.product_uos_qty or entry.product_uom_qty or 0.00 res['product_uom'] = entry.product_uos and entry.product_uos.name or entry.product_uom.name - res['price_unit'] = self.digits_fmt(entry, 'price_unit') % (entry.price_unit or 0.00) - res['discount'] = self.digits_fmt(entry, 'discount') % (entry.discount and entry.discount or 0.00) - res['price_subtotal'] = self.digits_fmt(entry, 'price_subtotal') % (entry.price_subtotal and entry.price_subtotal or 0.00) + res['price_unit'] = entry.price_unit or 0.00 + res['discount'] = entry.discount and entry.discount or 0.00 + res['price_subtotal'] = entry.price_subtotal and entry.price_subtotal or 0.00 sub_total[i] = entry.price_subtotal and entry.price_subtotal i = i + 1 res['note'] = entry.notes or '' @@ -95,7 +95,7 @@ class sale_order_1(report_sxw.rml_parse): sum_flag[j+1] = sum_id +1 j = j + 1 - res['price_subtotal'] = self.digits_fmt(entry, 'price_subtotal') % (sum) + res['price_subtotal'] = sum res['currency'] = sale_order.pricelist_id.currency_id.name res['quantity'] = '' res['price_unit'] = '' diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index d33d424a8a2..b01affd5329 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -318,13 +318,13 @@ [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['product_uom'] ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ a['price_unit'] ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_unit'], digits=get_digits(dp='Sale Price')) ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['discount'] ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['discount'], digits=get_digits(dp='Sale Price')) ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['price_subtotal'] ]] [[ o.pricelist_id.currency_id.symbol ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ o.pricelist_id.currency_id.symbol ]] @@ -397,7 +397,7 @@ Taxes : - [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.symbol ]] + [[ formatLang(o.amount_tax, digits=get_digits(dp='Account') ) ]] [[ o.pricelist_id.currency_id.symbol ]]