diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py index 57839ecffeb..62513d6d98f 100644 --- a/addons/sale_layout/report/report_sale_layout.py +++ b/addons/sale_layout/report/report_sale_layout.py @@ -67,7 +67,7 @@ class sale_order_1(report_sxw.rml_parse): sub_total[i] = entry.price_subtotal and entry.price_subtotal i = i + 1 res['note'] = entry.notes or '' - res['currency'] = sale_order.pricelist_id.currency_id.name + res['currency'] = sale_order.pricelist_id.currency_id.symbol res['layout_type'] = entry.layout_type else: res['product_uom_qty'] = '' diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index 941df09aeb5..a0ccec0ab7b 100644 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -133,31 +133,6 @@ - - - - - - Description - - - VAT - - - Quantity - - - Unit Price - - - Disc.(%) - - - Price - - - - [[repeatIn(objects,'o')]] [[ setLang(o.partner_id.lang) ]] @@ -275,9 +250,7 @@ - - [[ a['layout_type']=='text' and removeParentNode('blockTable')]] - + [[ a['layout_type']=='text' and removeParentNode('blockTable')]] [[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]] [[ a['name'] ]] @@ -295,7 +268,7 @@ [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['discount']) ]] - [[ a['layout_type']=='break' and removeParentNode('blockTable')]][[ 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 ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]] [[ formatLang(a['price_subtotal'], digits=get_digits(dp='Sale Price')) ]] [[ a['currency'] ]] @@ -396,6 +369,5 @@ - \ No newline at end of file diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index dbea639f86e..fdc6e528fea 100644 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -44,7 +44,7 @@ - +