Odoo Addons (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-addons/6.1-opw-584767-ado into lp:openobject-addons/6.1

  1. 6.1-opw-584767-ado
  2. Merge into 6.1
Proposed by Amit Dodiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-584767-ado
Merge into: lp:openobject-addons/6.1
Diff against target: 63 lines (+5/-5)
4 files modified
purchase/report/order.rml (+2/-2)
purchase/report/request_quotation.rml (+1/-1)
sale/report/sale_order.rml (+1/-1)
sale_layout/report/report_sale_layout.rml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-584767-ado
Reviewer Review Type Date Requested Status
Xavier ALT Pending
Naresh(OpenERP) Pending
Review via email: mp+144926@code.launchpad.net

Description of the change

Hello,

"[FIX] label correction in reports for partner address"

Issue:
In some reports following labels are wrong:
1. Tél: should just be Tel:
2. TVA should be VAT

Regards,
Amit Dodiya

To post a comment you must log in.

Unmerged revisions

7134. By Amit Dodiya (OpenERP)

[FIX] label correction in reports for partner address

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'purchase/report/order.rml'
--- purchase/report/order.rml 2012-05-24 12:51:39 +0000
+++ purchase/report/order.rml 2013-01-25 13:04:46 +0000
@@ -186,9 +186,9 @@
186 <para style="terp_default_9">186 <para style="terp_default_9">
187 <font color="white"> </font>187 <font color="white"> </font>
188 </para>188 </para>
189 <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>189 <para style="terp_default_9">Tel. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
190 <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>190 <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
191 <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>191 <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
192 </td>192 </td>
193 </tr>193 </tr>
194 </blockTable>194 </blockTable>
195195
=== modified file 'purchase/report/order.sxw'
196Binary files purchase/report/order.sxw 2011-11-03 11:53:04 +0000 and purchase/report/order.sxw 2013-01-25 13:04:46 +0000 differ196Binary files purchase/report/order.sxw 2011-11-03 11:53:04 +0000 and purchase/report/order.sxw 2013-01-25 13:04:46 +0000 differ
=== modified file 'purchase/report/request_quotation.rml'
--- purchase/report/request_quotation.rml 2011-12-22 15:17:58 +0000
+++ purchase/report/request_quotation.rml 2013-01-25 13:04:46 +0000
@@ -107,7 +107,7 @@
107 </para>107 </para>
108 <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>108 <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
109 <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>109 <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
110 <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>110 <para style="terp_default_9">VAT: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
111 </td>111 </td>
112 </tr>112 </tr>
113 </blockTable>113 </blockTable>
114114
=== modified file 'purchase/report/request_quotation.sxw'
115Binary files purchase/report/request_quotation.sxw 2011-01-14 00:11:01 +0000 and purchase/report/request_quotation.sxw 2013-01-25 13:04:46 +0000 differ115Binary files purchase/report/request_quotation.sxw 2011-01-14 00:11:01 +0000 and purchase/report/request_quotation.sxw 2013-01-25 13:04:46 +0000 differ
=== modified file 'sale/report/sale_order.rml'
--- sale/report/sale_order.rml 2012-12-17 09:49:00 +0000
+++ sale/report/sale_order.rml 2013-01-25 13:04:46 +0000
@@ -182,7 +182,7 @@
182 </para>182 </para>
183 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>183 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
184 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>184 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
185 <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>185 <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
186 <para style="terp_default_9">186 <para style="terp_default_9">
187 <font color="white"> </font>187 <font color="white"> </font>
188 </para>188 </para>
189189
=== modified file 'sale/report/sale_order.sxw'
190Binary files sale/report/sale_order.sxw 2012-12-17 09:49:00 +0000 and sale/report/sale_order.sxw 2013-01-25 13:04:46 +0000 differ190Binary files sale/report/sale_order.sxw 2012-12-17 09:49:00 +0000 and sale/report/sale_order.sxw 2013-01-25 13:04:46 +0000 differ
=== modified file 'sale_layout/report/report_sale_layout.rml'
--- sale_layout/report/report_sale_layout.rml 2012-03-15 18:11:12 +0000
+++ sale_layout/report/report_sale_layout.rml 2013-01-25 13:04:46 +0000
@@ -161,7 +161,7 @@
161 </para>161 </para>
162 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>162 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
163 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>163 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
164 <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>164 <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
165 <para style="terp_default_9">165 <para style="terp_default_9">
166 <font color="white"> </font>166 <font color="white"> </font>
167 </para>167 </para>
168168
=== modified file 'sale_layout/report/report_sale_layout.sxw'
169Binary files sale_layout/report/report_sale_layout.sxw 2011-05-10 09:14:36 +0000 and sale_layout/report/report_sale_layout.sxw 2013-01-25 13:04:46 +0000 differ169Binary files sale_layout/report/report_sale_layout.sxw 2011-05-10 09:14:36 +0000 and sale_layout/report/report_sale_layout.sxw 2013-01-25 13:04:46 +0000 differ