diff --git a/addons/base_vat/base_vat_data.xml b/addons/base_vat/base_vat_data.xml
index 473d2de51f1..287ad0ada8c 100644
--- a/addons/base_vat/base_vat_data.xml
+++ b/addons/base_vat/base_vat_data.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        
-        <record id="view_partner_form" model="ir.ui.view">
-            <field name="name">res.partner.vat.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="inherit_id" ref="account.view_partner_property_form"/>
-            <field name="arch" type="xml">
-                <field name="property_account_position" position="after">
-                    <field name="vat" on_change="vat_change(vat)" select="2"/>
-                    <field name="vat_subjected"/>
-                </field>
-            </field>
-        </record>
-        
-    </data>
+  <data>
+
+    <record id="view_partner_form" model="ir.ui.view">
+      <field name="name">res.partner.vat.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="inherit_id" ref="account.view_partner_property_form"/>
+      <field name="arch" type="xml">
+        <field name="property_account_payable" position="after">
+            <group colspan="2" col="6">
+              <field name="vat" on_change="vat_change(vat)" select="2" colspan="4" />
+              <field name="vat_subjected" colspan="1"/>
+            </group>
+        </field>
+      </field>
+    </record>
+
+  </data>
 </openerp>
+
diff --git a/addons/stock/partner_view.xml b/addons/stock/partner_view.xml
index 84109a8802b..d3f04ae9afc 100644
--- a/addons/stock/partner_view.xml
+++ b/addons/stock/partner_view.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data>
-        <!--
-        Partners Extension
-    -->
-        
-        <record id="view_partner_property_form" model="ir.ui.view">
-            <field name="name">res.partner.stock.property.form.inherit</field>
-            <field name="model">res.partner</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="base.view_partner_form"/>
-            <field name="arch" type="xml">
-				<page string="Sales &amp; Purchases" position="inside">
-					<group colspan="2" col="2">
-						<separator string="Stock Properties" colspan="2"/>
-						<field name="property_stock_customer" widget="selection"/>
-						<field name="property_stock_supplier" widget="selection"/>
-					</group>
-                </page>
-            </field>
-        </record>
+  <data>
+    <!--
+    Partners Extension
+  -->
 
-    </data>
+    <record id="view_partner_property_form" model="ir.ui.view">
+      <field name="name">res.partner.stock.property.form.inherit</field>
+      <field name="model">res.partner</field>
+      <field name="type">form</field>
+      <field name="inherit_id" ref="base.view_partner_form"/>
+      <field name="arch" type="xml">
+        <page string="Sales &amp; Purchases" position="inside">
+          <group colspan="4" col="4">
+            <separator string="Stock Properties" colspan="4"/>
+            <field name="property_stock_customer" widget="selection" domain="[('usage','=','customer')]" />
+            <field name="property_stock_supplier" widget="selection" domain="[('usage','=','supplier')]"/>
+          </group>
+        </page>
+      </field>
+    </record>
+
+  </data>
 </openerp>