diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index 7e74857dd56..aabdd60a53d 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -63,10 +63,14 @@ - - - - + + + + + + + + @@ -377,7 +381,7 @@ - [[ l.name ]] + [[ l.name ]] [[ ', '.join([lt.name for lt in l.invoice_line_tax_id]) ]] @@ -401,14 +405,45 @@ [[ o.currency_id.code ]] - - - [[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]] + [[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]] + [[ note or removeParentNode('para') ]] - [[ note or removeParentNode('table') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 38306cb3fbf..b374ad86af1 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -51,14 +51,15 @@ - - - - - - + + + + + + + - + @@ -68,10 +69,15 @@ - - - - + + + + + + + + + @@ -91,12 +97,8 @@ - - - - - - + + @@ -127,6 +129,7 @@ + @@ -139,38 +142,32 @@ [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]] Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ addr.title or '' ]] [[ addr.name ]] - [[ addr.street or '']] + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ addr.title or '' ]][[ addr.name ]] + [[ addr.street ]] [[ addr.street2 or '' ]] - [[ addr.zip or '' ]] [[ addr.city or '' ]] - [[ addr.state_id and addr.state_id.name or '' ]] + [[ addr.zip or '' ]][[ addr.city or '' ]] + [[ addr.state_id and addr.state_id.name or '' ]] [[ addr.country_id and addr.country_id.name or '' ]] - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]] + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]] [[ o.partner_address_id.street ]] [[ o.partner_address_id.street2 or '' ]] - [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]] - [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]] - [[ o.partner_address_id and o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]] - - - - Tél. : [[ o.partner_address_id and o.partner_address_id.phone or '' ]] - Fax : [[ o.partner_address_id and o.partner_address_id.fax or '' ]] - TVA :[[ o.partner_id and o.partner_address_id.vat or '' ]] + [[ o.partner_address_id.zip or '' ]][[ o.partner_address_id.city or '' ]] + [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]] + [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]] + Tél. : [[ o.partner_address_id.phone or '' ]] + Fax : [[ o.partner_address_id.fax or '' ]] + TVA :[[ o.partner_id.vat or '' ]] - Request for quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° [[ o.name ]] - - - + Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]] @@ -193,21 +190,24 @@ [[ o.ref or '' ]] - [[ o.partner_ref or '' ]] + [[ o.partner_ref or '' ]] [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] - [[ o.validator and o.validator.name or '' ]] + [[ o.validator and o.validator.name or '' ]] - + + + Product + Description @@ -230,8 +230,11 @@
[[ repeatIn(o.order_line,'line') ]] - + + + [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] + [[ line.name ]] @@ -242,31 +245,59 @@ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[line.product_qty ]] + [[ '%.2f' % line.product_qty ]] - [[ line.product_uom.name ]] + [[ line.product_uom.name ]] - [[line.price_unit ]] + [[ '%.2f' % line.price_unit ]] - [[line.price_subtotal ]] + [[ '%.2f' % line.price_subtotal ]] - - - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] + [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - [[ l or removeParentNode('table') ]] + [[ l or removeParentNode('table') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + @@ -274,13 +305,13 @@ - Net Total: + Net Total : - [[o.amount_untaxed or 0]] + [[ '%.2f' % o.amount_untaxed ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -290,13 +321,13 @@ - Taxes: + Taxes : - [[o.amount_tax or 0 ]] + [[ '%.2f' % o.amount_tax ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -306,10 +337,10 @@ - Total: + Total : - [[ o.amount_total ]] + [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index afe63da3b0b..a1493d3158d 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -460,7 +460,6 @@ - @@ -479,14 +478,13 @@ - - + @@ -559,7 +557,6 @@ - @@ -576,6 +573,8 @@
+ + @@ -623,8 +622,6 @@ - - @@ -717,12 +714,12 @@ - + + + - - @@ -734,9 +731,10 @@ - - + + + @@ -782,8 +780,6 @@ - - @@ -873,12 +869,11 @@ - + + - - @@ -916,7 +911,6 @@ -