From 74a58c0f15a9163b0a8fdea3818071d6931a3326 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 18 Jul 2012 17:48:21 +0530
Subject: [PATCH 1/3] [IMP]vat to tax : I have changed the label as tax inplace
 of vat

bzr revid: rpr@tinyerp.com-20120718121821-esupnmy423ukxniz
---
 addons/account/account.py                     | 26 +++++++++----------
 addons/account/account_move_line.py           |  4 +--
 .../data/configurable_account_chart.xml       |  6 ++---
 addons/account/demo/account_minimal.xml       |  4 +--
 .../report/account_journal_sale_purchase.rml  |  6 ++---
 .../account/report/account_print_invoice.rml  |  2 +-
 .../account/report/account_print_overdue.rml  |  2 +-
 addons/account/wizard/account_vat_view.xml    |  4 +--
 .../account_coda/account_coda_comm_type.xml   |  2 +-
 .../account_coda_trans_category.xml           |  2 +-
 .../account_coda/account_coda_trans_code.xml  |  4 +--
 .../report/account_followup_print.rml         |  2 +-
 addons/l10n_th/account_data.xml               | 20 +++++++-------
 addons/l10n_us/account_tax_template.xml       |  2 +-
 addons/mrp_repair/report/order.rml            |  4 +--
 addons/point_of_sale/report/pos_lines.rml     |  2 +-
 addons/report_intrastat/report/invoice.rml    |  2 +-
 addons/sale/report/sale_order.rml             |  4 +--
 18 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index b6fd7232a25..78d0a192237 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1880,17 +1880,17 @@ class account_tax(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the VAT declaration
+        # Fields used for the TAX declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the VAT declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the VAT declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the TAX declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the TAX declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the VAT declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the TAX declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the TAX declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2217,7 +2217,7 @@ class account_tax(osv.osv):
     def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
-        Price Unit is a VAT included price
+        Price Unit is a TAX included price
 
         RETURN:
             [ tax ]
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any VAT related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2788,17 +2788,17 @@ class account_tax_template(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the VAT declaration
+        # Fields used for the TAX declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the VAT declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the VAT declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the TAX declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the TAX declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the VAT declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the VAT declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the TAX declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the TAX declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 57cc125bb5b..e9f3459ad2c 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -327,7 +327,7 @@ class account_move_line(osv.osv):
 
         if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
             data['account_id'] = account.id
-            # Propose the price VAT excluded, the VAT will be added when confirming line
+            # Propose the price TAX excluded, the TAX will be added when confirming line
             if account.tax_ids:
                 taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
                 tax = tax_obj.browse(cr, uid, taxes)
@@ -1347,7 +1347,7 @@ class account_move_line(osv.osv):
                     }
                     if data['tax_code_id']:
                         self.create(cr, uid, data, context)
-                #create the VAT movement
+                #create the TAX movement
                 data = {
                     'move_id': vals['move_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 756866a3a50..345202de899 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -385,8 +385,8 @@
             <field name="complete_tax_set" eval="False"/>
         </record>
 
-         <!-- VAT Codes -->
-        <!-- Purchases + Output VAT -->
+         <!-- TAX Codes -->
+        <!-- Purchases + Output TAX -->
 
         <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
@@ -444,7 +444,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input VAT -->
+        <!-- Sales + Input TAX -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index baa94450f02..3592c82d6f8 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -94,7 +94,7 @@
 
         <record id="ova" model="account.account">
             <field name="code">X11003</field>
-            <field name="name">Output VAT - (test)</field>
+            <field name="name">Output TAX - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_asset"/>
@@ -152,7 +152,7 @@
 
         <record id="iva" model="account.account">
             <field name="code">X1112</field>
-            <field name="name">Input VAT - (test)</field>
+            <field name="name">Input TAX - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_liability"/>
diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml
index 68f93b88294..69f26ce1ff8 100644
--- a/addons/account/report/account_journal_sale_purchase.rml
+++ b/addons/account/report/account_journal_sale_purchase.rml
@@ -219,7 +219,7 @@
             <td><para style="P10a">Account</para></td>
             <td><para style="P10a">Partner</para></td>
             <td><para style="P10a">Label</para></td>
-            <td><para style="P10a">VAT</para></td>
+            <td><para style="P10a">TAX</para></td>
             <td><para style="P11"></para></td>
             <td><para style="P10b">Debit</para></td>
             <td><para style="P10b">Credit</para></td>
@@ -271,7 +271,7 @@
         <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Label</para></td>
-        <td><para style="P10a">VAT</para></td>
+        <td><para style="P10a">TAX</para></td>
         <td><para style="P11"></para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
@@ -330,7 +330,7 @@
         <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1">
           <tr>
             <td><para style="P12"></para></td>
-            <td><para style="P12">VAT Declaration</para></td>
+            <td><para style="P12">TAX Declaration</para></td>
             <td><para style="P12"></para></td>
             <td><para style="P12"></para></td>
           </tr>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 4ffa7a33f9d..12192f8472b 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -168,7 +168,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 2d4238823da..6b4253d99f9 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -138,7 +138,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">VAT: [[ o.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TAX: [[ o.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 988c4786bb8..44dae7ec5ac 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a VAT declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a TAX declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a VAT declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a TAX declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/account_coda/account_coda_comm_type.xml
index 9a042ec48d2..4a1c74ca770 100644
--- a/addons/account_coda/account_coda_comm_type.xml
+++ b/addons/account_coda/account_coda_comm_type.xml
@@ -73,7 +73,7 @@
         </record>
         <record id="acct_106" model="account.coda.comm.type">
             <field name="code">106</field>
-            <field name="description">Method of calculation (VAT, withholding tax on income, commission, etc.)</field>
+            <field name="description">Method of calculation (TAX, withholding tax on income, commission, etc.)</field>
         </record>
         <record id="acct_107" model="account.coda.comm.type">
             <field name="code">107</field>
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/account_coda/account_coda_trans_category.xml
index 192240cf8aa..e2d46e017b4 100644
--- a/addons/account_coda/account_coda_trans_category.xml
+++ b/addons/account_coda/account_coda_trans_category.xml
@@ -49,7 +49,7 @@
         </record>
         <record id="actrca_011" model="account.coda.trans.category">
             <field name="category">011</field>
-            <field name="description">VAT</field>
+            <field name="description">TAX</field>
         </record>
         <record id="actrca_012" model="account.coda.trans.category">
             <field name="category">012</field>
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/account_coda/account_coda_trans_code.xml
index b2b23d59bef..4f4e0d9f3cf 100644
--- a/addons/account_coda/account_coda_trans_code.xml
+++ b/addons/account_coda/account_coda_trans_code.xml
@@ -382,7 +382,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_03"/>
             <field name="description">Reimbursement of cheque-related costs</field>
-            <field name="comment">Overall amount, VAT included</field>
+            <field name="comment">Overall amount, TAX included</field>
         </record>
         <record id="actcc_03_99" model="account.coda.trans.code">
             <field name="code">99</field>
@@ -1850,7 +1850,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_80"/>
             <field name="description">Miscellaneous fees and commissions</field>
-            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). VAT excluded = type 0 VAT included = type 3 (at least 3 articles)</field>
+            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). TAX excluded = type 0 TAX included = type 3 (at least 3 articles)</field>
         </record>
         <record id="actcc_80_35" model="account.coda.trans.code">
             <field name="code">35</field>
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 3d096ecf3ac..83fcfe0f24c 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -141,7 +141,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">VAT: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">TAX: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index eebaffb92f0..53af51f40d4 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -125,7 +125,7 @@
 
 <record id="a_input_vat" model="account.account.template">
     <field name="code">1510</field>
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="parent_id" ref="a_assets"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -187,7 +187,7 @@
 
 <record id="a_output_vat" model="account.account.template">
     <field name="code">2310</field>
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="parent_id" ref="a_liabilities"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -333,7 +333,7 @@
     <field name="parent_id" ref="tc_root"/>
 </record>
 
-<!-- VAT -->
+<!-- TAX -->
 
 <record id="tc_base_vat" model="account.tax.code.template">
     <field name="name">Value Added Tax</field>
@@ -341,13 +341,13 @@
 </record>
 
 <record id="tc_base_output" model="account.tax.code.template">
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="code">PP30_4</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
 
 <record id="tc_base_input" model="account.tax.code.template">
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="code">PP30_6</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
@@ -397,7 +397,7 @@
 
 <!-- TAXES TO BE PAID -->
 
-<!-- VAT -->
+<!-- TAX -->
 
 <record id="tc_tax" model="account.tax.code.template">
     <field name="name">Taxes to be paid</field>
@@ -410,13 +410,13 @@
 </record>
 
 <record id="tc_tax_vat_output" model="account.tax.code.template">
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="code">PP30_5</field>
     <field name="parent_id" ref="tc_tax_vat"/>
 </record>
 
 <record id="tc_tax_vat_input" model="account.tax.code.template">
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="code">PP30_7</field>
     <field name="parent_id" ref="tc_tax_vat"/>
     <field name="sign" eval="-1"/>
@@ -485,7 +485,7 @@
 
 <record id="tax_input_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Input VAT</field>
+    <field name="name">Input TAX</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_input_vat"/>
@@ -497,7 +497,7 @@
 
 <record id="tax_output_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Output VAT</field>
+    <field name="name">Output TAX</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_output_vat"/>
diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index bb15368878e..292872a7b6e 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -27,7 +27,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input VAT -->
+        <!-- Sales + Input TAX -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 539ea69ba63..794aa13e2b9 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -169,7 +169,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -278,7 +278,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 48eaca6c73b..6ec3e728653 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -150,7 +150,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index c07bd06f402..e76e3a00196 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -148,7 +148,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 3a3bfc55042..2a0b4b1955a 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -134,7 +134,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -236,7 +236,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">VAT</para>
+          <para style="terp_tblheader_Details_Centre">TAX</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>

From e068ed26636212575245fad882ea549e3a505d91 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 19 Jul 2012 11:08:03 +0530
Subject: [PATCH 2/3] [IMP]vat to tax : changed the label Vat as its
 abbreviation

bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm
---
 addons/account/account.py                     | 26 +++++++++----------
 addons/account/account_move_line.py           |  4 +--
 .../data/configurable_account_chart.xml       |  6 ++---
 addons/account/demo/account_minimal.xml       |  4 +--
 .../report/account_journal_sale_purchase.rml  |  6 ++---
 .../account/report/account_print_invoice.rml  |  2 +-
 .../account/report/account_print_overdue.rml  |  2 +-
 addons/account/wizard/account_vat_view.xml    |  4 +--
 .../account_coda/account_coda_comm_type.xml   |  2 +-
 .../account_coda_trans_category.xml           |  2 +-
 .../account_coda/account_coda_trans_code.xml  |  4 +--
 .../report/account_followup_print.rml         |  2 +-
 addons/l10n_th/account_data.xml               | 20 +++++++-------
 addons/l10n_us/account_tax_template.xml       |  2 +-
 addons/mrp_repair/report/order.rml            |  4 +--
 addons/point_of_sale/report/pos_lines.rml     |  2 +-
 addons/report_intrastat/report/invoice.rml    |  2 +-
 addons/sale/report/sale_order.rml             |  4 +--
 18 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 78d0a192237..3675e89c06d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1880,17 +1880,17 @@ class account_tax(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the TAX declaration
+        # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the TAX declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the TAX declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the TAX declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the TAX declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2217,7 +2217,7 @@ class account_tax(osv.osv):
     def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
-        Price Unit is a TAX included price
+        Price Unit is a Tax included price
 
         RETURN:
             [ tax ]
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any TAX related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2788,17 +2788,17 @@ class account_tax_template(osv.osv):
         'python_applicable':fields.text('Python Code'),
 
         #
-        # Fields used for the TAX declaration
+        # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the TAX declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the TAX declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the TAX declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the TAX declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index e9f3459ad2c..5eb56bfa645 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -327,7 +327,7 @@ class account_move_line(osv.osv):
 
         if account and ((not fields) or ('debit' in fields) or ('credit' in fields)):
             data['account_id'] = account.id
-            # Propose the price TAX excluded, the TAX will be added when confirming line
+            # Propose the price Tax excluded, the Tax will be added when confirming line
             if account.tax_ids:
                 taxes = fiscal_pos_obj.map_tax(cr, uid, part and part.property_account_position or False, account.tax_ids)
                 tax = tax_obj.browse(cr, uid, taxes)
@@ -1347,7 +1347,7 @@ class account_move_line(osv.osv):
                     }
                     if data['tax_code_id']:
                         self.create(cr, uid, data, context)
-                #create the TAX movement
+                #create the Tax movement
                 data = {
                     'move_id': vals['move_id'],
                     'name': tools.ustr(vals['name'] or '') + ' ' + tools.ustr(tax['name'] or ''),
diff --git a/addons/account/data/configurable_account_chart.xml b/addons/account/data/configurable_account_chart.xml
index 345202de899..21a58fb2a6d 100644
--- a/addons/account/data/configurable_account_chart.xml
+++ b/addons/account/data/configurable_account_chart.xml
@@ -385,8 +385,8 @@
             <field name="complete_tax_set" eval="False"/>
         </record>
 
-         <!-- TAX Codes -->
-        <!-- Purchases + Output TAX -->
+         <!-- Tax Codes -->
+        <!-- Purchases + Output Tax -->
 
         <record id="otaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
@@ -444,7 +444,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input TAX -->
+        <!-- Sales + Input Tax -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="configurable_chart_template"/>
diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml
index 3592c82d6f8..b13af6a735c 100644
--- a/addons/account/demo/account_minimal.xml
+++ b/addons/account/demo/account_minimal.xml
@@ -94,7 +94,7 @@
 
         <record id="ova" model="account.account">
             <field name="code">X11003</field>
-            <field name="name">Output TAX - (test)</field>
+            <field name="name">Output Tax - (test)</field>
             <field ref="cas" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_asset"/>
@@ -152,7 +152,7 @@
 
         <record id="iva" model="account.account">
             <field name="code">X1112</field>
-            <field name="name">Input TAX - (test)</field>
+            <field name="name">Input Tax - (test)</field>
             <field ref="cli" name="parent_id"/>
             <field name="type">other</field>
             <field name="user_type" ref="data_account_type_liability"/>
diff --git a/addons/account/report/account_journal_sale_purchase.rml b/addons/account/report/account_journal_sale_purchase.rml
index 69f26ce1ff8..236879669f9 100644
--- a/addons/account/report/account_journal_sale_purchase.rml
+++ b/addons/account/report/account_journal_sale_purchase.rml
@@ -219,7 +219,7 @@
             <td><para style="P10a">Account</para></td>
             <td><para style="P10a">Partner</para></td>
             <td><para style="P10a">Label</para></td>
-            <td><para style="P10a">TAX</para></td>
+            <td><para style="P10a">Tax</para></td>
             <td><para style="P11"></para></td>
             <td><para style="P10b">Debit</para></td>
             <td><para style="P10b">Credit</para></td>
@@ -271,7 +271,7 @@
         <td><para style="P10a">Account</para></td>
         <td><para style="P10a">Partner</para></td>
         <td><para style="P10a">Label</para></td>
-        <td><para style="P10a">TAX</para></td>
+        <td><para style="P10a">Tax</para></td>
         <td><para style="P11"></para></td>
         <td><para style="P10b">Debit</para></td>
         <td><para style="P10b">Credit</para></td>
@@ -330,7 +330,7 @@
         <blockTable colWidths="15.0,80.0,20.0,182.0" style="Table1" repeatRows="1">
           <tr>
             <td><para style="P12"></para></td>
-            <td><para style="P12">TAX Declaration</para></td>
+            <td><para style="P12">Tax Declaration</para></td>
             <td><para style="P12"></para></td>
             <td><para style="P12"></para></td>
           </tr>
diff --git a/addons/account/report/account_print_invoice.rml b/addons/account/report/account_print_invoice.rml
index 12192f8472b..4ffa7a33f9d 100644
--- a/addons/account/report/account_print_invoice.rml
+++ b/addons/account/report/account_print_invoice.rml
@@ -168,7 +168,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/report/account_print_overdue.rml b/addons/account/report/account_print_overdue.rml
index 6b4253d99f9..2d4238823da 100644
--- a/addons/account/report/account_print_overdue.rml
+++ b/addons/account/report/account_print_overdue.rml
@@ -138,7 +138,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">TAX: [[ o.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT: [[ o.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 44dae7ec5ac..6e5dc09b816 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a TAX declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a Tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a TAX declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a Tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem
diff --git a/addons/account_coda/account_coda_comm_type.xml b/addons/account_coda/account_coda_comm_type.xml
index 4a1c74ca770..07d8244358b 100644
--- a/addons/account_coda/account_coda_comm_type.xml
+++ b/addons/account_coda/account_coda_comm_type.xml
@@ -73,7 +73,7 @@
         </record>
         <record id="acct_106" model="account.coda.comm.type">
             <field name="code">106</field>
-            <field name="description">Method of calculation (TAX, withholding tax on income, commission, etc.)</field>
+            <field name="description">Method of calculation (Tax, withholding tax on income, commission, etc.)</field>
         </record>
         <record id="acct_107" model="account.coda.comm.type">
             <field name="code">107</field>
diff --git a/addons/account_coda/account_coda_trans_category.xml b/addons/account_coda/account_coda_trans_category.xml
index e2d46e017b4..d96282bb422 100644
--- a/addons/account_coda/account_coda_trans_category.xml
+++ b/addons/account_coda/account_coda_trans_category.xml
@@ -49,7 +49,7 @@
         </record>
         <record id="actrca_011" model="account.coda.trans.category">
             <field name="category">011</field>
-            <field name="description">TAX</field>
+            <field name="description">Tax</field>
         </record>
         <record id="actrca_012" model="account.coda.trans.category">
             <field name="category">012</field>
diff --git a/addons/account_coda/account_coda_trans_code.xml b/addons/account_coda/account_coda_trans_code.xml
index 4f4e0d9f3cf..4ab9650d59a 100644
--- a/addons/account_coda/account_coda_trans_code.xml
+++ b/addons/account_coda/account_coda_trans_code.xml
@@ -382,7 +382,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_03"/>
             <field name="description">Reimbursement of cheque-related costs</field>
-            <field name="comment">Overall amount, TAX included</field>
+            <field name="comment">Overall amount, Tax included</field>
         </record>
         <record id="actcc_03_99" model="account.coda.trans.code">
             <field name="code">99</field>
@@ -1850,7 +1850,7 @@
             <field name="type">code</field>
             <field name="parent_id" ref="actcf_80"/>
             <field name="description">Miscellaneous fees and commissions</field>
-            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). TAX excluded = type 0 TAX included = type 3 (at least 3 articles)</field>
+            <field name="comment">Costs not specified otherwise, often with a manual communication (e.g. for collecting, ordering funds). Tax excluded = type 0 Tax included = type 3 (at least 3 articles)</field>
         </record>
         <record id="actcc_80_35" model="account.coda.trans.code">
             <field name="code">35</field>
diff --git a/addons/account_followup/report/account_followup_print.rml b/addons/account_followup/report/account_followup_print.rml
index 83fcfe0f24c..3d096ecf3ac 100644
--- a/addons/account_followup/report/account_followup_print.rml
+++ b/addons/account_followup/report/account_followup_print.rml
@@ -141,7 +141,7 @@
           <para style="terp_default_9">
             <font color="white"> </font>
           </para>
-          <para style="terp_default_9">TAX: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
+          <para style="terp_default_9">VAT: [[ o.partner_id.vat or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/account_data.xml
index 53af51f40d4..84ccb182792 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/account_data.xml
@@ -125,7 +125,7 @@
 
 <record id="a_input_vat" model="account.account.template">
     <field name="code">1510</field>
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="parent_id" ref="a_assets"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -187,7 +187,7 @@
 
 <record id="a_output_vat" model="account.account.template">
     <field name="code">2310</field>
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="parent_id" ref="a_liabilities"/>
     <field name="type">other</field>
     <field name="user_type" ref="acc_type_other"/>
@@ -333,7 +333,7 @@
     <field name="parent_id" ref="tc_root"/>
 </record>
 
-<!-- TAX -->
+<!-- Tax -->
 
 <record id="tc_base_vat" model="account.tax.code.template">
     <field name="name">Value Added Tax</field>
@@ -341,13 +341,13 @@
 </record>
 
 <record id="tc_base_output" model="account.tax.code.template">
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="code">PP30_4</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
 
 <record id="tc_base_input" model="account.tax.code.template">
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="code">PP30_6</field>
     <field name="parent_id" ref="tc_base_vat"/>
 </record>
@@ -397,7 +397,7 @@
 
 <!-- TAXES TO BE PAID -->
 
-<!-- TAX -->
+<!-- Tax -->
 
 <record id="tc_tax" model="account.tax.code.template">
     <field name="name">Taxes to be paid</field>
@@ -410,13 +410,13 @@
 </record>
 
 <record id="tc_tax_vat_output" model="account.tax.code.template">
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="code">PP30_5</field>
     <field name="parent_id" ref="tc_tax_vat"/>
 </record>
 
 <record id="tc_tax_vat_input" model="account.tax.code.template">
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="code">PP30_7</field>
     <field name="parent_id" ref="tc_tax_vat"/>
     <field name="sign" eval="-1"/>
@@ -485,7 +485,7 @@
 
 <record id="tax_input_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Input TAX</field>
+    <field name="name">Input Tax</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_input_vat"/>
@@ -497,7 +497,7 @@
 
 <record id="tax_output_vat" model="account.tax.template">
     <field name="chart_template_id" ref="chart"/>
-    <field name="name">Output TAX</field>
+    <field name="name">Output Tax</field>
     <field name="type">percent</field>
     <field name="amount" eval="0.07"/>
     <field name="account_collected_id" ref="a_output_vat"/>
diff --git a/addons/l10n_us/account_tax_template.xml b/addons/l10n_us/account_tax_template.xml
index 292872a7b6e..6e70700a9f3 100644
--- a/addons/l10n_us/account_tax_template.xml
+++ b/addons/l10n_us/account_tax_template.xml
@@ -27,7 +27,7 @@
             <field name="type_tax_use">purchase</field>
         </record>
 
-        <!-- Sales + Input TAX -->
+        <!-- Sales + Input Tax -->
 
         <record id="itaxs" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_us.account_chart_template_basic"/>
diff --git a/addons/mrp_repair/report/order.rml b/addons/mrp_repair/report/order.rml
index 794aa13e2b9..be5737d4b85 100644
--- a/addons/mrp_repair/report/order.rml
+++ b/addons/mrp_repair/report/order.rml
@@ -169,7 +169,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -278,7 +278,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/point_of_sale/report/pos_lines.rml b/addons/point_of_sale/report/pos_lines.rml
index 6ec3e728653..be394ed4f16 100644
--- a/addons/point_of_sale/report/pos_lines.rml
+++ b/addons/point_of_sale/report/pos_lines.rml
@@ -150,7 +150,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
diff --git a/addons/report_intrastat/report/invoice.rml b/addons/report_intrastat/report/invoice.rml
index e76e3a00196..c07bd06f402 100644
--- a/addons/report_intrastat/report/invoice.rml
+++ b/addons/report_intrastat/report/invoice.rml
@@ -148,7 +148,7 @@
           </para>
           <para style="terp_default_8">Tel. : [[ (o.partner_id.phone) or removeParentNode('para') ]]</para>
           <para style="terp_default_8">Fax : [[ (o.partner_id.fax) or removeParentNode('para') ]]</para>
-          <para style="terp_default_8">TAX : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
+          <para style="terp_default_8">VAT : [[ (o.partner_id.vat) or removeParentNode('para') ]]</para>
         </td>
       </tr>
     </blockTable>
diff --git a/addons/sale/report/sale_order.rml b/addons/sale/report/sale_order.rml
index 2a0b4b1955a..8fecc17e62c 100644
--- a/addons/sale/report/sale_order.rml
+++ b/addons/sale/report/sale_order.rml
@@ -134,7 +134,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>
@@ -236,7 +236,7 @@
           <para style="terp_tblheader_Details">Description</para>
         </td>
         <td>
-          <para style="terp_tblheader_Details_Centre">TAX</para>
+          <para style="terp_tblheader_Details_Centre">Tax</para>
         </td>
         <td>
           <para style="terp_tblheader_Details_Right">Quantity</para>

From 9e0be9ffd17bf4f2293ef746274527ef5d8e8ea0 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Thu, 19 Jul 2012 16:41:15 +0530
Subject: [PATCH 3/3] [IMP]vat to tax : changed the label tax in lowercase

bzr revid: rpr@tinyerp.com-20120719111115-ap37b1bo2o7w1w1k
---
 addons/account/account.py                  | 20 ++++++++++----------
 addons/account/wizard/account_vat_view.xml |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index ce6cba3edff..c95dbe253ad 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1788,7 +1788,7 @@ class account_tax_code(osv.osv):
         'line_ids': fields.one2many('account.move.line', 'tax_code_id', 'Lines'),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'sign': fields.float('Coefficent for parent', required=True, help='You can specify here the coefficient that will be used when consolidating the amount of this case into its parent. For example, set 1/-1 if you want to add/substract it.'),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
         'sequence': fields.integer('Sequence', help="Determine the display order in the report 'Accounting \ Reporting \ Generic Reporting \ Taxes \ Taxes Report'"),
     }
 
@@ -1882,15 +1882,15 @@ class account_tax(osv.osv):
         #
         # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the Tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the Tax declaration."),
+        'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the Tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the Tax declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
@@ -2673,7 +2673,7 @@ class account_tax_code_template(osv.osv):
         'parent_id': fields.many2one('account.tax.code.template', 'Parent Code', select=True),
         'child_ids': fields.one2many('account.tax.code.template', 'parent_id', 'Child Codes'),
         'sign': fields.float('Sign For Parent', required=True),
-        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any Tax related to this Tax Code to appear on invoices"),
+        'notprintable':fields.boolean("Not Printable in Invoice", help="Check this box if you don't want any tax related to this tax Code to appear on invoices"),
     }
 
     _defaults = {
@@ -2790,15 +2790,15 @@ class account_tax_template(osv.osv):
         #
         # Fields used for the Tax declaration
         #
-        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the Tax declaration."),
-        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the Tax declaration."),
+        'base_code_id': fields.many2one('account.tax.code.template', 'Base Code', help="Use this code for the tax declaration."),
+        'tax_code_id': fields.many2one('account.tax.code.template', 'Tax Code', help="Use this code for the tax declaration."),
         'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
 
         # Same fields for refund invoices
 
-        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the Tax declaration."),
-        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the Tax declaration."),
+        'ref_base_code_id': fields.many2one('account.tax.code.template', 'Refund Base Code', help="Use this code for the tax declaration."),
+        'ref_tax_code_id': fields.many2one('account.tax.code.template', 'Refund Tax Code', help="Use this code for the tax declaration."),
         'ref_base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in Base Amount', help="Set if the amount of tax must be included in the base amount before computing the next taxes."),
diff --git a/addons/account/wizard/account_vat_view.xml b/addons/account/wizard/account_vat_view.xml
index 6e5dc09b816..e1a5ea3b140 100644
--- a/addons/account/wizard/account_vat_view.xml
+++ b/addons/account/wizard/account_vat_view.xml
@@ -8,7 +8,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
             <form string="Taxes Report" version="7.0">
-                <label colspan="4" string="This menu prints a Tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
+                <label colspan="4" string="This menu prints a tax declaration based on invoices or payments. Select one or several periods of the fiscal year. The information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter."/>
                 <group string="Taxes Report" col="4">
                     <field name="chart_tax_id" widget='selection'/>
                     <field name="fiscalyear_id"/>
@@ -36,7 +36,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
-            <field name="help">This menu print a Tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
+            <field name="help">This menu print a tax declaration based on invoices or payments. You can select one or several periods of the fiscal year. Information required for a tax declaration is automatically generated by OpenERP from invoices (or payments, in some countries). This data is updated in real time. That’s very useful because it enables you to preview at any time the tax that you owe at the start and end of the month or quarter.</field>
         </record>
 
         <menuitem