From 1d74d6e1571e3653544d6f7afc97e30ca42f2f0e Mon Sep 17 00:00:00 2001 From: apa <> Date: Wed, 23 Jul 2008 17:25:56 +0530 Subject: [PATCH 01/48] Test bzr revid: apa-20080723115556-eqxno5do4fm82enm --- addons/account/invoice.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 3ec87e737d3..9779c917413 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -35,7 +35,6 @@ import ir import pooler import mx.DateTime from mx.DateTime import RelativeDateTime - from tools import config from tools.translate import _ From f859109cc2358fcf67ed8d229d833d08074817ce Mon Sep 17 00:00:00 2001 From: apa <> Date: Wed, 23 Jul 2008 17:47:56 +0530 Subject: [PATCH 02/48] Update corporate_defaults.xsl. changed the report header. bzr revid: apa-20080723121756-x3u1gutv0ufy8h75 --- addons/custom/corporate_defaults.xsl | 65 +++++++++++++++------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/addons/custom/corporate_defaults.xsl b/addons/custom/corporate_defaults.xsl index 160ad1b07e5..ff780a71533 100644 --- a/addons/custom/corporate_defaults.xsl +++ b/addons/custom/corporate_defaults.xsl @@ -13,63 +13,66 @@ - - - - - 1cm 27.7cm 20cm 27.7cm - 1cm 25.7cm 7cm 25.7cm + + + + + 1cm 25.4cm 20cm 25.4cm + - - - + + + - - Phone: - - Mail: - + Phone: + + Mail: + + - 1.5cm 2.15cm 19.9cm 2.15cm - + 1.5cm 1.2cm 19.9cm 1.2cm Your contact : + + - - - - - 1cm 27.7cm 20cm 27.7cm - 1cm 25.7cm 7cm 25.7cm + + + + + 1cm 25.4cm 20cm 25.4cm + - - - + + + - - + + + - - Phone: - - Mail: - + Phone: + + Mail: + - 1.5cm 2.15cm 19.9cm 2.15cm - + 1.5cm 1.2cm 19.9cm 1.2cm Your contact : From 775358a97d686d1d52ddfd1c2f48dffe3fa0fe95 Mon Sep 17 00:00:00 2001 From: apa <> Date: Wed, 23 Jul 2008 17:55:37 +0530 Subject: [PATCH 03/48] Update the picking.xsl. Format the report bzr revid: apa-20080723122537-brp6bucfsvb45obg --- addons/stock/report/picking.xsl | 60 ++++++++++++++++----------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/addons/stock/report/picking.xsl b/addons/stock/report/picking.xsl index ab572280dba..48933f1f64d 100644 --- a/addons/stock/report/picking.xsl +++ b/addons/stock/report/picking.xsl @@ -21,31 +21,36 @@ - - PACKINGLIST + + Packing List - - - - + + + + + + + + - - - - - - + + + + + + + - - + + @@ -74,12 +79,10 @@ --> - - Shipping Address: - - - - + Shipping Address: + + + @@ -88,12 +91,8 @@ - Recipient: - - - Concerns: - - + Recipient: + Concerns: @@ -103,10 +102,10 @@ Packing Date Shipping Date - - - - + + + + @@ -150,6 +149,7 @@ + Product Tracking Serial From ae4f8c7061004fb620bde79f839ff5a51be96914 Mon Sep 17 00:00:00 2001 From: apa <> Date: Wed, 23 Jul 2008 18:25:21 +0530 Subject: [PATCH 04/48] Update corporate_defaults.xsl bzr revid: apa-20080723125521-zqmw795sjcgjmp0s --- addons/custom/corporate_defaults.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/custom/corporate_defaults.xsl b/addons/custom/corporate_defaults.xsl index ff780a71533..71d940ca520 100644 --- a/addons/custom/corporate_defaults.xsl +++ b/addons/custom/corporate_defaults.xsl @@ -75,7 +75,7 @@ 1.5cm 1.2cm 19.9cm 1.2cm - Your contact : + From f271ef572210a563f4890dbea75538a035562bb2 Mon Sep 17 00:00:00 2001 From: apa <> Date: Fri, 1 Aug 2008 17:46:32 +0530 Subject: [PATCH 05/48] * Update Shipping.rml for format the report. bzr revid: apa-20080801121632-tuklw9yhthddzz62 --- addons/sale/report/shipping.rml | 123 ++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 54 deletions(-) diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 528ac21a0db..c8137d30b99 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -1,9 +1,12 @@ @@ -11,65 +14,78 @@ - - - + + + + + - - + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects, 'o') ]] - Delivery order [[ o.sale_id.name ]] - + Delivery order + + + + Order N° : [[ o.sale_id.name ]] + [[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]] @@ -132,7 +148,7 @@ Reference - Designation + Designation Quantity @@ -147,16 +163,16 @@ - [[line.product_id.code]] + [[line.product_id.code]] - [[line.product_id.name]] + [[line.product_id.name]] [[line.product_qty]] - [[line.product_uom.name]] + [[line.product_uom.name]] @@ -185,4 +201,3 @@ - From 97e900c9db411cc3f11e7e4cf828c769b8a969a3 Mon Sep 17 00:00:00 2001 From: apa <> Date: Mon, 4 Aug 2008 14:11:30 +0530 Subject: [PATCH 06/48] *Format the purchase order report..... bzr revid: apa-20080804084130-yg82ryjjam17f5gi --- addons/purchase/report/order.rml | 282 ++++++++++++++++++++++++++++++- 1 file changed, 281 insertions(+), 1 deletion(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index cf048a690df..261b012c952 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -1,3 +1,283 @@ -[[ 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 : [[ o.ref or '' ]]Your order reference : [[ o.partner_ref or '' ]]Date ordered : [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]Validated by : [[ o.validator and o.validator.name or '' ]] Product DescriptionApplicable TaxesDate RequestedQtyUnit PriceNet 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 '') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ 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 '') ]] + + + + + + + + From 1cafe61e5771e9a834d26e12436ce74dd67ee6e0 Mon Sep 17 00:00:00 2001 From: apa <> Date: Mon, 4 Aug 2008 15:41:06 +0530 Subject: [PATCH 07/48] *advance formating the purchase report...... bzr revid: apa-20080804101106-l406z73ofeec9c09 --- addons/purchase/report/order.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 261b012c952..c6456397eec 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -82,7 +82,7 @@ - + From 9022bfedbcd6c6e0ed808f1e703b1130421514b9 Mon Sep 17 00:00:00 2001 From: apa <> Date: Mon, 4 Aug 2008 17:01:43 +0530 Subject: [PATCH 08/48] *Format the purchase order......... bzr revid: apa-20080804113143-kkc4uuauyqr55r07 --- addons/purchase/report/order.rml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index c6456397eec..ff48f076173 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -29,11 +29,14 @@ - + - - + + + + + From ad7b1cff38992ef0ea2b2b69492c73e0a63a054f Mon Sep 17 00:00:00 2001 From: apa <> Date: Mon, 25 Aug 2008 18:43:25 +0530 Subject: [PATCH 09/48] Commited... * Shipping.rml * Shipping.sxw Formated Using OOPs Plugins...... bzr revid: apa-20080825131325-qxv4kxpri08vdqs3 --- addons/sale/report/shipping.rml | 268 +++++++++++++++++--------------- 1 file changed, 145 insertions(+), 123 deletions(-) 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 ]] - +
- + From f3cb3dd0bb8cf8d19f66ed665725ae7ea8a224d0 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Thu, 28 Aug 2008 11:43:58 +0530 Subject: [PATCH 10/48] added stock Picking Report Sxw and rml file Using Report Plugin bzr revid: vinusoft85@gmail.com-20080828061358-fi3nyjimgad32kjo --- addons/stock/report/picking.rml | 220 ++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) create mode 100644 addons/stock/report/picking.rml diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml new file mode 100644 index 00000000000..060e70d4cae --- /dev/null +++ b/addons/stock/report/picking.rml @@ -0,0 +1,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects,'picking') ]] + Packing List + + + + + + + + + + + + Shipping Address: + [[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]] + [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] + [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] + [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id.state_id and picking.address_id.state_id.name) or '' ]][[ (picking.address_id.country_id and picking.address_id.country_id.name) or '' ]] + + + + + + + + + + + + + Recipient:[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] + Concerns: [[ picking.name ]] + + + + + + + + + + Customer Ref. + + + Packing Date + + + Shipping Date + + + + + + + [[ (picking.address_id.partner_id.id) or '' ]] + + + [[ picking.date ]] + + + + + + + + + + + + + + + + + + Product + + + Tracking + + + Qty + + + Location + + + Description + + + +
+ + ......... + [[ repeatIn(picking.move_lines,'move_lines') ]] + + + + + [[ move_lines.product_id.default_code ]] + + + [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] + + + [[ move_lines.product_qty ]][[ move_lines.product_uom.name ]] + + + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + + + [[ move_lines.product_id.name ]] + + + + + + +
+ + From fe7c78b710125b322651581212915c9ca7a05a91 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Fri, 29 Aug 2008 11:40:05 +0530 Subject: [PATCH 12/48] modify stock Picking Report rml file from sxw file using report plugin bzr revid: vinusoft85@gmail.com-20080829061005-32n2my3u40ajgb9f --- addons/stock/report/picking.rml | 104 ++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 25 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 060e70d4cae..66df28dddec 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -20,10 +20,10 @@ - + - + @@ -34,15 +34,15 @@ - + - + - + @@ -51,7 +51,7 @@ - + @@ -59,11 +59,16 @@ + + + + + @@ -71,7 +76,7 @@ - + @@ -90,19 +95,22 @@ - + + + + [[ repeatIn(objects,'picking') ]] Packing List - + @@ -135,7 +143,7 @@ - + Customer Ref. @@ -148,7 +156,7 @@ - + [[ (picking.address_id.partner_id.id) or '' ]] @@ -169,11 +177,18 @@ - + + ......... + ......... + + Product + + Description + Tracking @@ -183,38 +198,77 @@ Location - - Description -
- - ......... - [[ repeatIn(picking.move_lines,'move_lines') ]] + + [[ repeatIn(picking.move_lines,'move_lines') ]] - + - [[ move_lines.product_id.default_code ]] + [[ move_lines.product_id.default_code ]] - [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] + [[ move_lines.product_id.name ]] - [[ move_lines.product_qty ]][[ move_lines.product_uom.name ]] + [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] - [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + [[ move_lines.product_qty ]] - [[ move_lines.product_id.name ]] + + [[ move_lines.product_uom.name ]] + + + + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] - +
+ + ......... + ......... + + + ......... + ......... + + + + + + + + + + + + + + + ......... + ......... + ......... + ......... + ......... + + + ......... + ......... + ......... + ......... + ......... + ......... + + + + From 093b330ebe279118aa3f4acb899e580bc5b04175 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 14:27:02 +0530 Subject: [PATCH 14/48] doing some changes in rml file related to left and right margin bzr revid: vinusoft85@gmail.com-20080901085702-hauisl1dhc8wbaya --- addons/stock/report/picking.rml | 44 +++++++++++++++------------------ 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 66df28dddec..f9629e1b057 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -2,7 +2,7 @@ @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -65,10 +65,10 @@ - + - - + + @@ -110,7 +110,7 @@ - + @@ -143,7 +143,7 @@ - + Customer Ref. @@ -156,7 +156,7 @@ - + [[ (picking.address_id.partner_id.id) or '' ]] @@ -181,7 +181,7 @@ ......... ......... - + Product @@ -201,38 +201,34 @@
- - [[ repeatIn(picking.move_lines,'move_lines') ]] - - + [[ repeatIn(picking.move_lines,'move_lines') ]] + - [[ move_lines.product_id.default_code ]] + [[ move_lines.product_id.default_code ]] - [[ move_lines.product_id.name ]] + [[ move_lines.product_id.name ]] - [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] + [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] - [[ move_lines.product_qty ]] + [[ move_lines.product_qty ]] - - [[ move_lines.product_uom.name ]] - + [[ move_lines.product_uom.name ]] - [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] - +
- + ......... ......... From b59a9df8f67989a886225e5bab1057d45bfb0fa1 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 14:45:59 +0530 Subject: [PATCH 16/48] Added New formated purchase order report sxw and rml bzr revid: vinusoft85@gmail.com-20080901091559-7u7j3s9imbrio005 --- addons/purchase/report/order_new.rml | 357 +++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 addons/purchase/report/order_new.rml diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml new file mode 100644 index 00000000000..6400e22dd00 --- /dev/null +++ b/addons/purchase/report/order_new.rml @@ -0,0 +1,357 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ 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 '') ]] + + + + + + + + From 2c3f21139dcb760e73aa121113e5e893ac48acc3 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 16:03:14 +0530 Subject: [PATCH 19/48] doing some changes in size Purchase report sxw and rml bzr revid: vinusoft85@gmail.com-20080901103314-8cdfbs7vc6n1uc7z --- addons/purchase/report/order_new.rml | 76 ++++++++++++++-------------- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml index 6400e22dd00..4d7274742ef 100644 --- a/addons/purchase/report/order_new.rml +++ b/addons/purchase/report/order_new.rml @@ -96,10 +96,7 @@ - - - - + @@ -151,13 +148,13 @@ [[ 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 ]] + [[ 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 '' ]] @@ -171,19 +168,19 @@ - [[ 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 '' ]] - + [[ 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 '' ]] + Tél. : [[ o.partner_address_id.phone or '' ]] + Fax : [[ o.partner_address_id.fax or '' ]] + TVA :[[ o.partner_id.vat or '' ]] @@ -191,13 +188,16 @@ - Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] + Request for Quotation + [[ (o.state=='draft' or removeParentNode('font')) and '' ]] - Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] - N° : [[ o.name ]] + Order + [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] + N° : + [[ o.name ]] - + @@ -215,8 +215,8 @@ - - + + @@ -224,13 +224,13 @@ [[ 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 '' ]] @@ -269,19 +269,19 @@ [[ line.name ]] - [[ ', '.join(map(lambda x: x.name, line.taxes_id))]] + [[ ', '.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.product_qty ]][[ line.product_uom.name ]] [[ '%.2f' % line.price_unit ]] - [[ '%.2f' % line.price_subtotal ]] + [[ '%.2f' % line.price_subtotal ]] @@ -310,7 +310,7 @@ Net Total : - [[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] @@ -323,7 +323,7 @@ Taxes : - [[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] @@ -336,7 +336,7 @@ TOTAL : - [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] @@ -350,8 +350,6 @@ - - - + From da52e3bdf1ffbc93364e5edc571dfec9fb2def1c Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 16:37:36 +0530 Subject: [PATCH 20/48] Given Rml Path in place of Packing List Report bzr revid: vinusoft85@gmail.com-20080901110736-pa9l2mux8ltf1mw0 --- addons/stock/stock_report.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock_report.xml b/addons/stock/stock_report.xml index 7a092ded724..5b8dbbbc2f4 100644 --- a/addons/stock/stock_report.xml +++ b/addons/stock/stock_report.xml @@ -5,8 +5,8 @@ - - + + From d9e98db02e8ccc7758c2a5fedbff7d51a235f515 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 16:40:23 +0530 Subject: [PATCH 22/48] Doing Some changes in sxw and rml picking list bzr revid: vinusoft85@gmail.com-20080901111023-pk99ejjbekerp6xz --- addons/stock/report/picking.rml | 164 ++++++++++++-------------------- 1 file changed, 59 insertions(+), 105 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index f9629e1b057..5347a102d18 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -2,7 +2,7 @@ @@ -17,32 +17,32 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - + @@ -51,7 +51,7 @@ - + @@ -64,11 +64,6 @@ - - - - - @@ -76,7 +71,7 @@ - + @@ -95,55 +90,52 @@ - + - + - - - - [[ repeatIn(objects,'picking') ]] + [[ repeatIn(objects,'picking') ]] Packing List - + - + Shipping Address: - [[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]] - [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] - [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] + [[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]] + [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] + [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id.state_id and picking.address_id.state_id.name) or '' ]][[ (picking.address_id.country_id and picking.address_id.country_id.name) or '' ]] - + - + - + Recipient:[[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] Concerns: [[ picking.name ]] - + - + - + Customer Ref. @@ -156,7 +148,7 @@ - + [[ (picking.address_id.partner_id.id) or '' ]] @@ -165,30 +157,23 @@ [[ picking.date ]] - + - + - + - - ......... - ......... - - + Product - - Description - Tracking @@ -198,73 +183,42 @@ Location + + Description +
- [[ repeatIn(picking.move_lines,'move_lines') ]] - + + [[ repeatIn(picking.move_lines,'move_lines') ]] + + - [[ move_lines.product_id.default_code ]] + [[ move_lines.product_id.default_code ]] - [[ move_lines.product_id.name ]] + [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] - [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] + [[ move_lines.product_qty ]] - [[ move_lines.product_qty ]] + + [[ move_lines.product_uom.name ]] + - [[ move_lines.product_uom.name ]] + [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] - [[ (move_lines.location_id and move_lines.location_id.name) or '' ]] + [[ move_lines.product_id.name ]] - +
- - ......... - ......... - - - ......... - ......... - - - - - - - - - - - - - - - ......... - ......... - ......... - ......... - ......... - - - ......... - ......... - ......... - ......... - ......... - ......... - - - - From 245dd434041fa38e77cf7b0ce3ae64d575de94f7 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 18:29:02 +0530 Subject: [PATCH 24/48] Doing Some changes in sxw and rml of order_new purchase report bzr revid: vinusoft85@gmail.com-20080901125902-9usd2o7eerrhbxgh --- addons/purchase/report/order_new.rml | 122 ++++++++++++--------------- 1 file changed, 54 insertions(+), 68 deletions(-) diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml index 4d7274742ef..190cd722bf7 100644 --- a/addons/purchase/report/order_new.rml +++ b/addons/purchase/report/order_new.rml @@ -14,7 +14,7 @@ - + @@ -87,16 +87,6 @@ - - - - - - - - - - @@ -126,20 +116,21 @@ + [[ repeatIn(objects,'o') ]] - + - + - + @@ -148,22 +139,22 @@ [[ 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 ]] + [[ 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 '' ]] - + - + @@ -184,8 +175,8 @@ - - + + Request for Quotation @@ -196,67 +187,60 @@ N° : [[ o.name ]] - - - - Our Order Reference + Our Order Reference - Your Order Reference + Your Order Reference - Date Ordered + Date Ordered - Validated By + Validated By - - - - [[ o.ref or '' ]] + [[ o.ref or '' ]] - [[ o.partner_ref or '' ]] + [[ o.partner_ref or '' ]] - [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] + [[ 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 + Product Description - Applicable Taxes + Applicable Taxes - Date Requested + Date Requested - Qty + Qty - Unit Price + Unit Price - Net Price + Net Price @@ -265,91 +249,93 @@ - [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] - [[ line.name ]] + [[ 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)) ]] + [[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]] - [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] + [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]] + [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]] - [[ '%.2f' % line.price_unit ]] + [[ '%.2f' % line.price_unit ]] - [[ '%.2f' % 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') ]] - + - + - Net Total : + Net Total : - [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] - + - Taxes : + Taxes : - [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] - + - TOTAL : + TOTAL : - [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] - + - [[ format(o.notes or '') ]] + [[ format(o.notes or '') ]] - + + + From 88b603fed04c542de214a21f81b23c75cfa5eadb Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Mon, 1 Sep 2008 18:39:40 +0530 Subject: [PATCH 26/48] added Request Quotation Report sxw and rml file in purchase report section bzr revid: vinusoft85@gmail.com-20080901130940-v7kipovaxx8n3nuq --- .../purchase/report/request_quotation_new.rml | 154 ++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 addons/purchase/report/request_quotation_new.rml diff --git a/addons/purchase/report/request_quotation_new.rml b/addons/purchase/report/request_quotation_new.rml new file mode 100644 index 00000000000..9c9d3268006 --- /dev/null +++ b/addons/purchase/report/request_quotation_new.rml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ 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 ]] + + From 2f067ba3097e4321f05a802418c39d23821b0c43 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 2 Sep 2008 16:12:39 +0530 Subject: [PATCH 27/48] Doing Some Changes in request_quotation_new Report SXW and Rml bzr revid: vinusoft85@gmail.com-20080902104239-mpmcasj7zcnwkwpu --- .../purchase/report/request_quotation_new.rml | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/addons/purchase/report/request_quotation_new.rml b/addons/purchase/report/request_quotation_new.rml index 9c9d3268006..608c41a78c6 100644 --- a/addons/purchase/report/request_quotation_new.rml +++ b/addons/purchase/report/request_quotation_new.rml @@ -2,7 +2,7 @@ @@ -21,7 +21,7 @@ - + @@ -66,7 +66,7 @@ [[ repeatIn(objects,'order') ]] [[ setLang(order.partner_id.lang) ]] - + @@ -74,22 +74,22 @@ - + - [[ 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 ]] - + [[ 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 ]] + Tel. : [[ order.partner_address_id.phone ]] + Fax : [[ order.partner_address_id.fax ]] + TVA : [[ order.partner_id.vat ]] @@ -106,7 +106,7 @@ - + Product @@ -115,13 +115,13 @@ Date - Qty + Qty
[[ repeatIn(order.order_line,'order_line') ]] - + [[ order_line.product_id.default_code ]] - [[ order_line.name ]] @@ -130,10 +130,10 @@ [[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]] - [[ order_line.product_qty ]] + [[ order_line.product_qty ]] - [[ order_line.product_uom.name ]] + [[ order_line.product_uom.name ]] @@ -141,6 +141,12 @@ + + + + + + [[ order.notes ]] From ba431ff3fd74c921198e6ae389734f7588065220 Mon Sep 17 00:00:00 2001 From: apa <> Date: Tue, 2 Sep 2008 16:36:37 +0530 Subject: [PATCH 29/48] Commited : Update order.sxw Update order.rml bzr revid: apa-20080902110637-jtvqecdg9ntah224 --- addons/sale/report/order.rml | 624 ++++++++++++++++++++--------------- 1 file changed, 361 insertions(+), 263 deletions(-) diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index c0cced3ecc7..f32d3655da1 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -1,266 +1,364 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -[[ repeatIn(objects,'o') ]] [[ setLang(o.partner_id.lang) ]] - - - - -Shipping address : -[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] -[[ o.partner_shipping_id.title or '' ]] [[ o.partner_shipping_id.name ]] -[[ 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.country_id and (', %s' % (o.partner_shipping_id.country_id and o.partner_shipping_id.country_id.name or '')) ]] - - - - -Invoice address : -[[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] -[[ o.partner_invoice_id.zip or '' ]] [[ o.partner_invoice_id.city or '' ]] [[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] - - - - - - - -[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] -[[ o.partner_order_id.title or '' ]] [[ o.partner_order_id.name ]] -[[ o.partner_order_id.street ]] -[[ o.partner_order_id.street2 or '' ]] -[[ o.partner_order_id.zip or '' ]] [[ o.partner_order_id.city or '' ]] -[[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]] -[[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] - - - -Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]] -Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]] -VAT : [[ o.partner_id.vat or removeParentNode('para') ]] - - - - - - -[[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] -[[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] - - - - - - -Your Reference - - -Date Ordered - - -Our Salesman - - -Payment Terms - - - - -[[ o.client_order_ref ]] - - -[[ o.date_order ]] - - -[[ o.user_id.name ]] - - -[[ o.partner_id.property_payment_term and o.partner_id.property_payment_term.note or False ]] - - - - - - - - - - -Description - - -VAT - - -Quantity - - -Unit Price - - -Disc. (%) - - -Price - - - - - [[ 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 ]] - - - - - - - - - - - - - - - -Net Total : - - -[[ o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - - - -Total VAT: - - -[[ o.amount_tax or '0.00' ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - -Total : - - -[[ o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] - - - - - - - - - -[[ format(o.note or '') ]] - - - - -[[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]] - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects,'o') ]][[ setLang(o.partner_id.lang) ]] + + + + Shipping address : + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ o.partner_shipping_id.title or '' ]][[ o.partner_shipping_id.name ]] + [[ o.partner_shipping_id.street ]] + [[ o.partner_shipping_id.street2 or '' ]] + [[ o.partner_shipping_id.city or '' ]][[ o.partner_shipping_id.zip 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 '' ]] + + + + Invoice address : + [[ o.partner_invoice_id.street ]][[ o.partner_invoice_id.street2 and (', %s' % o.partner_invoice_id.street2 or '') ]] + [[ o.partner_invoice_id.zip or '' ]][[ o.partner_invoice_id.city or '' ]][[ o.partner_invoice_id.country_id and (', %s' % (o.partner_invoice_id.country_id and o.partner_invoice_id.country_id.name or '')) ]] + + + + + + + + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ o.partner_order_id.title or '' ]][[ o.partner_order_id.name ]] + [[ o.partner_order_id.street ]] + [[ o.partner_order_id.street2 or '' ]] + [[ o.partner_order_id.zip or '' ]][[ o.partner_order_id.city or '' ]] + [[ o.partner_order_id.state_id and o.partner_order_id.state_id.name or '' ]][[ o.partner_order_id.country_id and o.partner_order_id.country_id.name or '' ]] + + + + Tel. : [[ o.partner_order_id.phone or removeParentNode('para') ]] + Fax : [[ o.partner_order_id.fax or removeParentNode('para') ]] + VAT :[[ o.partner_id.vat or removeParentNode('para') ]] + + + + + + + [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] + [[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] + + + + + + + Your Reference + + + Date Ordered + + + Our Salesman + + + Payment Terms + + + + + + + [[ o.client_order_ref ]] + + + [[ o.date_order ]] + + + [[ 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 ]] + + + + + + + + + + Description + + + VAT + + + Quantity + + + Unit Price + + + 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((line.notes and line.notes.splitlines()) or [], 'l') ]] + + + [[ l or removeParentNode('table') ]] + + + + + + + + + + + +
+ + + + + + + + + Net Total : + + + [[ o.amount_untaxed ]] + + + [[ o.pricelist_id.currency_id.name ]] + + + + + + + + + + Taxes : + + + [[ o.amount_tax ]] + + + [[ o.pricelist_id.currency_id.name ]] + + + + + + + + + + Total : + + + [[ o.amount_total ]] + + + [[ o.pricelist_id.currency_id.name ]] + + + + + + + + + + [[ format(o.note or '') ]] + + + + + [[ format((o.partner_id.property_payment_term and o.partner_id.property_payment_term.note) or '') ]] + + + + + + + - From 20b44b1821850dc8aea6eb90955d2e075fee0c2b Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 2 Sep 2008 17:46:36 +0530 Subject: [PATCH 30/48] Doing Changes purchase report xml file , given new rml path report bzr revid: vinusoft85@gmail.com-20080902121636-0mh4brx1qe13jq11 --- addons/purchase/purchase_report.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml index af9cdcaa871..0fc153144e8 100644 --- a/addons/purchase/purchase_report.xml +++ b/addons/purchase/purchase_report.xml @@ -1,7 +1,9 @@ - - + + + + \ No newline at end of file From 7b0f743e41c53aff8ddb92ec50e665a334f5e01f Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 2 Sep 2008 17:51:37 +0530 Subject: [PATCH 31/48] doing some changes in sxw and rml of picking related to partner title field bzr revid: vinusoft85@gmail.com-20080902122137-jq78go8u0804opon --- addons/stock/report/picking.rml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index 5347a102d18..a8359361ed1 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -111,7 +111,7 @@ Shipping Address: - [[ picking.address_id.partner_id.title ]][[ picking.address_id.partner_id.name ]] + [[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]][[ picking.address_id.partner_id.name ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] [[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]][[ (picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]][[ (picking.address_id.state_id and picking.address_id.state_id.name) or '' ]][[ (picking.address_id.country_id and picking.address_id.country_id.name) or '' ]] From 1d425a072c1b7610e857bdd267a18bd756a5c753 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 2 Sep 2008 19:11:45 +0530 Subject: [PATCH 34/48] doing some changes in sxw and rml of purchase order new bzr revid: vinusoft85@gmail.com-20080902134145-hyr0w2tx8t9nd1pj --- addons/purchase/report/order_new.rml | 201 +++++++++++++-------------- 1 file changed, 94 insertions(+), 107 deletions(-) diff --git a/addons/purchase/report/order_new.rml b/addons/purchase/report/order_new.rml index 190cd722bf7..e8ac44bae95 100644 --- a/addons/purchase/report/order_new.rml +++ b/addons/purchase/report/order_new.rml @@ -2,7 +2,7 @@ @@ -10,11 +10,7 @@ - - - - - + @@ -71,14 +67,25 @@ + - + + + + + + + + + + + @@ -89,7 +96,7 @@ - + @@ -97,26 +104,26 @@ - + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -124,70 +131,41 @@ - + - - - - - - - - - - - [[ 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 '' ]] - - - - - - + [[ 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 '' ]] + - - - [[ 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 '' ]] + 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 ]] + + - - Request for Quotation - [[ (o.state=='draft' or removeParentNode('font')) and '' ]] - - Order - [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] - N° : - [[ o.name ]] - - + Our Order Reference @@ -203,26 +181,26 @@ - + - [[ o.ref or '' ]] + [[ o.ref or '' ]] - [[ o.partner_ref or '' ]] + [[ o.partner_ref or '' ]] - [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] + [[ 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 @@ -234,19 +212,19 @@ Date Requested - Qty + Qty - Unit Price + Unit Price - Net Price + Net Price
[[ repeatIn(o.order_line,'line') ]] - + [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] @@ -259,17 +237,20 @@ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[ '%.2f' % line.product_qty ]][[ line.product_uom.name ]] + [[ '%.2f' % line.product_qty ]] - [[ '%.2f' % line.price_unit ]] + [[ line.product_uom.name ]] - [[ '%.2f' % line.price_subtotal ]] + [[ '%.2f' % line.price_unit ]] + + + [[ '%.2f' % line.price_subtotal ]] - + [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] @@ -280,13 +261,10 @@
- - - - + - + @@ -294,12 +272,15 @@ Net Total : - [[ '%.2f' % o.amount_untaxed ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_untaxed ]] + + + [[ o.pricelist_id.currency_id.name ]] - + @@ -307,12 +288,15 @@ Taxes : - [[ '%.2f' % o.amount_tax ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_tax ]] + + + [[ o.pricelist_id.currency_id.name ]] - + @@ -320,14 +304,17 @@ TOTAL : - [[ '%.2f' % o.amount_total ]][[ o.pricelist_id.currency_id.name ]] + [[ '%.2f' % o.amount_total ]] + + + [[ o.pricelist_id.currency_id.name ]] - + - + [[ format(o.notes or '') ]] From 4e63d872cf9766e060476b2f7dc9c8584e12d47b Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Wed, 3 Sep 2008 13:55:47 +0530 Subject: [PATCH 35/48] doing some changes in purchase xml file path bzr revid: vinusoft85@gmail.com-20080903082547-wijgh8tmbnzgtr2v --- addons/purchase/purchase_report.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/purchase/purchase_report.xml b/addons/purchase/purchase_report.xml index 0fc153144e8..af9cdcaa871 100644 --- a/addons/purchase/purchase_report.xml +++ b/addons/purchase/purchase_report.xml @@ -1,9 +1,7 @@ - - - - + + \ No newline at end of file From 8419efc43598ceae53a9a3a1a67bad30681e3a52 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 3 Sep 2008 14:21:34 +0530 Subject: [PATCH 36/48] Remove picking.xsl and picking.xml bzr revid: patelamit2003@gmail.com-20080903085134-6w11rkvc5qg3vrev --- addons/stock/report/picking.xml | 45 -------- addons/stock/report/picking.xsl | 184 -------------------------------- 2 files changed, 229 deletions(-) delete mode 100644 addons/stock/report/picking.xml delete mode 100644 addons/stock/report/picking.xsl diff --git a/addons/stock/report/picking.xml b/addons/stock/report/picking.xml deleted file mode 100644 index 523091a5b7c..00000000000 --- a/addons/stock/report/picking.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - -
-
- - <name type="field" name="name"/> - <street type="field" name="street"/> - <zip type="field" name="zip"/> - <city type="field" name="city"/> - <state type="field" name="state_id.name"/> - <country type="field" name="country_id.name"/> - </address> - - <corporation type="zoom" name="address_id.partner_id"> - <id type="field" name="id"/> - <title type="field" name="title"/> - <name type="field" name="name"/> - </corporation> - - <picking-id type="field" name="id"/> - <picking-name type="field" name="name"/> - <picking-date type="field" name="date"/> - <expedition-date/> - <command-number>98798413</command-number> - </header> - <lines> - <line type="zoom" name="move_lines"> - <ref type="field" name="product_id.code">68854GZGZ</ref> - <tracking></tracking> - <quantity type="field" name="product_qty">0</quantity> - <location type="field" name="location_id.name">0</location> - <prod_uom type="field" name="product_uom.name">0</prod_uom> - <name type="field" name="product_id.name">Un joli t-shirt tout bo</name> - <variant type="field" name="product_id.variants">XL</variant> - <state type="field" name="state">draft</state> - - <lot type="zoom" name="tracking_id"> - <tracking type="field" name="name" /> - <serial type="field" name="serial" /> - </lot> - </line> - </lines> - </picking> -</pickinglist> diff --git a/addons/stock/report/picking.xsl b/addons/stock/report/picking.xsl deleted file mode 100644 index 48933f1f64d..00000000000 --- a/addons/stock/report/picking.xsl +++ /dev/null @@ -1,184 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:fo="http://www.w3.org/1999/XSL/Format"> - - <xsl:import href="../../custom/corporate_defaults.xsl"/> - <xsl:import href="../../base/report/rml_template.xsl"/> - - <xsl:template match="/"> - <xsl:call-template name="rml"/> - </xsl:template> - - <!-- frames (optional template - override corporate defaults) --> - - <xsl:template name="first_page_frames"> -<!-- - <frame id="smalltext" x1="14.5cm" y1="26cm" width="6cm" height="3cm"/> ---> - <frame id="address" x1="11cm" y1="21.5cm" width="6cm" height="4cm"/> - <frame id="main" x1="1cm" y1="3.5cm" width="19.0cm" height="17.5cm"/> - </xsl:template> - - <!-- report specific "graphics" --> - - <xsl:template name="first_page_graphics_report"> - <setFont name="Helvetica" size="14"/> - <drawRightString x="200mm" y="25.5cm" t="1">Packing List</drawRightString> - </xsl:template> - - <!-- stylesheet --> - - <xsl:template name="stylesheet"> - <blockTableStyle id="infos"> - <blockAlignment value="CENTRE" /> - <blockFont name="Helvetica-Bold" size="8" start="0,0" stop="-1,0"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#cccccc" /> - <lineStyle kind="LINEBELOW" colorName="#cccccc" /> - <lineStyle kind="LINEAFTER" colorName="#cccccc" /> - <lineStyle kind="LINEBEFORE" colorName="#cccccc" /> - <blockBackground colorName="#e0e0e0" start="0,0" stop="-1,0"/> - </blockTableStyle> - <blockTableStyle id="products"> - <blockAlignment value="LEFT" start="0,0" stop="0,-1"/> - <blockFont name="Helvetica-Bold" size="8" start="0,0" stop="-1,0"/> - <blockAlignment value="CENTER" start="1,0" stop="-1,0"/> - <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,0" stop="-1,0" /> - <lineStyle kind="LINEBELOW" colorName="#e0e0e0" start="0,1" stop="-1,-2" /> - </blockTableStyle> - <paraStyle name="address-title" fontName="Helvetica-Bold" fontSize="8" alignment="left"/> - <paraStyle name="address" fontName="Helvetica" fontSize="8" alignment="left" leftIndent="1cm"/> - <paraStyle name="prod" fontName="Helvetica" fontSize="8" alignment="left"/> - <paraStyle name="prod-right" fontName="Helvetica" fontSize="8" alignment="right"/> - </xsl:template> - - <xsl:template name="story"> - <xsl:apply-templates select="pickinglist"/> - </xsl:template> - - <xsl:template match="pickinglist"> - <xsl:apply-templates select="picking"/> - </xsl:template> - - <xsl:template match="picking"> - <xsl:apply-templates select="header"/> - <xsl:apply-templates select="lines"/> - </xsl:template> - - <xsl:template match="header"> - <!-- start of smalltext frame --> -<!-- - <para t="1"> - Here is the picking list of this lot. Generated by Tiny ERP. - </para> ---> - <!-- end of smalltext frame --> -<!-- - <nextFrame/> ---> - <!-- start of address frame --> - - <para style="address-title" t="1">Shipping Address:</para> - - <xsl:apply-templates select="corporation" mode="shipping"/> - <xsl:apply-templates select="address" mode="shipping"/> - - <!-- end of address frame --> - - <nextFrame/> - - <!-- start of products frame --> - - <para> - <font face="Helvetica-Bold" size="8">Recipient</font>:<font face="Helvetica" size="8"><xsl:apply-templates select="address" mode="header"/></font> </para> - <para style="prod" t="1">Concerns:<xsl:value-of select="picking-name"/></para> - <spacer length="1cm" width="1mm"/> - - <blockTable colWidths="4cm,4cm,6cm,4cm" style="infos"> - <tr> - <td t="1">Customer ref.</td> - <td t="1">Shipping ref.</td> - <td t="1">Packing Date</td> - <td t="1">Shipping Date</td> - </tr><tr> - <td><para style="address"><xsl:value-of select="corporation/id"/></para></td> - <td><para style="address"><xsl:value-of select="picking-id"/></para></td> - <td><para style="address"><xsl:value-of select="picking-date"/></para></td> - <td><para style="address"><xsl:value-of select="expedition-date"/></para></td> - </tr> - </blockTable> - </xsl:template> - - <xsl:template match="corporation" mode="shipping"> - <para style="address"> - <xsl:value-of select="title"/> - <xsl:text> </xsl:text> - <xsl:value-of select="name"/> - </para> - </xsl:template> - - <xsl:template match="address" mode="shipping"> - <para style="address"> - <xsl:value-of select="title"/> - <xsl:text> </xsl:text> - <xsl:value-of select="name"/> - </para> - <para style="address"> - <xsl:value-of select="street"/> - </para> - <para style="address"> - <xsl:value-of select="zip"/> - <xsl:text> </xsl:text> - <xsl:value-of select="city"/> - </para> - <para style="address"> - <xsl:value-of select="country_id"/> - </para> - </xsl:template> - - <xsl:template match="address" mode="header"> - <xsl:value-of select="title"/> - <xsl:text> </xsl:text> - <xsl:value-of select="name"/> - </xsl:template> - - <xsl:template match="lines"> - <spacer length="0.5cm"/> - - <setNextTemplate name="other_pages"/> - <blockTable colWidths="2cm,2.2cm,2.2cm,2.5cm,2cm,4.5cm,2.1cm" style="products" repeatRows="1"> - <tr> - <setFont name="Helvetica-Bold"/> - <td t="1">Product</td> - <td t="1">Tracking</td> - <td t="1">Serial</td> - <td t="1">Qty</td> - <td t="1">Location</td> - <td t="1">Description</td> - <td t="1">State</td> - </tr> - <xsl:for-each select="line"> - <tr> - <td><para style="prod"><xsl:value-of select="ref"/></para></td> - <td><para style="prod"><xsl:value-of select="lot/tracking"/></para></td> - <td><para style="prod"><xsl:value-of select="lot/serial"/></para></td> - <td> - <para style="prod-right"> - <xsl:value-of select="quantity"/> - <xsl:text> </xsl:text> - <xsl:value-of select="prod_uom"/> - </para> - </td> - <td><para style="prod"><xsl:value-of select="location"/></para></td> - <td><para style="prod"><xsl:value-of select="name"/><xsl:text> </xsl:text><xsl:value-of select="variant"/></para></td> - <td><para style="prod-right"><xsl:value-of select="state"/></para></td> - </tr> - </xsl:for-each> - </blockTable> - - <setNextTemplate name="first_page"/> - <nextFrame/> - </xsl:template> - -</xsl:stylesheet> From d886aeb4c9ca1c84dbba9034cf6445de0bab1823 Mon Sep 17 00:00:00 2001 From: Vinay Rana <vinusoft85@gmail.com> Date: Wed, 3 Sep 2008 15:27:51 +0530 Subject: [PATCH 37/48] modify reqest quotation sxw and rml file report with new format bzr revid: vinusoft85@gmail.com-20080903095751-hgs2i52pk4h3ip9l --- addons/purchase/report/request_quotation.rml | 171 ++++++++++++++++++- 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index e906b709542..5537b4d3464 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -1,3 +1,170 @@ <?xml version="1.0"?> -<document filename="test.pdf"><template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"><pageTemplate id="first"><frame id="first" x1="42.0" y1="42.0" width="511" height="758"/></pageTemplate></template><stylesheet><blockTableStyle id="Standard_Outline"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau6"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau2"><blockAlignment value="LEFT"/><blockValign value="TOP"/><lineStyle kind="GRID" colorName="black"/><blockBackground colorName="#e6e6e6" start="0,0" stop="0,0"/><blockBackground colorName="#e6e6e6" start="1,0" stop="1,0"/><blockBackground colorName="#e6e6e6" start="2,0" stop="2,0"/></blockTableStyle><blockTableStyle id="Tableau3"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><blockTableStyle id="Tableau5"><blockAlignment value="LEFT"/><blockValign value="TOP"/></blockTableStyle><initialize><paraStyle name="all" alignment="justify"/></initialize><paraStyle name="P1" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P2" fontName="Times-BoldItalic" fontSize="6.0" leading="8"/><paraStyle name="P3" fontName="Times-Roman" fontSize="9.0" leading="11"/><paraStyle name="P4" fontName="Times-Roman" fontSize="10.0" leading="13"/><paraStyle name="P5" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P6" fontName="Times-Roman" fontSize="4.0" leading="5"/><paraStyle name="P7" fontName="Times-Roman" fontSize="16.0" leading="20"/><paraStyle name="P8" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P9" fontName="Times-Roman" fontSize="11.0" leading="14"/><paraStyle name="P10" fontName="Times-Roman"/><paraStyle name="P11" fontName="Times-Bold" fontSize="8.0" leading="10"/><paraStyle name="P12" fontName="Times-Bold" fontSize="8.0" leading="10" alignment="CENTER"/><paraStyle name="P13" fontName="Times-BoldItalic" fontSize="6.0" leading="8" alignment="LEFT"/><paraStyle name="P14" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P15" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="CENTER"/><paraStyle name="P16" fontName="Times-Roman" fontSize="9.0" leading="11" alignment="RIGHT"/><paraStyle name="P17" fontName="Times-Italic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P18" fontName="Times-BoldItalic" fontSize="9.0" leading="11" alignment="LEFT"/><paraStyle name="P19" fontName="Times-Roman" fontSize="11.0" leading="14" alignment="LEFT"/><paraStyle name="Standard" fontName="Times-Roman"/><paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/><paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/><paraStyle name="Table Contents" fontName="Times-Roman"/><paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/><paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/><paraStyle name="Index" fontName="Times-Roman"/></stylesheet><images/><story><para style="P1">[[ repeatIn(objects,'order') ]]</para><para style="P2">[[ setLang(order.partner_id.lang) ]]</para><blockTable colWidths="241.0,57.0,213.0" style="Tableau6"><tr><td><para style="P3"><font color="white"> </font></para></td><td><para style="P3"><font color="white"> </font></para></td><td><para style="P4">[[ order.partner_id.title ]][[ order.partner_id.name ]]</para><para style="P5">[[ order.partner_address_id.title ]][[ order.partner_address_id.name ]]</para><para style="P5">[[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]]</para><para style="P5">[[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]]</para><para style="P5">[[ order.partner_address_id.state_id.code ]][[ order.partner_address_id.country_id.code ]]</para><para style="P6"><font color="white"> </font></para><para style="P4">Tel. : [[ order.partner_address_id.phone ]]</para><para style="P4">Fax : [[ order.partner_address_id.fax ]]</para><para style="P4">TVA : [[ order.partner_id.vat ]]</para></td></tr></blockTable><para style="P7">Request for Quotation [[ order.name ]]</para><para style="P8"><font color="white"> </font></para><para style="P8">Other reference :[[ order.ref ]]</para><para style="P9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para><para style="P9"><font color="white"> </font></para><para style="P8">Please find hereby a request for quotation.</para><para style="P10"><font color="white"> </font></para><blockTable colWidths="358.0,70.0,82.0" repeatRows="1" style="Tableau2"><tr><td><para style="P11">Product</para></td><td><para style="P12">Date</para></td><td><para style="P12">Qty</para></td></tr></blockTable><section><para style="P13">[[ repeatIn(order.order_line,'order_line') ]]</para><blockTable colWidths="358.0,70.0,82.0" style="Tableau3"><tr><td><para style="P14">[[ order_line.product_id.default_code ]] - [[ order_line.name ]]</para></td><td><para style="P15">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para></td><td><para style="P16">[[ order_line.product_qty ]][[ order_line.product_uom.name ]]</para></td></tr></blockTable><blockTable colWidths="428.0,82.0" style="Tableau5"><tr><td><para style="P17">[[ order_line.notes ]]</para></td><td><para style="P18"><font color="white"> </font></para></td></tr></blockTable></section><para style="P8"><font color="white"> </font></para><para style="P19">[[ order.notes ]]</para><para style="P19"><font color="white"> </font></para><para style="P8">Thanks,</para><para style="P8"><font color="white"> </font></para><para style="P8">[[ user.signature ]]</para></story></document> - +<document filename="test.pdf"> + <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> + <pageTemplate id="first"> + <frame id="first" x1="23.0" y1="42.0" width="530" height="758"/> + </pageTemplate> + </template> + <stylesheet> + <blockTableStyle id="Standard_Outline"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Address_Detail"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + </blockTableStyle> + <blockTableStyle id="Table_Product_Header_Title"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> + </blockTableStyle> + <blockTableStyle id="Table_Product_Line"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + </blockTableStyle> + <blockTableStyle id="Table_Product_line_notes"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + </blockTableStyle> + <initialize> + <paraStyle name="all" alignment="justify"/> + </initialize> + <paraStyle name="Standard" fontName="Times-Roman"/> + <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> + <paraStyle name="Table Contents" fontName="Times-Roman"/> + <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> + <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="Index" fontName="Times-Roman"/> + <paraStyle name="Footer" fontName="Times-Roman"/> + <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> + <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> + <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + </stylesheet> + <images/> + <story> + <para style="terp_default_9">[[ repeatIn(objects,'order') ]]</para> + <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para> + <blockTable colWidths="250.0,59.0,221.0" style="Table_Address_Detail"> + <tr> + <td> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + </td> + <td> + <para style="terp_default_9">[[ (order.partner_id and order.partner_id.title) or '' ]][[ order.partner_id.name ]]</para> + <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.title) or '' ]][[ order.partner_address_id.name ]]</para> + <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.street) or '']][[ order.partner_address_id.street2 ]]</para> + <para style="terp_default_9">[[ (order.partner_address_id and order.partner_address_id.zip) or '' ]][[ (order.partner_address_id and order.partner_address_id.city) or '' ]]</para> + <para style="terp_default_9">[[ order.partner_address_id.state_id.code ]][[ (order.partner_address_id and order.partner_address_id.country_id and order.partner_address_id.country_id.code) or '' ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">Tel. : [[ (order.partner_address_id and order.partner_address_id.phone) or '' ]]</para> + <para style="terp_default_9">Fax : [[ (order.partner_address_id and order.partner_address_id.fax) or '' ]]</para> + <para style="terp_default_9">TVA : [[ (order.partner_id and order.partner_id.vat) or '' ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_header">Request for Quotation [[ order.name ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">Other reference :[[ order.ref or '' ]]</para> + <para style="terp_default_9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">Please find hereby a request for quotation.</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <blockTable colWidths="372.0,73.0,85.0" repeatRows="1" style="Table_Product_Header_Title"> + <tr> + <td> + <para style="terp_tblheader_Details">Product</para> + </td> + <td> + <para style="terp_tblheader_Details">Date</para> + </td> + <td> + <para style="terp_tblheader_Details_Right">Qty</para> + </td> + </tr> + </blockTable> + <section> + <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para> + <blockTable colWidths="372.0,73.0,64.0,21.0" style="Table_Product_Line"> + <tr> + <td> + <para style="terp_default_9">[[ (order_line.product_id and order_line.product_id.default_code) or '']] - [[ order_line.name ]]</para> + </td> + <td> + <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ order_line.product_qty or '' ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para> + </td> + </tr> + </blockTable> + <blockTable colWidths="52.0,478.0" style="Table_Product_line_notes"> + <tr> + <td> + <para style="terp_default_9">[[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]] </para> + </td> + <td> + <para style="terp_default_9">[[ l or removeParentNode('table') ]]</para> + </td> + </tr> + </blockTable> + </section> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">[[ order.notes or '' ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">Thanks,</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> + <para style="terp_default_9">[[ user.signature or '' ]]</para> + </story> +</document> From 7923718f53771a1681b1792595b189fdc01a0838 Mon Sep 17 00:00:00 2001 From: Vinay Rana <vinusoft85@gmail.com> Date: Wed, 3 Sep 2008 15:40:11 +0530 Subject: [PATCH 39/48] modify purchase order sxw and rml file bzr revid: vinusoft85@gmail.com-20080903101011-d1vfx15k144nf96t --- addons/purchase/report/order.rml | 258 ++++++++++++++++++------------- 1 file changed, 151 insertions(+), 107 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index ff48f076173..2ad8e757e3a 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -2,7 +2,7 @@ <document filename="test.pdf"> <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> <pageTemplate id="first"> - <frame id="first" x1="42.0" y1="42.0" width="511" height="758"/> + <frame id="first" x1="18.0" y1="42.0" width="535" height="758"/> </pageTemplate> </template> <stylesheet> @@ -10,55 +10,91 @@ <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="address_table"> + <blockTableStyle id="Table_All_Address_Detail"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="RefTable"> + <blockTableStyle id="Header_Order_Reference_Tbl"> <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#e0e0e0" Thickness="1"/> - <lineStyle kind="LINEBELOW" colorName="#e0e0e0" /> - <lineStyle kind="LINEAFTER" colorName="#e0e0e0" /> - <lineStyle kind="LINEBEFORE" colorName="#e0e0e0" /> - <blockBackground colorName="white" start="0,0" stop="-1,0"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Tableau2"> - <blockAlignment value="LEFT" start="0,0" stop="0,-1"/> - <blockAlignment value="CENTER" start="1,0" stop="-1,0"/> - <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#3b3131" start="0,0" stop="-1,0" /> - + <blockTableStyle id="Content_Order_Reference_Table"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> + <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Tableau3"> - <blockAlignment value="LEFT" start="0,0" stop="0,-1"/> - <blockAlignment value="CENTER" start="1,0" stop="-1,0"/> - <blockAlignment value="RIGHT" start="2,1" stop="-1,-1"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#e0e0e0" start="0,0" stop="-1,0" /> + <blockTableStyle id="Table_Header_Pur_ord_Line"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> </blockTableStyle> - <blockTableStyle id="Tableau5"> + <blockTableStyle id="Table_Order_Pur_line_Content"> + <blockAlignment value="LEFT"/> + <blockValign value="TOP"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="7,-1" stop="7,-1"/> + </blockTableStyle> + <blockTableStyle id="Table_Pur_ord_line_Notes"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> - <blockTableStyle id="Tableau1"> + <blockTableStyle id="Table_All_Total_Detail"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> + <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> </blockTableStyle> - <blockTableStyle id="Tableau4"> + <blockTableStyle id="Table_Outer_Notes"> <blockAlignment value="LEFT"/> <blockValign value="TOP"/> </blockTableStyle> <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P3" rightIndent="0.0" leftIndent="-4.0" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="P4" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P5" rightIndent="0.0" leftIndent="-31.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P6" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -69,7 +105,7 @@ <paraStyle name="Index" fontName="Times-Roman"/> <paraStyle name="Footer" fontName="Times-Roman"/> <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> - <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> @@ -82,91 +118,89 @@ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> + <images/> <story> - <para style="P5">[[ repeatIn(objects,'o') ]]</para> - <blockTable colWidths="275.0,275.0" style="address_table"> + <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> + <para style="terp_default_8"> + <font color="white"> </font> + </para> + <blockTable colWidths="294.0,240.0" style="Table_All_Address_Detail"> <tr> <td> - <para style="P2">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> - <para style="P6">Shipping address :</para> - <para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> - <para style="P2">[[ addr.title or '' ]] [[ addr.name ]]</para> - <para style="P2">[[ addr.street ]]</para> - <para style="P2">[[ addr.street2 or '' ]]</para> - <para style="P2"><font face="Times-Roman">[[ addr.zip or '' ]]</font> [[ addr.city or '' ]]</para> - <para style="P2">[[ addr.state_id and addr.state_id.name or '' ]]</para> - <para style="P1">[[ addr.country_id and addr.country_id.name or '' ]]</para> + <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> + <para style="terp_default_Bold_9">Shipping address :</para> + <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para> + <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name ]]</para> + <para style="terp_default_9">[[ addr.street ]]</para> + <para style="terp_default_9">[[ addr.street2 or '' ]]</para> + <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or '' ]]</para> + <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para> + <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para> </td> <td> - <para style="P2">[[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]</para> - <para style="P2">[[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]]</para> - <para style="P2">[[ o.partner_address_id.street ]]</para> - <para style="P2">[[ o.partner_address_id.street2 or '' ]]</para> - <para style="P2">[[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]]</para> - <para style="P2">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para> - <para style="P2">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para> - <para style="P4"> + <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.street ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]][[ o.partner_address_id.city or '' ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para> + <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para> + <para style="terp_default_9"> <font color="white"> </font> </para> - <para style="P2">Tél. : [[ o.partner_address_id.phone or '' ]]</para> - <para style="P2">Fax : [[ o.partner_address_id.fax or '' ]]</para> - <para style="P1">TVA : [[ o.partner_id.vat or '' ]]</para> + <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para> + <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para> + <para style="terp_default_9">TVA :[[ o.partner_id.vat or '' ]]</para> </td> </tr> </blockTable> - <para style="terp_default_8"> + <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para> + <para style="terp_default_9"> <font color="white"> </font> </para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <para style="P3"> - Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] - Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] - N° : [[ o.name ]] - </para> - <blockTable colWidths="128.0,128.0,128.0,128.0" style="RefTable"> + <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl"> <tr> <td> - <para style="terp_tblheader_General_Centre">Our order reference</para> + <para style="terp_tblheader_General_Centre">Our Order Reference</para> </td> <td> - <para style="terp_tblheader_General_Centre">Your order reference</para> + <para style="terp_tblheader_General_Centre">Your Order Reference</para> </td> <td> - <para style="terp_tblheader_General_Centre">Date ordered</para> + <para style="terp_tblheader_General_Centre">Date Ordered</para> </td> <td> - <para style="terp_tblheader_General_Centre">Validated by</para> - </td> - </tr> - <tr> - <td> - <para style="terp_default_Centre_8">[[ o.ref or '' ]]</para> - </td> - <td> - <para style="terp_default_Centre_8">[[ o.partner_ref or '' ]]</para> - </td> - <td> - <para style="terp_default_Centre_8">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para> - </td> - <td> - <para style="terp_default_Centre_8">[[ o.validator and o.validator.name or '' ]]</para> + <para style="terp_tblheader_General_Centre">Validated By</para> </td> </tr> </blockTable> - <para style="terp_default_8"> + <blockTable colWidths="136.0,132.0,133.0,133.0" style="Content_Order_Reference_Table"> + <tr> + <td> + <para style="terp_default_Centre_9">[[ o.ref or '' ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para> + </td> + </tr> + </blockTable> + <para style="terp_default_9"> <font color="white"> </font> </para> - <para style="terp_default_9"/> - <blockTable colWidths="195.0,65.0,52.0,65.0,65.0,69.0" repeatRows="1" style="Tableau2"> + <blockTable colWidths="220.0,51.0,54.0,68.0,68.0,72.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> <tr> <td> <para style="terp_tblheader_Details">Product Description</para> @@ -178,7 +212,7 @@ <para style="terp_tblheader_Details">Date Requested</para> </td> <td> - <para style="terp_tblheader_Details">Qty</para> + <para style="terp_tblheader_Details_Centre">Qty</para> </td> <td> <para style="terp_tblheader_Details_Right">Unit Price</para> @@ -190,30 +224,35 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para> - <blockTable colWidths="193.0,65.0,52.0,65.0,64.0,69.0" style="Tableau3"> + <blockTable colWidths="31.0,189.0,51.0,54.0,46.0,23.0,68.0,72.0" style="Table_Order_Pur_line_Content"> <tr> <td> <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para> + </td> + <td> <para style="terp_default_9">[[ line.name ]]</para> </td> <td> - <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id))]]</para> + <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para> </td> <td> <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para> </td> <td> - <para style="terp_default_9">[[ '%.2f' % line.product_qty ]] [[ line.product_uom.name ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para> </td> </tr> </blockTable> - <blockTable colWidths="43.0,468.0" style="Tableau5"> + <blockTable colWidths="56.0,478.0" style="Table_Pur_ord_line_Notes"> <tr> <td> <para style="terp_default_9">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para> @@ -224,10 +263,7 @@ </tr> </blockTable> </section> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="376.0,65.0,69.0" style="Tableau1"> + <blockTable colWidths="346.0,77.0,70.0,41.0" style="Table_All_Total_Detail"> <tr> <td> <para style="terp_default_9"> @@ -235,10 +271,13 @@ </para> </td> <td> - <para style="terp_default_Bold_9">Net Total :</para> + <para style="terp_default_Bold_9">Net Total :</para> </td> <td> - <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]] [[ o.pricelist_id.currency_id.name ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para> </td> </tr> <tr> @@ -248,10 +287,13 @@ </para> </td> <td> - <para style="terp_default_Bold_9">Taxes :</para> + <para style="terp_default_Bold_9">Taxes :</para> </td> <td> - <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]] [[ o.pricelist_id.currency_id.name ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para> </td> </tr> <tr> @@ -261,26 +303,28 @@ </para> </td> <td> - <para style="terp_default_Bold_9">TOTAL :</para> + <para style="terp_default_Bold_9">TOTAL :</para> </td> <td> - <para style="terp_default_Right_9">[[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]]</para> + <para style="terp_default_Right_9">[[ '%.2f' % o.amount_total ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para> </td> </tr> </blockTable> <para style="terp_default_8"> <font color="white"> </font> </para> - <blockTable colWidths="510.0" style="Tableau4"> + <blockTable colWidths="535.0" style="Table_Outer_Notes"> <tr> <td> - <para style="terp_default_8">[[ format(o.notes or '') ]]</para> + <para style="terp_default_9">[[ format(o.notes or '') ]]</para> </td> </tr> </blockTable> - <para style="terp_default_8"> + <para style="terp_default_9"> <font color="white"> </font> </para> </story> </document> - From 813ced297e6e57179a0f334db43a0658965ec89f Mon Sep 17 00:00:00 2001 From: Vinay Rana <vinusoft85@gmail.com> Date: Wed, 3 Sep 2008 15:43:17 +0530 Subject: [PATCH 41/48] remove extra report sxw and rml order and req quatation. bzr revid: vinusoft85@gmail.com-20080903101317-8hkjmruief85a6a3 --- addons/purchase/report/order_new.rml | 328 ------------------ .../purchase/report/request_quotation_new.rml | 160 --------- 2 files changed, 488 deletions(-) delete mode 100644 addons/purchase/report/order_new.rml delete mode 100644 addons/purchase/report/request_quotation_new.rml 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 @@ -<?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> - <pageTemplate id="first"> - <frame id="first" x1="18.0" y1="45.0" width="532" height="757"/> - </pageTemplate> - </template> - <stylesheet> - <blockTableStyle id="Standard_Outline"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Table_All_Address_Detail"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Header_Order_Reference_Tbl"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <blockTableStyle id="Content_Order_Reference_Table"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/> - <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <blockTableStyle id="Table_Header_Pur_ord_Line"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> - </blockTableStyle> - <blockTableStyle id="Table_Order_Pur_line_Content"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="6,-1" stop="6,-1"/> - </blockTableStyle> - <blockTableStyle id="Table_Pur_ord_line_Notes"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Table_All_Total_Detail"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <blockTableStyle id="Table_Outer_Notes"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <initialize> - <paraStyle name="all" alignment="justify"/> - </initialize> - <paraStyle name="Standard" fontName="Times-Roman"/> - <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Heading" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Table Contents" fontName="Times-Roman"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> - <paraStyle name="Footer" fontName="Times-Roman"/> - <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> - <paraStyle name="terp_header" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_General" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_tblheader_General_Centre" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_General_Right" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Centre" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Right" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_Right_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Centre_8" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_header_Right" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_address" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Centre_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Right_9" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_2" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - </stylesheet> - <images/> - <story> - <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="294.0,238.0" style="Table_All_Address_Detail"> - <tr> - <td> - <para style="terp_default_9">[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]</para> - <para style="terp_default_Bold_9">Shipping address :</para> - <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para> - <para style="terp_default_9">[[ addr.title or '' ]][[ addr.name ]]</para> - <para style="terp_default_9">[[ addr.street ]]</para> - <para style="terp_default_9">[[ addr.street2 or '' ]]</para> - <para style="terp_default_9"><font face="Times-Roman">[[ addr.zip or '' ]]</font>[[ addr.city or '' ]]</para> - <para style="terp_default_9">[[ addr.state_id and addr.state_id.name or '' ]]</para> - <para style="terp_default_9">[[ addr.country_id and addr.country_id.name or '' ]]</para> - </td> - <td> - <para style="terp_default_9">[[ o.partner_id.title or '' ]][[ o.partner_id.name ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.street ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.street2 or '' ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.zip or '' ]][[ o.partner_address_id.city or '' ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]]</para> - <para style="terp_default_9">[[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">Tél. : [[ o.partner_address_id.phone or '' ]]</para> - <para style="terp_default_9">Fax : [[ o.partner_address_id.fax or '' ]]</para> - <para style="terp_default_9">TVA :[[ o.partner_id.vat or '' ]]</para> - </td> - </tr> - </blockTable> - <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <blockTable colWidths="134.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl"> - <tr> - <td> - <para style="terp_tblheader_General_Centre">Our Order Reference</para> - </td> - <td> - <para style="terp_tblheader_General_Centre">Your Order Reference</para> - </td> - <td> - <para style="terp_tblheader_General_Centre">Date Ordered</para> - </td> - <td> - <para style="terp_tblheader_General_Centre">Validated By</para> - </td> - </tr> - </blockTable> - <blockTable colWidths="134.0,132.0,133.0,133.0" style="Content_Order_Reference_Table"> - <tr> - <td> - <para style="terp_default_Centre_9">[[ o.ref or '' ]]</para> - </td> - <td> - <para style="terp_default_Centre_9">[[ o.partner_ref or '' ]]</para> - </td> - <td> - <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]]</para> - </td> - <td> - <para style="terp_default_Centre_9">[[ o.validator and o.validator.name or '' ]]</para> - </td> - </tr> - </blockTable> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <blockTable colWidths="202.0,68.0,54.0,67.0,68.0,72.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> - <tr> - <td> - <para style="terp_tblheader_Details">Product Description</para> - </td> - <td> - <para style="terp_tblheader_Details">Applicable Taxes</para> - </td> - <td> - <para style="terp_tblheader_Details">Date Requested</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Qty</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Unit Price</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Net Price</para> - </td> - </tr> - </blockTable> - <section> - <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para> - <blockTable colWidths="205.0,67.0,54.0,44.0,24.0,66.0,72.0" style="Table_Order_Pur_line_Content"> - <tr> - <td> - <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para> - <para style="terp_default_9">[[ line.name ]]</para> - </td> - <td> - <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para> - </td> - <td> - <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ line.product_uom.name ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ '%.2f' % line.price_unit ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ '%.2f' % line.price_subtotal ]]</para> - </td> - </tr> - </blockTable> - <blockTable colWidths="43.0,478.0" style="Table_Pur_ord_line_Notes"> - <tr> - <td> - <para style="terp_default_9">[[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]]</para> - </td> - <td> - <para style="terp_default_9">[[ l or removeParentNode('table') ]]</para> - </td> - </tr> - </blockTable> - </section> - <blockTable colWidths="346.0,59.0,69.0,41.0" style="Table_All_Total_Detail"> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_Bold_9">Net Total :</para> - </td> - <td> - <para style="terp_default_9">[[ '%.2f' % o.amount_untaxed ]]</para> - </td> - <td> - <para style="terp_default_9">[[ o.pricelist_id.currency_id.name ]]</para> - </td> - </tr> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_Bold_9">Taxes :</para> - </td> - <td> - <para style="terp_default_9">[[ '%.2f' % o.amount_tax ]]</para> - </td> - <td> - <para style="terp_default_9">[[ o.pricelist_id.currency_id.name ]]</para> - </td> - </tr> - <tr> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_Bold_9">TOTAL :</para> - </td> - <td> - <para style="terp_default_9">[[ '%.2f' % o.amount_total ]]</para> - </td> - <td> - <para style="terp_default_9">[[ o.pricelist_id.currency_id.name ]]</para> - </td> - </tr> - </blockTable> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="532.0" style="Table_Outer_Notes"> - <tr> - <td> - <para style="terp_default_9">[[ format(o.notes or '') ]]</para> - </td> - </tr> - </blockTable> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </story> -</document> 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 @@ -<?xml version="1.0"?> -<document filename="test.pdf"> - <template pageSize="(595.0,842.0)" title="Test" author="Martin Simon" allowSplitting="20"> - <pageTemplate id="first"> - <frame id="first" x1="31.0" y1="42.0" width="522" height="758"/> - </pageTemplate> - </template> - <stylesheet> - <blockTableStyle id="Standard_Outline"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Table_Address_Que"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - </blockTableStyle> - <blockTableStyle id="Table_Product_Header"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> - </blockTableStyle> - <blockTableStyle id="Table_Order_Line"> - <blockAlignment value="LEFT"/> - <blockValign value="TOP"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> - <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> - </blockTableStyle> - <initialize> - <paraStyle name="all" alignment="justify"/> - </initialize> - <paraStyle name="Standard" fontName="Times-Roman"/> - <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="List" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> - <paraStyle name="Table Contents" fontName="Times-Roman"/> - <paraStyle name="Table Heading" fontName="Times-Roman" alignment="CENTER"/> - <paraStyle name="Caption" fontName="Times-Roman" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="Index" fontName="Times-Roman"/> - <paraStyle name="Footer" fontName="Times-Roman"/> - <paraStyle name="Horizontal Line" fontName="Times-Roman" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/> - <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> - </stylesheet> - <images/> - <story> - <para style="terp_default_9">[[ repeatIn(objects,'order') ]]</para> - <para style="terp_default_9">[[ setLang(order.partner_id.lang) ]]</para> - <blockTable colWidths="246.0,58.0,217.0" style="Table_Address_Que"> - <tr> - <td> - <para style="terp_default_address"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - </td> - <td> - <para style="terp_default_9">[[ order.partner_id.title ]][[ order.partner_id.name ]]</para> - <para style="terp_default_9">[[ order.partner_address_id.title ]][[ order.partner_address_id.name ]]</para> - <para style="terp_default_9">[[ order.partner_address_id.street ]][[ order.partner_address_id.street2 ]]</para> - <para style="terp_default_9">[[ order.partner_address_id.zip ]][[ order.partner_address_id.city ]]</para> - <para style="terp_default_9">[[ order.partner_address_id.state_id.code ]][[ order.partner_address_id.country_id.code ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">Tel. : [[ order.partner_address_id.phone ]]</para> - <para style="terp_default_9">Fax : [[ order.partner_address_id.fax ]]</para> - <para style="terp_default_9">TVA : [[ order.partner_id.vat ]]</para> - </td> - </tr> - </blockTable> - <para style="terp_header">Request for Quotation [[ order.name ]]</para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <para style="terp_default_9">Other reference :[[ order.ref ]]</para> - <para style="terp_default_9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">Please find hereby a request for quotation.</para> - <para style="terp_default_8"> - <font color="white"> </font> - </para> - <blockTable colWidths="366.0,71.0,84.0" repeatRows="1" style="Table_Product_Header"> - <tr> - <td> - <para style="terp_tblheader_Details">Product</para> - </td> - <td> - <para style="terp_tblheader_Details">Date</para> - </td> - <td> - <para style="terp_tblheader_Details_Right">Qty</para> - </td> - </tr> - </blockTable> - <section> - <para style="terp_default_8">[[ repeatIn(order.order_line,'order_line') ]]</para> - <blockTable colWidths="366.0,71.0,60.0,24.0" style="Table_Order_Line"> - <tr> - <td> - <para style="terp_default_9">[[ order_line.product_id.default_code ]] - [[ order_line.name ]]</para> - </td> - <td> - <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ order_line.product_qty ]]</para> - </td> - <td> - <para style="terp_default_Right_9">[[ order_line.product_uom.name ]]</para> - </td> - </tr> - </blockTable> - </section> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">[[ order.notes ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">Thanks,</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> - <para style="terp_default_9">[[ user.signature ]]</para> - </story> -</document> From 2d2781cc0eab28072fbc7d1307a9099014193068 Mon Sep 17 00:00:00 2001 From: apa <> Date: Wed, 3 Sep 2008 16:30:54 +0530 Subject: [PATCH 42/48] Commited: Picking.sxw Picking.rml Formate using OOPlugins... bzr revid: apa-20080903110054-hbvqi9wifn5kqyll --- addons/stock/report/picking.rml | 50 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index a8359361ed1..6bac47b4956 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -169,51 +169,49 @@ <para style="Standard"> <font color="white"> </font> </para> - <blockTable colWidths="118.0,59.0,49.0,66.0,236.0" repeatRows="1" style="Move_Line_Header"> + <blockTable colWidths="43.0,296.0,53.0,59.0,77.0" repeatRows="1" style="Move_Line_Header"> <tr> <td> <para style="terp_tblheader_Details">Product</para> </td> - <td> - <para style="terp_tblheader_Details">Tracking</para> - </td> - <td> - <para style="terp_tblheader_Details">Qty</para> - </td> - <td> - <para style="terp_tblheader_Details">Location</para> - </td> <td> <para style="terp_tblheader_Details">Description</para> </td> + <td> + <para style="terp_tblheader_Details_Centre">Tracking</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Qty</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Location</para> + </td> </tr> </blockTable> <section> - <para style="Text body"> + <para style="terp_default_8"> <font face="Times-Roman">[[ repeatIn(picking.move_lines,'move_lines') ]]</font> </para> - <blockTable colWidths="118.0,59.0,20.0,29.0,65.0,235.0" style="Move_Line_Contect"> + <blockTable colWidths="43.0,296.0,54.0,38.0,22.0,75.0" style="Move_Line_Contect"> <tr> <td> <para style="terp_default_9">[[ move_lines.product_id.default_code ]]</para> </td> - <td> - <para style="terp_default_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']]</para> - </td> - <td> - <para style="terp_default_9">[[ move_lines.product_qty ]]</para> - </td> - <td> - <para style="terp_default_9"> - <font face="Helvetica">[[ move_lines.product_uom.name ]]</font> - </para> - </td> - <td> - <para style="terp_default_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> - </td> <td> <para style="terp_default_9">[[ move_lines.product_id.name ]]</para> </td> + <td> + <para style="terp_default_Centre_9">[[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ move_lines.product_qty ]]</para> + </td> + <td> + <para style="terp_default_Right_9">[[ move_lines.product_uom.name ]]</para> + </td> + <td> + <para style="terp_default_Centre_9">[[ (move_lines.location_id and move_lines.location_id.name) or '' ]]</para> + </td> </tr> </blockTable> <para style="terp_default_1"> From 1e509df9e5f98d057737d5337a356b85dd3871be Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 11:24:34 +0530 Subject: [PATCH 43/48] Commited : Purchase Order Report order.sxw order.rml Formated Using OOPlugins... bzr revid: apa-20080904055434-7c2ssjxnjroujd2k --- addons/purchase/report/order.rml | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 2ad8e757e3a..1821228a869 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -57,6 +57,7 @@ <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/> </blockTableStyle> <blockTableStyle id="Table_Order_Pur_line_Content"> <blockAlignment value="LEFT"/> @@ -82,11 +83,8 @@ <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="1,2" stop="1,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="2,2" stop="2,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEABOVE" colorName="#000000" start="3,2" stop="3,2"/> - <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> </blockTableStyle> <blockTableStyle id="Table_Outer_Notes"> <blockAlignment value="LEFT"/> @@ -95,6 +93,8 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> + <paraStyle name="P1" rightIndent="0.0" leftIndent="13.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P2" rightIndent="0.0" leftIndent="17.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -124,6 +124,7 @@ <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="terp_default_Bold_9_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> </stylesheet> <images/> <story> @@ -162,9 +163,6 @@ </tr> </blockTable> <para style="terp_header">Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> <blockTable colWidths="136.0,132.0,133.0,133.0" style="Header_Order_Reference_Tbl"> <tr> <td> @@ -200,16 +198,19 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="220.0,51.0,54.0,68.0,68.0,72.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> + <blockTable colWidths="39.0,219.0,54.0,56.0,46.0,56.0,64.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> <tr> <td> - <para style="terp_tblheader_Details">Product Description</para> + <para style="terp_tblheader_Details">Product</para> </td> <td> - <para style="terp_tblheader_Details">Applicable Taxes</para> + <para style="terp_tblheader_Details">Description</para> </td> <td> - <para style="terp_tblheader_Details">Date Requested</para> + <para style="terp_tblheader_Details">Taxes</para> + </td> + <td> + <para style="terp_tblheader_Details">Date Req.</para> </td> <td> <para style="terp_tblheader_Details_Centre">Qty</para> @@ -224,7 +225,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para> - <blockTable colWidths="31.0,189.0,51.0,54.0,46.0,23.0,68.0,72.0" style="Table_Order_Pur_line_Content"> + <blockTable colWidths="40.0,219.0,54.0,56.0,26.0,20.0,56.0,64.0" style="Table_Order_Pur_line_Content"> <tr> <td> <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para> @@ -263,7 +264,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="346.0,77.0,70.0,41.0" style="Table_All_Total_Detail"> + <blockTable colWidths="415.0,57.0,42.0,20.0" style="Table_All_Total_Detail"> <tr> <td> <para style="terp_default_9"> @@ -271,7 +272,7 @@ </para> </td> <td> - <para style="terp_default_Bold_9">Net Total :</para> + <para style="terp_default_Bold_9">Net Total :</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]]</para> @@ -287,7 +288,7 @@ </para> </td> <td> - <para style="terp_default_Bold_9">Taxes :</para> + <para style="P1">Taxes :</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % o.amount_tax ]]</para> @@ -303,7 +304,7 @@ </para> </td> <td> - <para style="terp_default_Bold_9">TOTAL :</para> + <para style="P2">Total :</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % o.amount_total ]]</para> From 33adc752417c0de0afcb9198ec6e82bb815eac32 Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 11:25:45 +0530 Subject: [PATCH 44/48] Commited : Delivery Order Report shipping.sxw shipping.rml Formated Using OOPlugins... bzr revid: apa-20080904055545-qug707jl47vphy60 --- addons/sale/report/shipping.rml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 6efa39116b0..d169e3685ab 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -67,6 +67,7 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> + <paraStyle name="P1" rightIndent="0.0" leftIndent="-5.0" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Footer" fontName="Times-Roman"/> @@ -77,7 +78,7 @@ <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Caption" fontName="Helvetica-Oblique" fontSize="9.0" leading="11" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="Index" fontName="Helvetica"/> - <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/> @@ -90,7 +91,7 @@ <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/> - <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> + <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/> <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="terp_default_Bold_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> @@ -100,11 +101,10 @@ <images/> <story> <para style="terp_default_9">[[ repeatIn(objects,'o') ]]</para> - <para style="terp_header_Centre">Delivery order [[ o.sale_id.name ]]</para> - <para style="terp_default_9"> + <para style="terp_default_8"> <font color="white"> </font> </para> - <para style="terp_default_9">[[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]]</para> + <para style="terp_default_9">[[ not(o.sale_id) and 'Error, no sale order attached to this picking !' or '' ]]</para> <blockTable colWidths="287.0,254.0" repeatRows="1" style="address_table"> <tr> <td> @@ -128,6 +128,10 @@ <para style="terp_default_9"> <font color="white"> </font> </para> + <para style="P1">Delivery order [[ o.sale_id.name ]]</para> + <para style="terp_default_9"> + <font color="white"> </font> + </para> <blockTable colWidths="155.0,127.0,127.0,127.0" style="Order_ref_header"> <tr> <td> From d2f0a61d0fb0b751b636f344a260e20918b7ec60 Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 11:54:11 +0530 Subject: [PATCH 45/48] Commited : Req. for Quotation Report request_quotation.rml request_quotation.sxw Formated Using OOPlugins... bzr revid: apa-20080904062411-1antiqlqjh1moy89 --- addons/purchase/report/request_quotation.rml | 24 +++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index 5537b4d3464..3330f7675d5 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -20,6 +20,7 @@ <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/> + <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/> </blockTableStyle> <blockTableStyle id="Table_Product_Line"> <blockAlignment value="LEFT"/> @@ -28,6 +29,7 @@ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/> <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/> + <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/> </blockTableStyle> <blockTableStyle id="Table_Product_line_notes"> <blockAlignment value="LEFT"/> @@ -112,38 +114,44 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="372.0,73.0,85.0" repeatRows="1" style="Table_Product_Header_Title"> + <blockTable colWidths="44.0,381.0,60.0,45.0" repeatRows="1" style="Table_Product_Header_Title"> <tr> <td> <para style="terp_tblheader_Details">Product</para> </td> <td> - <para style="terp_tblheader_Details">Date</para> + <para style="terp_tblheader_Details">Description</para> </td> <td> - <para style="terp_tblheader_Details_Right">Qty</para> + <para style="terp_tblheader_Details_Centre">Date</para> + </td> + <td> + <para style="terp_tblheader_Details_Centre">Qty</para> </td> </tr> </blockTable> <section> <para style="terp_default_9">[[ repeatIn(order.order_line,'order_line') ]]</para> - <blockTable colWidths="372.0,73.0,64.0,21.0" style="Table_Product_Line"> + <blockTable colWidths="44.0,380.0,61.0,33.0,11.0" style="Table_Product_Line"> <tr> <td> - <para style="terp_default_9">[[ (order_line.product_id and order_line.product_id.default_code) or '']] - [[ order_line.name ]]</para> + <para style="terp_default_9">[[ (order_line.product_id and order_line.product_id.default_code) or '']]</para> + </td> + <td> + <para style="terp_default_9">[[ order_line.name ]]</para> </td> <td> <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ order_line.product_qty or '' ]]</para> + <para style="terp_default_Centre_9">[[ order_line.product_qty or '' ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para> + <para style="terp_default_Centre_9">[[ (order_line.product_uom and order_line.product_uom.name) or '' ]]</para> </td> </tr> </blockTable> - <blockTable colWidths="52.0,478.0" style="Table_Product_line_notes"> + <blockTable colWidths="52.0,476.0" style="Table_Product_line_notes"> <tr> <td> <para style="terp_default_9">[[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]] </para> From f261ad55045396f6b8a0a24313330951c8104c22 Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 12:00:16 +0530 Subject: [PATCH 46/48] Commited : Req. for Quotation Report Small changes... bzr revid: apa-20080904063016-6ebrzo8h3bzft5tt --- addons/purchase/report/request_quotation.rml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index 3330f7675d5..3169510cb77 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -102,9 +102,6 @@ </tr> </blockTable> <para style="terp_header">Request for Quotation [[ order.name ]]</para> - <para style="terp_default_9"> - <font color="white"> </font> - </para> <para style="terp_default_9">Other reference :[[ order.ref or '' ]]</para> <para style="terp_default_9">Printed: [[ time.strftime('%d/%m/%Y') ]]</para> <para style="terp_default_9"> From f1c4cd8ad4be5fc849f353413ac62c8b2c618bec Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 12:44:42 +0530 Subject: [PATCH 47/48] Commited : Sale Order Report order.sxw order.rml Formated Using OOPlugins... bzr revid: apa-20080904071442-g2o6e7yy9v5guu2f --- addons/sale/report/order.rml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index f32d3655da1..da3faec720f 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -108,6 +108,9 @@ <paraStyle name="P1" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P2" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="P3" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P4" rightIndent="0.0" leftIndent="14.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P5" rightIndent="0.0" leftIndent="11.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P6" rightIndent="0.0" leftIndent="-2.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="8.0" leading="10" spaceBefore="12.0" spaceAfter="6.0"/> @@ -292,7 +295,7 @@ </tr> </blockTable> </section> - <blockTable colWidths="370.0,60.0,85.0,22.0" style="Total_Table"> + <blockTable colWidths="384.0,67.0,64.0,22.0" style="Total_Table"> <tr> <td> <para style="terp_default_9"> @@ -300,7 +303,7 @@ </para> </td> <td> - <para style="terp_default_Right_9">Net Total :</para> + <para style="P6">Net Total :</para> </td> <td> <para style="terp_default_Right_9">[[ o.amount_untaxed ]]</para> @@ -316,7 +319,7 @@ </para> </td> <td> - <para style="terp_default_Right_9">Taxes :</para> + <para style="P5">Taxes :</para> </td> <td> <para style="terp_default_Right_9">[[ o.amount_tax ]]</para> @@ -332,7 +335,7 @@ </para> </td> <td> - <para style="terp_default_Right_9_Bold">Total :</para> + <para style="P4">Total :</para> </td> <td> <para style="terp_default_Right_9_Bold">[[ o.amount_total ]]</para> From ca567794798e3d7a80410e3a2635daf3b7d5f335 Mon Sep 17 00:00:00 2001 From: apa <> Date: Thu, 4 Sep 2008 12:59:50 +0530 Subject: [PATCH 48/48] Commited : Small Changes in purchase order bzr revid: apa-20080904072950-7i88geiwh2cg2lsv --- addons/purchase/report/order.rml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 1821228a869..e80819cecd4 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -93,8 +93,8 @@ <initialize> <paraStyle name="all" alignment="justify"/> </initialize> - <paraStyle name="P1" rightIndent="0.0" leftIndent="13.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> - <paraStyle name="P2" rightIndent="0.0" leftIndent="17.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P1" rightIndent="0.0" leftIndent="12.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> + <paraStyle name="P2" rightIndent="0.0" leftIndent="15.0" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/> <paraStyle name="Standard" fontName="Times-Roman"/> <paraStyle name="Text body" fontName="Times-Roman" spaceBefore="0.0" spaceAfter="6.0"/> <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/> @@ -198,7 +198,7 @@ <para style="terp_default_9"> <font color="white"> </font> </para> - <blockTable colWidths="39.0,219.0,54.0,56.0,46.0,56.0,64.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> + <blockTable colWidths="39.0,215.0,52.0,57.0,44.0,58.0,70.0" repeatRows="1" style="Table_Header_Pur_ord_Line"> <tr> <td> <para style="terp_tblheader_Details">Product</para> @@ -210,7 +210,7 @@ <para style="terp_tblheader_Details">Taxes</para> </td> <td> - <para style="terp_tblheader_Details">Date Req.</para> + <para style="terp_tblheader_Details_Centre">Date Req.</para> </td> <td> <para style="terp_tblheader_Details_Centre">Qty</para> @@ -225,7 +225,7 @@ </blockTable> <section> <para style="terp_default_8">[[ repeatIn(o.order_line,'line') ]]</para> - <blockTable colWidths="40.0,219.0,54.0,56.0,26.0,20.0,56.0,64.0" style="Table_Order_Pur_line_Content"> + <blockTable colWidths="40.0,215.0,52.0,57.0,24.0,20.0,57.0,70.0" style="Table_Order_Pur_line_Content"> <tr> <td> <para style="terp_default_9">[[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]]</para> @@ -237,7 +237,7 @@ <para style="terp_default_9">[[ ', '.join(map(lambda x: x.name, line.taxes_id)) ]]</para> </td> <td> - <para style="terp_default_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para> + <para style="terp_default_Centre_9">[[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]]</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % line.product_qty ]]</para> @@ -272,7 +272,7 @@ </para> </td> <td> - <para style="terp_default_Bold_9">Net Total :</para> + <para style="terp_default_9">Net Total :</para> </td> <td> <para style="terp_default_Right_9">[[ '%.2f' % o.amount_untaxed ]]</para> @@ -307,10 +307,10 @@ <para style="P2">Total :</para> </td> <td> - <para style="terp_default_Right_9">[[ '%.2f' % o.amount_total ]]</para> + <para style="terp_default_Bold_9_Right">[[ '%.2f' % o.amount_total ]]</para> </td> <td> - <para style="terp_default_Right_9">[[ o.pricelist_id.currency_id.name ]]</para> + <para style="terp_default_Bold_9_Right">[[ o.pricelist_id.currency_id.name ]]</para> </td> </tr> </blockTable>