diff --git a/addons/account/account.py b/addons/account/account.py
index 7a83f404c47..7938862acfb 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1348,7 +1348,6 @@ class account_tax(osv.osv):
         '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"),
         '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 if the price you use on the product and invoices includes this tax."),
         'type_tax_use': fields.selection([('sale','Sale'),('purchase','Purchase'),('all','All')], 'Tax Application', required=True)
 
     }
@@ -1381,7 +1380,6 @@ class account_tax(osv.osv):
         'applicable_type': lambda *a: 'true',
         'type': lambda *a: 'percent',
         'amount': lambda *a: 0,
-        'price_include': lambda *a: 0,
         'active': lambda *a: 1,
         'type_tax_use': lambda *a: 'all',
         'sequence': lambda *a: 1,
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 5e514041d1d..2ab119e59a7 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -596,7 +596,6 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
-                    <field name="price_include"/>
                     <field name="description"/>
                 </tree>
             </field>
@@ -628,7 +627,6 @@
                             <label colspan="2" nolabel="1" string="Keep empty to use the expense account"/>
                             <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"/>
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
index f239c0211d0..f96eb08f2fe 100644
--- a/addons/account_tax_include/__init__.py
+++ b/addons/account_tax_include/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import invoice_tax_incl
+import account_tax_include
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/account_tax_include/__openerp__.py b/addons/account_tax_include/__openerp__.py
index c173a85592c..5bb1a2e2399 100644
--- a/addons/account_tax_include/__openerp__.py
+++ b/addons/account_tax_include/__openerp__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,7 +15,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -26,14 +26,14 @@
     'category': 'Generic Modules/Accounting',
     'description': """Allow the user to work tax included prices.
 Especially useful for b2c businesses.
-    
+
 This module implement the modification on the invoice form.
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
     'depends': ['account'],
     'init_xml': [],
-    'update_xml': ['invoice_tax_incl.xml'],
+    'update_xml': ['account_tax_include_view.xml'],
     'demo_xml': [],
     'installable': True,
     'active': False,
diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/account_tax_include.py
similarity index 92%
rename from addons/account_tax_include/invoice_tax_incl.py
rename to addons/account_tax_include/account_tax_include.py
index 31f3d8a233a..6e0c9552694 100644
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/account_tax_include.py
@@ -18,14 +18,23 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 import time
-import netsvc
+
 from osv import fields, osv
-import ir
-from tools import config
 import decimal_precision as dp
 
+class account_tax(osv.osv):
+    _inherit = 'account.tax'
+    _description = 'Account Tax'
+    _columns = {
+        'price_include': fields.boolean('Tax Included in Price', help="Check this if the price you use on the product and invoices includes this tax."),
+                }
+
+    _defaults = {
+        'price_include': 0,
+                }
+account_tax()
+
 class account_invoice(osv.osv):
     _inherit = "account.invoice"
     _columns = {
@@ -35,7 +44,7 @@ class account_invoice(osv.osv):
                                         states={'draft':[('readonly',False)]}),
     }
     _defaults = {
-        'price_type': lambda *a: 'tax_excluded',
+        'price_type': 'tax_excluded',
     }
 
     def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
@@ -55,6 +64,7 @@ account_invoice()
 
 class account_invoice_line(osv.osv):
     _inherit = "account.invoice.line"
+
     def _amount_line2(self, cr, uid, ids, name, args, context=None):
         """
         Return the subtotal excluding taxes with respect to price_type.
@@ -62,6 +72,7 @@ class account_invoice_line(osv.osv):
         res = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        dec_obj = self.pool.get('decimal.precision')
         for line in self.browse(cr, uid, ids):
             cur = line.invoice_id and line.invoice_id.currency_id or False
             res_init = super(account_invoice_line, self)._amount_line(cr, uid, [line.id], name, args, context)
@@ -85,7 +96,7 @@ class account_invoice_line(osv.osv):
                 else:
                     res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
                     for tax in tax_obj.compute_inv(cr, uid, product_taxes, res_init[line.id]/line.quantity, line.quantity):
-                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+                        res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - round(tax['amount'], dec_obj.precision_get(cr, uid, 'Account'))
             else:
                 res[line.id]['price_subtotal'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
 
@@ -93,15 +104,15 @@ class account_invoice_line(osv.osv):
                 res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal']
                 for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal']/line.quantity, line.quantity):
                     res[line.id]['price_subtotal_incl'] = res[line.id]['price_subtotal_incl'] + tax['amount']
-                    res[line.id]['data'].append( tax)
+                    res[line.id]['data'].append(tax)
             else:
                 res[line.id]['price_subtotal'] = res[line.id]['price_subtotal_incl']
                 for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, res[line.id]['price_subtotal_incl']/line.quantity, line.quantity):
                     res[line.id]['price_subtotal'] = res[line.id]['price_subtotal'] - tax['amount']
                     res[line.id]['data'].append( tax)
 
-            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
-            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
+            res[line.id]['price_subtotal']= round(res[line.id]['price_subtotal'], dec_obj.precision_get(cr, uid, 'Account'))
+            res[line.id]['price_subtotal_incl']= round(res[line.id]['price_subtotal_incl'], dec_obj.precision_get(cr, uid, 'Account'))
         return res
 
     def _price_unit_default(self, cr, uid, context=None):
@@ -124,16 +135,17 @@ class account_invoice_line(osv.osv):
             for line in inv.invoice_line:
                 result[line.id] = True
         return result.keys()
+
     _columns = {
         'price_subtotal': fields.function(_amount_line2, method=True, string='Subtotal w/o tax', multi='amount',
             store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
         'price_subtotal_incl': fields.function(_amount_line2, method=True, string='Subtotal', multi='amount',
             store={'account.invoice':(_get_invoice,['price_type'],10), 'account.invoice.line': (lambda self,cr,uid,ids,c={}: ids, None,10)}),
-    }
+                }
 
     _defaults = {
         'price_unit': _price_unit_default,
-    }
+                }
 
     def move_line_get_item(self, cr, uid, line, context=None):
         return {
@@ -146,7 +158,7 @@ class account_invoice_line(osv.osv):
                 'product_id': line.product_id.id,
                 'uos_id':line.uos_id.id,
                 'account_analytic_id':line.account_analytic_id.id,
-            }
+                }
 
     def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
         if context is None:
@@ -167,23 +179,26 @@ class account_invoice_line(osv.osv):
         ctx = (context and context.copy()) or {}
         ctx.update({'price_type': ctx.get('price_type','tax_excluded')})
         return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=ctx)
+
 account_invoice_line()
 
 class account_invoice_tax(osv.osv):
     _inherit = "account.invoice.tax"
 
     def compute(self, cr, uid, invoice_id, context=None):
-        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
-        line_ids = map(lambda x: x.id, inv.invoice_line)
-
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        line_obj = self.pool.get('account.invoice.line')
+
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id)
+        line_ids = map(lambda x: x.id, inv.invoice_line)
+
         cur = inv.currency_id
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            data = self.pool.get('account.invoice.line')._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
+            data = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
             for tax in data['data']:
                 val={}
                 val['invoice_id'] = inv.id
@@ -221,8 +236,7 @@ class account_invoice_tax(osv.osv):
             t['tax_amount'] = cur_obj.round(cr, uid, cur, t['tax_amount'])
 
         return tax_grouped
+
 account_invoice_tax()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/account_tax_include/invoice_tax_incl.xml b/addons/account_tax_include/account_tax_include_view.xml
similarity index 77%
rename from addons/account_tax_include/invoice_tax_incl.xml
rename to addons/account_tax_include/account_tax_include_view.xml
index 946aa0687a2..98440d0a000 100644
--- a/addons/account_tax_include/invoice_tax_incl.xml
+++ b/addons/account_tax_include/account_tax_include_view.xml
@@ -1,7 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        
+
+	   <!-- Add price include (boolean) on tax form/tree view -->
+       <record id="view_tax_tree_inherit" model="ir.ui.view">
+            <field name="name">account.tax.tree.inherit.tree</field>
+            <field name="type">tree</field>
+            <field name="model">account.tax</field>
+            <field name="inherit_id" ref="account.view_tax_tree"/>
+            <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="price_include"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_tax_form_inherit" model="ir.ui.view">
+            <field name="name">account.tax.tree.inherit.form</field>
+            <field name="type">form</field>
+            <field name="model">account.tax</field>
+            <field name="inherit_id" ref="account.view_tax_form"/>
+            <field name="arch" type="xml">
+                <field name="sequence" position="after">
+                    <field groups="base.group_extended" name="price_include"/>
+                </field>
+            </field>
+        </record>
+        <!-- End -->
+
         <record id="account_tax_view_price" model="ir.ui.view">
             <field name="name">account.tax.exlcuded.view.form</field>
             <field name="type">form</field>
@@ -14,7 +40,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="account_invoice_view_price" model="ir.ui.view">
             <field name="name">account.invoice.vat.exlcuded.view.form</field>
             <field name="type">form</field>
@@ -26,7 +52,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="invoice_supplier_form_tax_include" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include</field>
             <field name="type">form</field>
@@ -38,7 +64,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="invoice_supplier_form_tax_include2" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include2</field>
             <field name="type">form</field>
@@ -50,7 +76,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="invoice_supplier_form_tax_include3" model="ir.ui.view">
             <field name="name">account.invoice.supplier.tax_include3</field>
             <field name="type">form</field>
@@ -62,7 +88,7 @@
                 </field>
             </field>
         </record>
-        
+
         <record id="view_invoice_line_tree" model="ir.ui.view">
             <field name="name">account.invoice.line.tree</field>
             <field name="model">account.invoice.line</field>
@@ -74,6 +100,6 @@
                 </field>
             </field>
         </record>
-        
+
     </data>
 </openerp>