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
1=== modified file 'purchase/report/order.rml'
2--- purchase/report/order.rml 2012-05-24 12:51:39 +0000
3+++ purchase/report/order.rml 2013-01-25 13:04:46 +0000
4@@ -186,9 +186,9 @@
5 <para style="terp_default_9">
6 <font color="white"> </font>
7 </para>
8- <para style="terp_default_9">Tél. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
9+ <para style="terp_default_9">Tel. : [[ (o.partner_address_id and o.partner_address_id.phone) or removeParentNode('para') ]]</para>
10 <para style="terp_default_9">Fax : [[ (o.partner_address_id and o.partner_address_id.fax) or removeParentNode('para') ]]</para>
11- <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
12+ <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
13 </td>
14 </tr>
15 </blockTable>
16
17=== modified file 'purchase/report/order.sxw'
18Binary 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
19=== modified file 'purchase/report/request_quotation.rml'
20--- purchase/report/request_quotation.rml 2011-12-22 15:17:58 +0000
21+++ purchase/report/request_quotation.rml 2013-01-25 13:04:46 +0000
22@@ -107,7 +107,7 @@
23 </para>
24 <para style="terp_default_9">Tel.: [[ (order.partner_address_id and order.partner_address_id.phone) or removeParentNode('para') ]]</para>
25 <para style="terp_default_9">Fax: [[ (order.partner_address_id and order.partner_address_id.fax) or removeParentNode('para') ]]</para>
26- <para style="terp_default_9">TVA: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
27+ <para style="terp_default_9">VAT: [[ (order.partner_id and order.partner_id.vat) or removeParentNode('para') ]]</para>
28 </td>
29 </tr>
30 </blockTable>
31
32=== modified file 'purchase/report/request_quotation.sxw'
33Binary 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
34=== modified file 'sale/report/sale_order.rml'
35--- sale/report/sale_order.rml 2012-12-17 09:49:00 +0000
36+++ sale/report/sale_order.rml 2013-01-25 13:04:46 +0000
37@@ -182,7 +182,7 @@
38 </para>
39 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
40 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
41- <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
42+ <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
43 <para style="terp_default_9">
44 <font color="white"> </font>
45 </para>
46
47=== modified file 'sale/report/sale_order.sxw'
48Binary 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
49=== modified file 'sale_layout/report/report_sale_layout.rml'
50--- sale_layout/report/report_sale_layout.rml 2012-03-15 18:11:12 +0000
51+++ sale_layout/report/report_sale_layout.rml 2013-01-25 13:04:46 +0000
52@@ -161,7 +161,7 @@
53 </para>
54 <para style="terp_default_9">Tel. : [[ (o.partner_order_id and o.partner_order_id.phone) or removeParentNode('para') ]]</para>
55 <para style="terp_default_9">Fax : [[ (o.partner_order_id and o.partner_order_id.fax) or removeParentNode('para') ]]</para>
56- <para style="terp_default_9">TVA : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
57+ <para style="terp_default_9">VAT : [[ (o.partner_id and o.partner_id.vat) or removeParentNode('para') ]]</para>
58 <para style="terp_default_9">
59 <font color="white"> </font>
60 </para>
61
62=== modified file 'sale_layout/report/report_sale_layout.sxw'
63Binary 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