diff --git a/addons/account/account.py b/addons/account/account.py
index d76b762442e..f51f41e845c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1266,8 +1266,18 @@ class account_tax(osv.osv):
         'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Tax Code',size=32),
-        'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax.")
+        'price_include': fields.boolean('Tax Included in Price', help="Check this is the price you use on the product and invoices is including this tax."),
+        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
+
     }
+    def search(self, cr, uid, args, offset=0, limit=None, order=None,
+            context=None, count=False):
+        if context and context.has_key('type'):
+            if context['type'] in ('out_invoice','out_refund'):
+                args.append(('type_tax_use','=','sale'))
+            elif context['type'] in ('in_invoice','in_refund'):
+                args.append(('type_tax_use','=','purchase'))
+        return super(account_tax, self).search(cr, uid, args, offset, limit, order, context, count)
 
     def name_get(self, cr, uid, ids, context={}):
         if not len(ids):
@@ -1898,6 +1908,7 @@ class account_tax_template(osv.osv):
         'ref_tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
         'include_base_amount': fields.boolean('Include in base amount', help="Indicate if the amount of tax must be included in the base amount for the computation of the next taxes."),
         'description': fields.char('Internal Name', size=32),
+        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
     }
 
     def name_get(self, cr, uid, ids, context={}):
@@ -2073,6 +2084,7 @@ class wizard_multi_charts_accounts(osv.osv_memory):
                 'include_base_amount': tax.include_base_amount,
                 'description':tax.description,
                 'company_id': company_id,
+                'type_tax_use': tax.type_tax_use
             }
             new_tax = obj_acc_tax.create(cr,uid,vals_tax)
             #as the accounts have not been created yet, we have to wait before filling these fields
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 2b1e42cde7e..c130803aa82 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -63,7 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
                             <newline/>
                             <field name="price_subtotal"/>
-                            <field colspan="4" name="invoice_line_tax_id" domain="[('parent_id','=',False)]"/>
+                            <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="note" nolabel="1"/>
@@ -156,7 +156,7 @@
                                 <tree string="Invoice lines" editable="top">
                                     <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id)"/>
                                     <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(parent.fiscal_position,account_id)"/>
-                                    <field name="invoice_line_tax_id" view_mode="2" domain="[('parent_id','=',False)]"/>
+                                    <field name="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id"/>
                                     <field name="quantity"/>
                                     <field name="price_unit"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e35f4b942e8..08bb4c15877 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -608,6 +608,7 @@
                             <field groups="base.group_extended" name="child_depend"/>
                             <field groups="base.group_extended" name="sequence"/>
                             <field groups="base.group_extended" name="price_include"/>
+                            <field name="type_tax_use"/>
                             <newline/>
                             <field colspan="4" groups="base.group_extended" name="child_ids"/>
                         </page>
@@ -1550,6 +1551,7 @@
                         <field name="chart_template_id" select="1"/>
                         <field name="tax_group" select="1"/>
                         <field name="type" select="2"/>
+                        <field name="type_tax_use" select="2"/>
                     </group>
                     <notebook colspan="4">
                         <page string="Tax Definition">
diff --git a/addons/account/product.py b/addons/account/product.py
index bbad07e02ff..78ad60ab9ae 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 ##############################################################################
 #
-#    OpenERP, Open Source Management Solution	
+#    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
@@ -54,10 +54,10 @@ class product_template(osv.osv):
     _columns = {
         'taxes_id': fields.many2many('account.tax', 'product_taxes_rel',
             'prod_id', 'tax_id', 'Customer Taxes',
-            domain=[('parent_id','=',False)]),
+            domain=[('parent_id','=',False),('type_tax_use','=','sale')]),
         'supplier_taxes_id': fields.many2many('account.tax',
             'product_supplier_taxes_rel', 'prod_id', 'tax_id',
-            'Supplier Taxes', domain=[('parent_id', '=', False)]),
+            'Supplier Taxes', domain=[('parent_id', '=', False),('type_tax_use','=','purchase')]),
         'property_account_income': fields.property(
             'account.account',
             type='many2one',
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index adaa263fa86..d45cc8e1612 100644
--- a/addons/auction/auction_view.xml
+++ b/addons/auction/auction_view.xml
@@ -103,8 +103,8 @@ Auction Management/Auction Dates/New Auction Dates
 				<field name="auction1" select="1"/>
 				<field name="auction2" select="1"/>
 				<separator string="Commissions" colspan="4"/>
-				<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
-				<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction')]"/>
+				<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','sale')]"/>
+				<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','purchase')]"/>
 				<separator string="Accounting" colspan="4"/>
 				<field name="acc_expense"/>
 				<field name="acc_income"/>
@@ -208,7 +208,7 @@ Auction Management/Auction Dates/Reporting
 				<field name="vnd_lim"/>
 				<field name="vnd_lim_net"/>
 				<field name="lot_est1"/>
-				<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
+				<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
 				<field name="lot_est2"/>
 				<field name="product_id"/>
 				<field name="state" readonly="1"/>
@@ -319,7 +319,7 @@ Auction Management/Auction Dates/Reporting
 					<field name="obj_comm" select="2"/>
 					<field name="obj_ret"/>
 					<field name="ach_emp"/>
-					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
+					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
 					<field name="buyer_price"/>
 					<field name="seller_price"/>
 					<field name="gross_revenue"/>
@@ -430,7 +430,7 @@ Auction Management/Auction Dates/Reporting
 					<field name="name" readonly="1" select="1"/>
 					<field name="name2" readonly="2" select="1"/>
 					<field name="artist_id" readonly="1"/>
-					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
+					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
 					<newline/>
 					<field name="buyer_price"/>
 					<field name="is_ok" select="1"/>
@@ -510,7 +510,7 @@ Auction Management/Auction Dates/Reporting
 						<field name="partner_id" select="1" on_change="partner_id_change(partner_id)"/>
 						<field name="method"/>
 						<newline/>
-						<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False)]"/>
+						<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','=','sale')]"/>
 						<field name="transfer"/>
 						<newline/>
 						<field name="lot_id" colspan="4" mode="tree,graph" nolabel="1">
@@ -545,7 +545,7 @@ Auction Management/Auction Dates/Reporting
 									<field name="lot_est1"/>
 									<field name="lot_est2"/>
 
-									<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False)]"/>
+									<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','=','purchase')]"/>
 									<field name="product_id" domain="[('sale_ok','=',True)]"/>
 									<field name="state" readonly="1"/>
 								</page><page string="Photos">
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml
index 85a19681293..fc3baa0203e 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/account_pcmn_belgium.xml
@@ -6637,6 +6637,7 @@
             <field name="tax_code_id" ref="vat_code_a49"/>
             <field name="ref_base_code_id" ref="vat_code_a54"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_6_buy" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6645,6 +6646,7 @@
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund06"/>
             <field name="account_paid_id" ref="vat_payable06"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_12" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6653,6 +6655,7 @@
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable12"/>
             <field name="account_paid_id" ref="vat_refund12"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_12_buy" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6661,6 +6664,7 @@
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_refund12"/>
             <field name="account_paid_id" ref="vat_payable12"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_21" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6673,6 +6677,7 @@
             <field name="tax_code_id" ref="vat_code_a54"/>
             <field name="ref_base_code_id" ref="vat_code_a49"/>
             <field name="ref_tax_code_id" ref="vat_code_a64"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_21_buy" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6680,6 +6685,7 @@
             <field eval="1.0" name="amount"/>
             <field name="type">percent</field>
             <field eval="1" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_21_buy_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6693,6 +6699,8 @@
             <field name="tax_code_id" ref="vat_code_a59"/>
             <field name="ref_base_code_id" ref="vat_code_a85"/>
             <field name="ref_tax_code_id" ref="vat_code_a63"/>
+            <field name="type_tax_use">purchase</field>
+
         </record>
         <record id="vat_21_buy_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6702,6 +6710,7 @@
             <field name="type">percent</field>
             <field name="ref_base_code_id" ref="vat_code_a82"/>
             <field eval="-1" name="ref_base_sign"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6710,6 +6719,7 @@
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_CO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6721,6 +6731,7 @@
             <field eval="vat_code_a82" name="base_code_id"/>
             <field eval="vat_code_a82" name="ref_base_code_id"/>
             <field eval="True" name="child_depend"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_CO_0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6732,6 +6743,7 @@
             <field name="account_paid_id" ref="vat_refund0"/>
             <field eval="vat_code_a59" name="tax_code_id"/>
             <field eval="vat_code_a59" name="ref_tax_code_id"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_CO_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6743,6 +6755,7 @@
             <field name="account_paid_id" ref="vat_refund0"/>
             <field eval="vat_code_a56" name="tax_code_id"/>
             <field eval="vat_code_a56" name="ref_tax_code_id"/>
+            <field name="type_tax_use">purchase</field>
         </record>
         <record id="vat_Ex" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6751,6 +6764,7 @@
             <field name="type">percent</field>
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_I0" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6760,6 +6774,7 @@
             <field eval="True" name="child_depend"/>
             <field eval="vat_code_a81" name="base_code_id"/>
             <field eval="vat_code_a81" name="ref_base_code_id"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_I0_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6771,6 +6786,7 @@
             <field name="account_paid_id" ref="vat_refund0"/>
             <field eval="vat_code_a59" name="tax_code_id"/>
             <field eval="vat_code_a59" name="ref_tax_code_id"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_I0_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6782,6 +6798,7 @@
             <field name="account_paid_id" ref="vat_payable0"/>
             <field eval="vat_code_a55" name="tax_code_id"/>
             <field eval="vat_code_a55" name="ref_tax_code_id"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_XO" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6791,6 +6808,7 @@
             <field name="account_collected_id" ref="vat_payable0"/>
             <field name="account_paid_id" ref="vat_refund0"/>
             <field eval="True" name="child_depend"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_XO_1" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6802,6 +6820,7 @@
             <field name="account_paid_id" ref="vat_refund0"/>
             <field eval="vat_code_a59" name="tax_code_id"/>
             <field eval="vat_code_a59" name="ref_tax_code_id"/>
+            <field name="type_tax_use">sale</field>
         </record>
         <record id="vat_XO_2" model="account.tax.template">
             <field name="chart_template_id" ref="l10nbe_chart_template"/>
@@ -6813,6 +6832,7 @@
             <field name="account_paid_id" ref="vat_payable0"/>
             <field eval="vat_code_a57" name="tax_code_id"/>
             <field eval="vat_code_a57" name="ref_tax_code_id"/>
+            <field name="type_tax_use">sale</field>
         </record>
 
     </data>
diff --git a/addons/l10n_chart_uk_minimal/account_tax.xml b/addons/l10n_chart_uk_minimal/account_tax.xml
index 51d5c3f349f..a030925f8fa 100755
--- a/addons/l10n_chart_uk_minimal/account_tax.xml
+++ b/addons/l10n_chart_uk_minimal/account_tax.xml
@@ -1,128 +1,128 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    
+
     <data noupdate="True">
-        
+
         <!-- VAT Code Definitions -->
-        
+
         <!-- Invoiced VAT -->
-        
+
         <!-- Input VAT -->
-        
+
         <record id="vat_code_chart_root" model="account.tax.code.template">
             <field name="name">Plan Fees UK</field>
         </record>
-        
+
         <record id="vat_code_balance_net" model="account.tax.code.template">
             <field name="name">VAT Balance to Pay</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <record id="vat_code_input" model="account.tax.code.template">
             <field name="name">Input VAT</field>
             <field name="parent_id" ref="vat_code_balance_net"/>
         </record>
-        
+
         <record id="vat_code_input_S" model="account.tax.code.template">
             <field name="name">Input VAT Rate S (15%)</field>
             <field name="parent_id" ref="vat_code_input"/>
         </record>
-        
+
         <record id="vat_code_input_R" model="account.tax.code.template">
             <field name="name">Input VAT Rate R (5%)</field>
             <field name="parent_id" ref="vat_code_input"/>
         </record>
-        
+
         <!-- Output VAT -->
-        
+
         <record id="vat_code_output" model="account.tax.code.template">
             <field name="name">Output VAT</field>
             <field name="parent_id" ref="vat_code_balance_net"/>
         </record>
-        
+
         <record id="vat_code_output_S" model="account.tax.code.template">
             <field name="name">Output VAT Rate S (15%)</field>
             <field name="parent_id" ref="vat_code_output"/>
         </record>
-        
+
         <record id="vat_code_output_R" model="account.tax.code.template">
             <field name="name">Output VAT Rate R (5%)</field>
             <field name="parent_id" ref="vat_code_output"/>
         </record>
-        
+
         <!-- Invoiced Base of VAT -->
-        
+
         <!-- Purchases -->
-        
+
         <record id="vat_code_base_net" model="account.tax.code.template">
             <field name="name">Tax Bases</field>
             <field name="parent_id" ref="vat_code_chart_root"/>
         </record>
-        
+
         <record id="vat_code_base_purchases" model="account.tax.code.template">
             <field name="name">Taxable Purchases Base</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
-        
+
         <record id="vat_code_purch_S" model="account.tax.code.template">
             <field name="name">Taxable Purchases Rated S (15%)</field>
             <field name="parent_id" ref="vat_code_base_purchases"/>
         </record>
-        
+
         <record id="vat_code_purch_R" model="account.tax.code.template">
             <field name="name">Taxable Purchases Rated R (5%)</field>
             <field name="parent_id" ref="vat_code_base_purchases"/>
         </record>
-        
+
         <record id="vat_code_purch_Z" model="account.tax.code.template">
             <field name="name">Taxable Purchases Rated Z (0%)</field>
             <field name="parent_id" ref="vat_code_base_purchases"/>
         </record>
-        
+
         <record id="vat_code_purch_X" model="account.tax.code.template">
             <field name="name">Taxable Purchases Type X (Exempt)</field>
             <field name="parent_id" ref="vat_code_base_purchases"/>
         </record>
-        
+
         <record id="vat_code_purch_O" model="account.tax.code.template">
             <field name="name">Taxable Purchases Type O (Out of scope)</field>
             <field name="parent_id" ref="vat_code_base_purchases"/>
         </record>
-        
+
         <!-- Sales -->
-        
+
         <record id="vat_code_base_sales" model="account.tax.code.template">
             <field name="name">Base of Taxable Sales</field>
             <field name="parent_id" ref="vat_code_base_net"/>
         </record>
-        
+
         <record id="vat_code_sales_S" model="account.tax.code.template">
             <field name="name">Taxable Sales Rated S (15%)</field>
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
-        
+
         <record id="vat_code_sales_R" model="account.tax.code.template">
             <field name="name">Taxable Sales Rated R (5%)</field>
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
-        
+
         <record id="vat_code_sales_Z" model="account.tax.code.template">
             <field name="name">Taxable Sales Rated Z (0%)</field>
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
-        
+
         <record id="vat_code_sales_X" model="account.tax.code.template">
             <field name="name">Taxable Sales Type X (Exempt)</field>
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
-        
+
         <record id="vat_code_sales_O" model="account.tax.code.template">
             <field name="name">Taxable Sales Type O (Out of scope)</field>
             <field name="parent_id" ref="vat_code_base_sales"/>
         </record>
-        
+
         <!-- Chart Template -->
-        
+
         <record id="l10n_uk_chart_template" model="account.chart.template">
             <field name="name">UK Minimal Account Chart Template</field>
             <field name="account_root_id" ref="l10n_chart_uk_minimal.chart0"/>
@@ -133,10 +133,10 @@
             <field name="property_account_expense_categ" ref="l10n_chart_uk_minimal.a_expense"/>
             <field name="property_account_income_categ" ref="l10n_chart_uk_minimal.a_sale"/>
         </record>
-        
+
         <!-- VAT Codes -->
         <!-- Purchases + Input VAT -->
-        
+
         <record id="ivats" model="account.tax.template">
        	 	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT S</field>
@@ -148,8 +148,9 @@
             <field name="tax_code_id" ref="vat_code_input_S"/>
             <field name="ref_base_code_id" ref="vat_code_purch_S"/>
             <field name="ref_tax_code_id" ref="vat_code_input_S"/>
+            <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="ivatr" model="account.tax.template">
        		<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT R</field>
@@ -161,8 +162,9 @@
             <field name="tax_code_id" ref="vat_code_input_R"/>
             <field name="ref_base_code_id" ref="vat_code_purch_R"/>
             <field name="ref_tax_code_id" ref="vat_code_input_R"/>
+            <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="ivatz" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT Z</field>
@@ -170,8 +172,9 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_purch_Z"/>
             <field name="ref_base_code_id" ref="vat_code_purch_Z"/>
+            <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="ivatx" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT X</field>
@@ -179,8 +182,9 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_purch_X"/>
             <field name="ref_base_code_id" ref="vat_code_purch_X"/>
+            <field name="type_tax_use">purchase</field>
         </record>
-        
+
         <record id="ivato" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">IVAT O</field>
@@ -188,10 +192,11 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_purch_O"/>
             <field name="ref_base_code_id" ref="vat_code_purch_O"/>
+            <field name="type_tax_use">purchase</field>
         </record>
 
         <!-- Sales + Output VAT -->
-        
+
         <record id="ovats" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT S</field>
@@ -203,8 +208,9 @@
             <field name="tax_code_id" ref="vat_code_output_S"/>
             <field name="ref_base_code_id" ref="vat_code_sales_S"/>
             <field name="ref_tax_code_id" ref="vat_code_output_S"/>
+            <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="ovatr" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT R</field>
@@ -216,8 +222,9 @@
             <field name="tax_code_id" ref="vat_code_output_R"/>
             <field name="ref_base_code_id" ref="vat_code_sales_R"/>
             <field name="ref_tax_code_id" ref="vat_code_output_R"/>
+            <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="ovatz" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT Z</field>
@@ -225,8 +232,9 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_sales_Z"/>
             <field name="ref_base_code_id" ref="vat_code_sales_Z"/>
+            <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="ovatx" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT X</field>
@@ -234,8 +242,9 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_sales_X"/>
             <field name="ref_base_code_id" ref="vat_code_sales_X"/>
+            <field name="type_tax_use">sale</field>
         </record>
-        
+
         <record id="ovato" model="account.tax.template">
         	<field name="chart_template_id" ref="l10n_uk_chart_template"/>
             <field name="name">OVAT O</field>
@@ -243,7 +252,8 @@
             <field name="type">percent</field>
             <field name="base_code_id" ref="vat_code_sales_O"/>
             <field name="ref_base_code_id" ref="vat_code_sales_O"/>
+            <field name="type_tax_use">sale</field>
         </record>
-        
+
     </data>
 </openerp>
\ No newline at end of file
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 15dfd109b59..68754d1e789 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
     <record id="view_repair_order_form" model="ir.ui.view">
             <field name="name">mrp.repair.form</field>
             <field name="model">mrp.repair</field>
@@ -26,25 +26,25 @@
                             <field name="guarantee_limit" />
                             <newline/>
                             <field colspan="4" mode="tree,form" name="operations" nolabel="1" widget="one2many_list">
-                                <form string="Operations"> 
+                                <form string="Operations">
                                     <notebook>
-                                        <page string="Repair Line">                                                                      
-		                                    <field name="name" colspan="4"/>		                                     
-		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>                                            
+                                        <page string="Repair Line">
+		                                    <field name="name" colspan="4"/>
+		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id)" colspan="4"/>
 		                                    <field name="product_uom_qty" string="Qty" />
 		                                    <field name="product_uom" string="UoM"/>
-		                                    <field name="price_unit"/>     
-		                                    <field name="price_subtotal"/> 		                                    
+		                                    <field name="price_unit"/>
+		                                    <field name="price_subtotal"/>
 		                                    <field name="location_id"/>
 		                                    <field name="location_dest_id"/>
                                             <newline/>
                                             <field name="type"  on_change="onchange_operation_type(type,parent.guarantee_limit)"/>
                                             <group colspan="2">
                                                 <field name="to_invoice"/>
-    		                                    <field name="invoiced"/>  
+    		                                    <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
                                             <separator colspan="4" string="States"/>
                                             <field name="state"/>
 										</page>
@@ -52,7 +52,7 @@
                                             <field colspan="4" name="move_id" />
                                             <field colspan="4" name="invoice_line_id"/>
                                         </page>
-		                                         
+
                                      </notebook>
                                 </form>
                                 <tree string="Operations" editable="bottom">
@@ -88,7 +88,7 @@
                                 <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
 								<button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
                                 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
-                                <button name="cancel" states="draft" string="Cancel Repair"/>                                
+                                <button name="cancel" states="draft" string="Cancel Repair"/>
                                 <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
                             </group>
                         </page>
@@ -100,25 +100,25 @@
                             <field colspan="4" mode="tree,form" name="fees_lines" nolabel="1" widget="one2many_list">
                                 <form string="Fees">
                                     <notebook>
-                                        <page string="Fees Line"> 
-                                            <field name='name'/>  
+                                        <page string="Fees Line">
+                                            <field name='name'/>
 		                                    <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)" colspan="4"/>
 		                                    <field name="product_uom_qty" string="Qty"/>
-		                                    <field name="product_uom" string="UoM" /> 
-		                                    <field name="price_unit"/>  
-		                                    <field name="price_subtotal"/>  
+		                                    <field name="product_uom" string="UoM" />
+		                                    <field name="price_unit"/>
+		                                    <field name="price_subtotal"/>
                                             <newline/>
-                                            <group colspan="2">                                                
+                                            <group colspan="2">
                                                 <field name="to_invoice"/>
-    		                                    <field name="invoiced"/>  
+    		                                    <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
                                          </page>
-										 <page string="History" groups="base.group_extended">                                            
-                                            <field colspan="4" name="invoice_line_id" />                                            
-                                        </page>     
-                                      </notebook>                     
+										 <page string="History" groups="base.group_extended">
+                                            <field colspan="4" name="invoice_line_id" />
+                                        </page>
+                                      </notebook>
                                 </form>
                                 <tree string="Fees" editable="bottom">
                                     <field name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom,product_uom_qty, parent.partner_id,parent.guarantee_limit)"/>
@@ -137,7 +137,7 @@
                             <separator colspan="4" string="Quotation Notes"/>
                             <field colspan="4" name="quotation_notes" nolabel="1"/>
                         </page>
-                        <page string="Extra Info" groups="base.group_extended">                            
+                        <page string="Extra Info" groups="base.group_extended">
                             <field name="invoice_id"/>
                             <field name="picking_id"/>
                             <field name="location_id"/>
@@ -147,7 +147,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="view_repair_order_tree" model="ir.ui.view">
             <field name="name">mrp.repair.tree</field>
             <field name="model">mrp.repair</field>
@@ -167,7 +167,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="action_repair_order_form" model="ir.actions.act_window">
             <field name="name">New Repair</field>
             <field name="type">ir.actions.act_window</field>
@@ -175,7 +175,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">form,tree</field>
         </record>
-        
+
          <record id="action_repair_order_tree" model="ir.actions.act_window">
             <field name="name">Repair Orders</field>
             <field name="type">ir.actions.act_window</field>
@@ -183,7 +183,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
-        
+
          <record id="action_repair_quotation_tree" model="ir.actions.act_window">
             <field name="name">Repairs in quotation</field>
             <field name="type">ir.actions.act_window</field>
@@ -192,7 +192,7 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','draft')]</field>
         </record>
-        
+
         <record id="action_repair_progress_tree" model="ir.actions.act_window">
             <field name="name">Repairs in progress</field>
             <field name="type">ir.actions.act_window</field>
@@ -219,19 +219,19 @@
             <field name="view_mode">tree,form</field>
             <field name="domain">[('state','=','2binvoiced')]</field>
         </record>
-        
+
         <menuitem action="action_repair_order_tree" id="menu_repair_order" parent="mrp.menu_mrp_root" name="Repairs"/>
-        
+
         <menuitem action="action_repair_quotation_tree" id="menu_repair_quotation" parent="menu_repair_order"/>
 
         <menuitem action="action_repair_progress_tree" id="menu_repair_progress" parent="menu_repair_order"/>
 
         <menuitem action="action_repair_ready_tree" id="menu_repair_ready" parent="menu_repair_order"/>
-    	
+
     	<menuitem action="action_repair_2binvoiced_tree" id="menu_repair_2binvoiced" parent="menu_repair_order"/>
-    	
+
     	<menuitem action="action_repair_order_form" id="menu_repair_form" parent="menu_repair_order" sequence = "50"/>
-    	
-    	
+
+
     </data>
 </openerp>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 3255e64f354..5c9eedd0c1b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -180,7 +180,7 @@
                             <field name="price_unit"/>
                             <field name="account_analytic_id"/>
                             <field name="price_subtotal" readonly="1"/>
-                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False)]"/>
+                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','=','purchase')]"/>
                         </page>
                         <page string="Notes">
                             <field colspan="4" name="notes" nolabel="1"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index a2a3cc511d3..b4de47617b8 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -140,7 +140,7 @@
                                             <field name="type"/>
                                             <field name="delay" select="2"/>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
                                             <separator colspan="4" string="States"/>
                                             <field name="state" select="2"/>
                                             <group col="3" colspan="2">
@@ -398,7 +398,7 @@
                             <field name="type"/>
                             <field name="delay" select="2"/>
                             <field name="price_subtotal"/>
-                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]"/>
+                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">