From cbcdb380a2f7d8ff60cf81e5a07cc0a14107413f Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 9 Sep 2008 18:20:54 +0530 Subject: [PATCH 1/2] table color change in the Delivery Order bzr revid: patelamit2003@gmail.com-20080909125054-g2qsde0mmfespdu3 --- addons/purchase/report/order.rml | 8 ++--- addons/sale/report/order.rml | 4 +-- addons/sale/report/shipping.rml | 52 ++++++++++++++++---------------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml index 8f685c534fa..689a9413e6f 100644 --- a/addons/purchase/report/order.rml +++ b/addons/purchase/report/order.rml @@ -160,13 +160,13 @@ - 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 ]] diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 28a83a848e0..2283465f634 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -175,8 +175,8 @@ - [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] - [[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] + [[ o.state<>'draft' and removeParentNode('para') ]] Quotation N° : [[ o.name ]] + [[ o.state=='draft' and removeParentNode('para') ]] Order N° : [[ o.name ]] diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index dc9d04efec5..1eb49c91d61 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -17,36 +17,36 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + From 6e8f48fdbf81d9603be49dfca9558d1390459ed1 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Tue, 9 Sep 2008 18:44:19 +0530 Subject: [PATCH 2/2] qty columns prob solved..... bzr revid: patelamit2003@gmail.com-20080909131419-lbsq7jbt96ylp0v1 --- addons/purchase/report/request_quotation.rml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/report/request_quotation.rml b/addons/purchase/report/request_quotation.rml index e0c943c8abb..6b39f7084b3 100644 --- a/addons/purchase/report/request_quotation.rml +++ b/addons/purchase/report/request_quotation.rml @@ -117,7 +117,7 @@ - + Description @@ -132,7 +132,7 @@
[[ repeatIn(order.order_line,'order_line') ]] - + [[ order_line.name ]] @@ -141,10 +141,10 @@ [[ time.strftime('%d/%m/%Y', time.strptime( order_line.date_planned, '%Y-%m-%d')) ]] - [[ order_line.product_qty or '' ]] + [[ order_line.product_qty or '' ]] - [[ (order_line.product_uom and order_line.product_uom.name) or '' ]] + [[ (order_line.product_uom and order_line.product_uom.name) or '' ]]