diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 90635a48a24..e026419f230 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -15,17 +15,12 @@ - - - - - - - - - - - + + + + + + @@ -48,60 +43,66 @@ - - - - + + + + + + + - - - - + + + + - - - - + + + + - - - - - - - + + + + + + + - - - - - + + + + + + + - - - - + + + + + - - + + - - - - - + + + + + -[[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] +[[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] @@ -112,7 +113,7 @@ [[ o.partner_shipping_id.street ]] [[ o.partner_shipping_id.street2 or '' ]] -[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city or '' ]] +[[ o.partner_shipping_id.zip or '' ]] [[ o.partner_shipping_id.city 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 '' ]] @@ -155,30 +156,30 @@ -Your order reference +Your Reference -Date ordered +Date Ordered -Our salesman +Our Salesman -Payment +Payment Terms -[[ o.client_order_ref ]] +[[ o.client_order_ref ]] -[[ o.date_order ]] +[[ o.date_order ]] -[[ o.user_id.name ]] +[[ o.user_id.name ]] -[[ o.client_ref and o.client_ref.property_payment_term and o.client_ref.property_payment_term[0] and o.client_ref.property_payment_term[0].name ]] +[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or False ]] @@ -201,55 +202,39 @@ Unit Price - -Disc. (%) - +Disc. (%) Price - -
-[[ repeatIn(o.order_line,'line') ]] - - -[[ line.name ]] - - -[[ ', '.join(map(lambda x: x.name, line.tax_id))]] - - -[[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] - - -[[ line.price_unit ]] - - -[[ (line.discount and str(line.discount)+'%')or '' ]] - - -[[ line.price_subtotal ]] - + + [[ repeatIn(o.order_line,'line') ]] + [[ line.name ]] + [[ repeatIn((line.notes and line.notes.split('\n')) or [], 'l', 'para') ]][[ l ]] + + + [[ ', '.join(map(lambda x: x.name, line.tax_id))]] + + + [[ line.product_uos and line.product_uos_qty or line.product_uom_qty ]] [[ line.product_uos and line.product_uos.name or line.product_uom.name ]] + + + [[ line.price_unit ]] + + + [[ (line.discount and str(line.discount)+'%')or '' ]] + + + [[ line.price_subtotal ]] + - - - -[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - - -[[ l or removeParentNode('table') ]] - - - - - - - - -
+ + + + @@ -286,10 +271,10 @@ -TOTAL : +Total : -[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] +[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]