diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index a7f6337323e..d836d2cd04e 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -72,7 +72,6 @@ - @@ -80,7 +79,6 @@ - @@ -88,10 +86,8 @@ - - @@ -264,7 +260,7 @@
[[repeatIn(o.order_line,'line')]] - + [[ line.name ]] @@ -273,7 +269,7 @@ [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] - [[ formatLang( line.date_planned, date_time=True) ]] + [[ formatLang( line.date_planned, date=True) ]] [[ formatLang(line.product_qty ) ]] @@ -285,10 +281,7 @@ [[ formatLang(line.price_unit ) ]] - [[ formatLang(line.price_subtotal ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(line.price_subtotal ) ]] [[ o.pricelist_id.currency_id.code ]] @@ -325,15 +318,10 @@ - - - - -
- + @@ -344,10 +332,7 @@ Net Total : - [[ formatLang(o.amount_untaxed ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_untaxed ) ]] [[ o.pricelist_id.currency_id.code ]] @@ -360,10 +345,7 @@ Taxes : - [[ formatLang(o.amount_tax) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_tax) ]] [[ o.pricelist_id.currency_id.code ]] @@ -376,10 +358,7 @@ Total : - [[ formatLang(o.amount_total ) ]] - - - [[ o.pricelist_id.currency_id.name ]] + [[ formatLang(o.amount_total ) ]] [[ o.pricelist_id.currency_id.code ]] @@ -397,4 +376,4 @@ - + \ No newline at end of file diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index c691eb9cdc6..ed2f1859f79 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -33,16 +33,16 @@ - - + + - - - - - - - + + + + + + + @@ -66,8 +66,8 @@ + - [[repeatIn(objects,'order')]] [[ setLang(order.partner_id.lang) ]] @@ -80,7 +80,7 @@ [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street) or '']] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.street2) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.street2) or '']] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.zip) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.zip) or '' ]] [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.city) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.city) or '' ]] - [[ (order.dest_address_id and order.dest_address_id and order.dest_address_id.state_id and order.dest_address_id.state_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or '']] [[(order.dest_address_id and order.dest_address_id and order.dest_address_id.country_id and order.dest_address_id.country_id.name) or (order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or '' ]] + [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.state_id and order.warehouse_id.partner_address_id.state_id.name) or order.partner_address_id and order.partner_address_id.state_id and order.partner_address_id.state_id.name]] [[(order.warehouse_id and order.warehouse_id.partner_address_id and order.warehouse_id.partner_address_id.country_id and order.warehouse_id.partner_address_id.country_id.name) or order.partner_address_id.country_id.name ]] @@ -88,7 +88,7 @@ - [[ order.partner_id.name ]] [[ order.partner_id.title or '' ]] + [[ (order.partner_id and order.partner_id.title) or '' ]] [[ order.partner_id.name ]] [[ (order.partner_address_id and order.partner_address_id.title) or '' ]] [[ order.partner_address_id.name ]] [[ (order.partner_address_id and order.partner_address_id.street) or '']] [[ order.partner_address_id.street2 ]] [[ (order.partner_address_id and order.partner_address_id.zip) or '' ]] [[ (order.partner_address_id and order.partner_address_id.city) or '' ]] @@ -124,13 +124,13 @@
[[repeatIn(order.order_line,'order_line')]] - + [[ order_line.name ]] - [[ formatLang(order_line.date_planned, date_time = True) ]] + [[ formatLang(order_line.date_planned, date = True) ]] [[ formatLang(order_line.product_qty )]] @@ -146,9 +146,7 @@
- - - + [[ format(order.notes or '') ]] @@ -162,4 +160,4 @@ [[ user.signature or '' ]] - + \ No newline at end of file