diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml deleted file mode 100644 index e8ac44bae95..00000000000 --- a/addons/purchase/report/order_new.rml +++ /dev/null @@ -1,328 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects,'o') ]] - - - - - - - [[ 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 ]] - [[ addr.street2 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_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.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<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]] - - - - - - - Our Order Reference - - - Your Order Reference - - - Date Ordered - - - Validated By - - - - - - - [[ o.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 '' ]] - - - - - - - - - - Product Description - - - Applicable Taxes - - - Date Requested - - - Qty - - - Unit Price - - - Net Price - - - -
- [[ repeatIn(o.order_line,'line') ]] - - - - [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] - [[ line.name ]] - - - [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] - - - [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - - - [[ '%.2f' % line.product_qty ]] - - - [[ line.product_uom.name ]] - - - [[ '%.2f' % line.price_unit ]] - - - [[ '%.2f' % line.price_subtotal ]] - - - - - - - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - - - [[ l or removeParentNode('table') ]] - - - -
- - - - - - - - - Net Total : - - - [[ '%.2f' % o.amount_untaxed ]] - - - [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - Taxes : - - - [[ '%.2f' % o.amount_tax ]] - - - [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - TOTAL : - - - [[ '%.2f' % o.amount_total ]] - - - [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - [[ format(o.notes or '') ]] - - - - - - - - diff --git a/addons/purchase/report/request_quotation_new.rml b/addons/purchase/report/request_quotation_new.rml deleted file mode 100644 index 608c41a78c6..00000000000 --- a/addons/purchase/report/request_quotation_new.rml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[ repeatIn(objects,'order') ]] - [[ setLang(order.partner_id.lang) ]] - - - - - - - - - - - - - - [[ order.partner_id.title ]][[ order.partner_id.name ]] - [[ order.partner_address_id.title ]][[ order.partner_address_id.name ]] - [[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]] - [[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]] - [[ order.partner_address_id.state_id.code ]][[ order.partner_address_id.country_id.code ]] - - - - Tel. : [[ order.partner_address_id.phone ]] - Fax : [[ order.partner_address_id.fax ]] - TVA : [[ order.partner_id.vat ]] - - - - Request for Quotation [[ order.name ]] - - - - Other reference :[[ order.ref ]] - Printed: [[ time.strftime('%d/%m/%Y') ]] - - - - Please find hereby a request for quotation. - - - - - - - Product - - - Date - - - Qty - - - -
- [[ repeatIn(order.order_line,'order_line') ]] - - - - [[ order_line.product_id.default_code ]] - [[ order_line.name ]] - - - [[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]] - - - [[ order_line.product_qty ]] - - - [[ order_line.product_uom.name ]] - - - -
- - - - - - - - - - [[ order.notes ]] - - - - Thanks, - - - - [[ user.signature ]] - -