diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index c8137d30b99..6efa39116b0 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -1,202 +1,224 @@ - - - - - - + + + - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - [[ repeatIn(objects, 'o') ]] - Delivery order - + [[ repeatIn(objects,'o') ]] + Delivery order [[ o.sale_id.name ]] + - Order N° : [[ o.sale_id.name ]] - - - - [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] - + [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] + - Invoiced to - [[ o.sale_id.partner_invoice_id.partner_id.name ]] - [[ o.sale_id.partner_invoice_id.street ]] - [[ o.sale_id.partner_invoice_id.zip ]] [[ o.sale_id.partner_invoice_id.city ]] - [[ o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name ]] + Invoiced to + [[ o.sale_id.partner_invoice_id.name ]] + [[ o.sale_id.partner_invoice_id.street ]] + [[ o.sale_id.partner_invoice_id.zip ]] + [[ o.sale_id.partner_invoice_id.city ]] + [[ o.sale_id.partner_invoice_id.country_id and o.sale_id.partner_invoice_id.country_id.name ]] - Shipped to - [[ o.sale_id.partner_shipping_id.partner_id.name ]] - [[ o.sale_id.partner_shipping_id.street ]] - [[ o.sale_id.partner_shipping_id.zip ]] [[ o.sale_id.partner_shipping_id.city ]][[ o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name ]] + Shipped to + [[ o.sale_id.partner_shipping_id.name ]] + [[ o.sale_id.partner_shipping_id.street ]] + [[ o.sale_id.partner_shipping_id.zip ]] + [[ o.sale_id.partner_shipping_id.city ]] + [[ o.sale_id.partner_shipping_id.country_id and o.sale_id.partner_shipping_id.country_id.name ]] - + - + - Order ref. + Order Ref. - Order date + Order Date - Shipping date + Shipping Date - Carrier - - - - - [[ o.sale_id.name ]] - - - [[ o.sale_id.date_order ]] - - - [[ o.date ]] - - - [[ o.carrier_id and o.carrier_id.name or '' ]] + Carrier - - - - + - Reference + [[ o.sale_id.name ]] - Designation + [[ o.sale_id.date_order ]] - Quantity + [[ o.date ]] - S.U. + [[ o.carrier_id and o.carrier_id.name or '' ]] + + + + + + + + + + Reference + + + Designation + + + Quantity + + + S.U.
- [[ repeatIn(o.move_lines, 'line') ]] - + [[ repeatIn(o.move_lines, 'line') ]] + - [[line.product_id.code]] + [[ line.product_id.code ]] - [[line.product_id.name]] + [[ line.product_id.name ]] - [[line.product_qty]] + [[ line.product_qty ]] - [[line.product_uom.name]] + [[ line.product_uom.name ]] - [[line.product_id.ean13]] + [[ line.product_id.ean13 ]] - Logistical unit : [[line.product_packaging.qty]] - [[line.tracking_id and 'Packaging : %d package of %d P' % (1, line.product_packaging.qty) or '']] - [[line.tracking_id and 'Pallets reference: %s' % line.tracking_id.name or '']] Batch reference : [[ line.prodlot_id and line.prodlot_id.name or '/' ]] + Logistical unit : [[ line.product_packaging.qty ]] + [[ line.tracking_id and 'Packaging : %d package of %d P' % (1, line.product_packaging.qty) or '' ]] + [[ line.tracking_id and 'Pallets reference: %s' % line.tracking_id.name or '' ]] + Batch reference : [[ line.prodlot_id and line.prodlot_id.name or '/' ]] - [[ line.product_uos_qty ]] + [[ line.product_uos_qty ]] - [[line.product_uos.name]] + [[ line.product_uos.name ]] - +
- +