From 3c0cf6275aa2afa6ef6c914970c600d78edde2e1 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 23 Jan 2009 00:15:05 +0100
Subject: [PATCH] bugfix

bzr revid: fp@tinyerp.com-20090122231505-xidgv6zdgduwxn32
---
 addons/account/account.py             |  3 ++-
 addons/auction/auction_view.xml       | 14 +++++++-------
 addons/mrp_repair/mrp_repair_view.xml |  4 ++--
 addons/purchase/purchase_view.xml     |  2 +-
 addons/sale/sale_view.xml             |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index d618830af72..9f2a04dedb3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1267,7 +1267,7 @@ class account_tax(osv.osv):
         '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."),
-        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase')], 'Tax Use in')
+        'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
     def search(self, cr, uid, args, offset=0, limit=None, order=None,
@@ -1301,6 +1301,7 @@ class account_tax(osv.osv):
         'amount': lambda *a: 0,
         'price_include': lambda *a: 0,
         'active': lambda *a: 1,
+        'type_tax_use': lambda *a: 'all',
         'sequence': lambda *a: 1,
         'tax_group': lambda *a: 'vat',
         'ref_tax_sign': lambda *a: 1,
diff --git a/addons/auction/auction_view.xml b/addons/auction/auction_view.xml
index d45cc8e1612..aaa4c8b1e6c 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'),('type_tax_use','=','sale')]"/>
-				<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','=','purchase')]"/>
+				<field name="seller_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','purchase')]"/>
+				<field name="buyer_costs" domain="[('parent_id','=',False),('domain','=','auction'),('type_tax_use','&lt;&gt;','sale')]"/>
 				<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),('type_tax_use','=','purchase')]"/>
+				<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
 				<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),('type_tax_use','=','purchase')]"/>
+					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
 					<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),('type_tax_use','=','purchase')]"/>
+					<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
 					<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),('type_tax_use','=','sale')]"/>
+						<field name="tax_id" domain="[('domain','=','auction'),('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
 						<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),('type_tax_use','=','purchase')]"/>
+									<field name="author_right" domain="[('domain','=','sabam'),('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
 									<field name="product_id" domain="[('sale_ok','=',True)]"/>
 									<field name="state" readonly="1"/>
 								</page><page string="Photos">
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 68754d1e789..cd73b312fd9 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -44,7 +44,7 @@
     		                                    <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <separator colspan="4" string="States"/>
                                             <field name="state"/>
 										</page>
@@ -113,7 +113,7 @@
     		                                    <field name="invoiced"/>
                                             </group>
                                             <newline/>
-                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','=','sale')]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&gt;&gt;','purchase')]"/>
                                          </page>
 										 <page string="History" groups="base.group_extended">
                                             <field colspan="4" name="invoice_line_id" />
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 5c9eedd0c1b..f39765939f0 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),('type_tax_use','=','purchase')]"/>
+                            <field colspan="4" name="taxes_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','sale')]"/>
                         </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 b4de47617b8..ec096b45d3c 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),('type_tax_use','=','sale')]"/>
+                                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                                             <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),('type_tax_use','=','sale')]"/>
+                            <field colspan="4" name="tax_id" domain="[('parent_id','=',False),('type_tax_use','&lt;&gt;','purchase')]"/>
                             <separator colspan="4" string="States"/>
                             <field name="state" select="2"/>
                             <group col="2" colspan="2">