From 2439e06ed6648b9c89955521bc7829b45e3b0361 Mon Sep 17 00:00:00 2001 From: Vinay Rana Date: Tue, 9 Sep 2008 12:54:01 +0530 Subject: [PATCH 1/2] Changing invoice report sxw and rml format in to new format bzr revid: vinusoft85@gmail.com-20080909072401-hm7c3oo8m469oeog --- addons/account/report/invoice.rml | 87 +++++++++++++++++++------------ 1 file changed, 54 insertions(+), 33 deletions(-) diff --git a/addons/account/report/invoice.rml b/addons/account/report/invoice.rml index f7de4757242..1962a14a20b 100644 --- a/addons/account/report/invoice.rml +++ b/addons/account/report/invoice.rml @@ -63,14 +63,6 @@ - - - - - - - - @@ -138,6 +130,8 @@ + + @@ -148,17 +142,29 @@ + + + + + + + + + + + + @@ -178,20 +184,29 @@ + + + + + - + - + + + + + @@ -209,29 +224,30 @@ - + - + - - + + - - - - - - - - + + + + + + + + + @@ -353,41 +369,41 @@ - [[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]] - [[ note or removeParentNode('para') ]] + [[ repeatIn((l.note and l.note.splitlines()) or [], 'note') ]] + [[ note or removeParentNode('para') ]] - + - + - + - + - + - + - + @@ -523,10 +539,15 @@ - + - + + + + + + From 9720c6d7c2027e0e8f7efbb6790101111f59915e Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 9 Sep 2008 13:07:55 +0530 Subject: [PATCH 2/2] All Reports sxw and rml commited..... bzr revid: patelamit2003@gmail.com-20080909073755-3v9o0kbkc6j3dc3v --- addons/purchase/report/order.rml | 147 +++++++++++-------- addons/purchase/report/request_quotation.rml | 37 +++-- addons/sale/report/order.rml | 54 ++++--- addons/sale/report/shipping.rml | 8 +- addons/stock/report/picking.rml | 67 +++++---- 5 files changed, 180 insertions(+), 133 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 38306cb3fbf..a3db53e9ffe 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -51,14 +51,15 @@ - - - - - - + + + + + + + - + @@ -68,10 +69,15 @@ - - - - + + + + + + + + + @@ -91,12 +97,8 @@ - - - - - - + + @@ -127,6 +129,7 @@ + @@ -139,38 +142,32 @@ [[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]] Shipping address : - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ addr.title or '' ]] [[ addr.name ]] - [[ addr.street or '']] + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ addr.title or '' ]][[ addr.name ]] + [[ addr.street ]] [[ addr.street2 or '' ]] - [[ addr.zip or '' ]] [[ addr.city or '' ]] - [[ addr.state_id and addr.state_id.name or '' ]] + [[ addr.zip or '' ]][[ addr.city or '' ]] + [[ addr.state_id and addr.state_id.name or '' ]] [[ addr.country_id and addr.country_id.name or '' ]] - [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]] - [[ o.partner_address_id.title or '' ]] [[ o.partner_address_id.name ]] + [[ o.partner_id.title or '' ]][[ o.partner_id.name ]] + [[ o.partner_address_id.title or '' ]][[ o.partner_address_id.name ]] [[ o.partner_address_id.street ]] [[ o.partner_address_id.street2 or '' ]] - [[ o.partner_address_id.zip or '' ]] [[ o.partner_address_id.city or '' ]] - [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]] - [[ o.partner_address_id and o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]] - - - - Tél. : [[ o.partner_address_id and o.partner_address_id.phone or '' ]] - Fax : [[ o.partner_address_id and o.partner_address_id.fax or '' ]] - TVA :[[ o.partner_id and o.partner_address_id.vat or '' ]] + [[ o.partner_address_id.zip or '' ]][[ o.partner_address_id.city or '' ]] + [[ o.partner_address_id.state_id and o.partner_address_id.state_id.name or '' ]] + [[ o.partner_address_id.country_id and o.partner_address_id.country_id.name or '' ]] + Tél. : [[ o.partner_address_id.phone or '' ]] + Fax : [[ o.partner_address_id.fax or '' ]] + TVA :[[ o.partner_id.vat or '' ]] - Request for quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state&lt;&gt;'draft' or removeParentNode('font')) and '' ]] N° [[ o.name ]] - - - + Request for Quotation [[ (o.state=='draft' or removeParentNode('font')) and '' ]] Order [[ (o.state<>'draft' or removeParentNode('font')) and '' ]] N° :[[ o.name ]] @@ -193,21 +190,24 @@ [[ o.ref or '' ]] - [[ o.partner_ref or '' ]] + [[ o.partner_ref or '' ]] [[ time.strftime('%d/%m/%Y', time.strptime(o.date_order, '%Y-%m-%d')) ]] - [[ o.validator and o.validator.name or '' ]] + [[ o.validator and o.validator.name or '' ]] - + + + Product + Description @@ -230,8 +230,11 @@
[[ repeatIn(o.order_line,'line') ]] - + + + [[ line.product_id and get_product_code(line.product_id.id, o.partner_id.id) or '' ]] + [[ line.name ]] @@ -242,31 +245,59 @@ [[ time.strftime('%d/%m/%Y', time.strptime( line.date_planned, '%Y-%m-%d')) ]] - [[line.product_qty ]] + [[ '%.2f' % line.product_qty ]] - [[ line.product_uom.name ]] + [[ line.product_uom.name ]] - [[line.price_unit ]] + [[ '%.2f' % line.price_unit ]] - [[line.price_subtotal ]] + [[ '%.2f' % line.price_subtotal ]] - - - [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] + [[ repeatIn((line.notes and line.notes.splitlines()) or [], 'l') ]] - [[ l or removeParentNode('table') ]] + [[ l or removeParentNode('table') ]] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- + @@ -274,13 +305,13 @@ - Net Total: + Net Total : - [[o.amount_untaxed or 0]] + [[ '%.2f' % o.amount_untaxed ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -290,13 +321,13 @@ - Taxes: + Taxes : - [[o.amount_tax or 0 ]] + [[ '%.2f' % o.amount_tax ]] - [[ o.pricelist_id.currency_id.name ]] + [[ o.pricelist_id.currency_id.name ]] @@ -306,10 +337,10 @@ - Total: + Total : - [[ o.amount_total ]] + [[ '%.2f' % o.amount_total ]] [[ o.pricelist_id.currency_id.name ]] diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index b22a6b65af2..02304a589cf 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -2,7 +2,7 @@ @@ -28,12 +28,10 @@ - - - - + + @@ -67,6 +65,8 @@ + + @@ -113,7 +113,7 @@ - + Description @@ -128,7 +128,7 @@
[[ repeatIn(order.order_line,'order_line') ]] - + [[ order_line.name ]] @@ -143,19 +143,32 @@ [[ (order_line.product_uom and order_line.product_uom.name) or '' ]] - - - [[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]] + [[ repeatIn((order_line.notes and order_line.notes.splitlines()) or [], 'l') ]] + [[ l or removeParentNode('table') ]] - [[ l or removeParentNode('table') ]] + + + + + + + + + + + + +
- + + + [[ order.notes or '' ]] diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 28422047abc..9744bd69e91 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -69,20 +69,6 @@ - - - - - - - - - - - - - - @@ -111,6 +97,7 @@ + @@ -142,6 +129,7 @@ + @@ -187,8 +175,8 @@ - [[ o.state<>'draft' and removeParentNode('para') ]] Quotation 1 : [[ o.name ]] - [[ o.state=='draft' and removeParentNode('para') ]] Order 1 : [[ o.name ]] + [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] + [[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] @@ -275,20 +263,38 @@ [[ 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') ]] - - - + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index ab4cb0b585f..dc9d04efec5 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -69,8 +69,6 @@ - - @@ -183,7 +181,7 @@ Designation - Quantity + Quantity S.U. @@ -192,7 +190,7 @@
[[ repeatIn(o.move_lines, 'line') ]] - + [[line.product_id.code ]] @@ -201,7 +199,7 @@ [[ line.product_id and line.product_id.name or '']] - [[ line.product_qty ]] + [[ line.product_qty ]] [[ line.product_uom and line.product_uom.name ]] diff --git a/addons/stock/report/picking.rml b/addons/stock/report/picking.rml index d4b4e63129a..ad11683150a 100644 --- a/addons/stock/report/picking.rml +++ b/addons/stock/report/picking.rml @@ -10,11 +10,11 @@ - + - + @@ -24,14 +24,11 @@ + - - - - - + @@ -41,12 +38,9 @@ + - - - - @@ -105,11 +99,11 @@ [[ repeatIn(objects,'picking') ]] - + Packing List - + @@ -118,59 +112,64 @@ Shipping Address: - [[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.title) or '' ]] [[ picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.name ]] - [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] - [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.street) or '' ]] - [[ (picking.sale_id and picking.sale_id_id.partner_shipping_id and picking.sale_id.partner_shipping_id.zip) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.city) or '' ]] [[ (picking.address_id and picking.address_id.state_id and picking.address_id.state_id.name) or '' ]] - [[ (picking.address_id and picking.address_id.country_id and picking.address_id.country_id.name) or '' ]] + [[ (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 '' ]] - Packing List + + + + 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. - - Recipient - - - Concerns - Packing Date + + Shipping Date + - + - [[ (picking.address_id and picking.address_id.partner_id and picking.address_id.partner_id.id) or '' ]] + [[ (picking.address_id.partner_id.id) or '' ]] - [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.title) or '' ]] [[ (picking.sale_id and picking.sale_id.partner_shipping_id and picking.sale_id.partner_shipping_id.name) or '' ]] + [[ picking.date ]] - [[ picking.name ]] - - - [[ picking.date]] + + + + + + @@ -204,7 +203,7 @@ [[ (move_lines.tracking_id and move_lines.tracking_id.name) or '']] - [[ move_lines.product_qty ]] + [[ move_lines.product_qty ]] [[ move_lines.product_uom.name ]]