Rename vat into vat_number and tax_vat into vat

move.xml

@@ -342,7 +342,7 @@
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/tree/field[@name=&quot;vat&quot;]"
+                        expr="/tree/field[@name=&quot;vat_number&quot;]"
                         position="after">
                         <field name="receivable_today" select="2"/>
                         <field name="payable_today" select="2"/>
@@ -358,7 +358,7 @@
                 <![CDATA[
                 <data>
                     <xpath
-                        expr="/form/notebook/page[@string=&quot;Accounting&quot;]/field[@name=&quot;vat&quot;]"
+                        expr="/form/notebook/page[@string=&quot;Accounting&quot;]/field[@name=&quot;vat_number&quot;]"
                         position="after">
                         <newline/>
                         <label name="receivable_today"/>

tax.py

@@ -520,7 +520,7 @@ Account()
 
 class Party(OSV):
     _name = 'relationship.party'
-    tax_vat = fields.Property(type='many2one',
+    vat = fields.Property(type='many2one',
             relation='account.tax', string='VAT',
             group_name='Accounting Properties', view_load=True,
             domain="[('group.code', '=', 'vat'), ('company', '=', company)]",

tax.xml

@@ -250,7 +250,7 @@
         </record>
         <record model="account.tax.group" id="tax_group_vat">
             <field name="name">VAT</field>
-            <field name="code">tax_vat</field>
+            <field name="code">vat</field>
         </record>
 
         <record model="ir.ui.view" id="tax_line_view_form">
@@ -304,10 +304,10 @@
             <field name="action" ref="act_open_tax_code"/>
         </record>
 
-        <record model="ir.property" id="property_tax_vat">
-            <field name="name">tax_vat</field>
+        <record model="ir.property" id="property_vat">
+            <field name="name">vat</field>
             <field name="field"
-                search="[('model.model', '=', 'relationship.party'), ('name', '=', 'tax_vat')]"/>
+                search="[('model.model', '=', 'relationship.party'), ('name', '=', 'vat')]"/>
         </record>
     </data>
 </tryton>