diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml index e98edd38d99..d33d424a8a2 100755 --- a/addons/sale_layout/report/report_sale_layout.rml +++ b/addons/sale_layout/report/report_sale_layout.rml @@ -81,6 +81,7 @@ + @@ -191,17 +192,21 @@ Shipping address : [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]] [[ o.partner_shipping_id.street ]] - [[ o.partner_shipping_id.street2 or '' ]] + [[ o.partner_shipping_id.street2 or removeParentNode('para') ]] [[ o.partner_shipping_id.city or '' ]] [[ o.partner_shipping_id.zip or '' ]] - [[ o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name or '' ]] [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]] + [[ (o.partner_shipping_id.state_id and o.partner_shipping_id.state_id.name) or removeParentNode('para') ]] + [[ o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '' ]] Invoice address : - [[ o.partner_invoice_id.street ]] [[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] - [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] + [[ o.partner_invoice_id.partner_id.name or '' ]] + [[ o.partner_invoice_id.street ]] + [[ o.partner_invoice_id.street2 or removeParentNode('para') ]] + [[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] + [[ (o.partner_invoice_id.state_id and o.partner_invoice_id.state_id.name) or removeParentNode('para') ]] + [[ o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '']] @@ -210,11 +215,11 @@ [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]] [[ o.partner_order_id.street ]] - [[ o.partner_order_id.street2 or '' ]] + [[ o.partner_order_id.street2 or removeParentNode('para') ]] [[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]] - [[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] + [[ (o.partner_order_id.state_id and o.partner_order_id.state_id.name) or removeParentNode('para') ]] + [[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] @@ -257,7 +262,7 @@ [[ o.client_order_ref ]] - [[ o.date_order ]] + [[ formatLang(o.date_order,date=True) ]] [[ o.user_id.name ]] @@ -279,7 +284,7 @@ VAT - Quantity + Quantity Unit Price @@ -288,38 +293,38 @@ Disc.(%) - Price + Price([[ o.pricelist_id.currency_id.code ]])
[[ repeatIn(sale_order_lines(o),'a') ]] - + [[ 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'] ]] + [[ (a['layout_type']=='title' or a['layout_type']=='subtotal') and ( setTag('para','para',{'fontName':'Helvetica-bold'})) or removeParentNode('font') ]][[ a['name'] ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['tax_id'] ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['tax_id'] ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['product_uom_qty'] ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['product_uom_qty'] ]] - [[ 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['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') ]] [[ a['price_unit'] ]] - [[ 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') ]][[ a['discount'] ]] - [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['price_subtotal'] ]] + [[ a['layout_type']=='subtotal' and ( setTag('para','para',{'fontName':'Helvetica-Bold'})) or removeParentNode('font') ]][[ a['price_subtotal'] ]] [[ o.pricelist_id.currency_id.symbol ]] @@ -368,7 +373,7 @@
- + @@ -379,10 +384,7 @@ Net Total : - [[ formatLang(o.amount_untaxed ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.symbol ]] @@ -395,10 +397,7 @@ Taxes : - [[ formatLang(o.amount_tax ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_tax ) ]] [[ o.pricelist_id.currency_id.symbol ]] @@ -411,10 +410,7 @@ Total : - [[ formatLang(o.amount_total ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.symbol ]]