diff --git a/addons/account/account.py b/addons/account/account.py
index 61319f7f973..ca41c8d4813 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -1567,8 +1567,41 @@ class account_tax(osv.osv):
                 cur_price_unit+=amount2
         return res
 
-    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+    def compute_all(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        """
+        RETURN: {
+                'total': 0.0,                # Total without taxes
+                'total_included: 0.0,        # Total with taxes
+                'taxes': []                  # List of taxes, see compute for the format
+            }
+        """
+        precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
+        totalin = totalex = round(price_unit * quantity, precision)
+        totalex = totalex = round(price_unit * quantity, precision)
+        tin = []
+        tex = []
+        for tax in taxes:
+            if tax.price_include:
+                tin.append(tax)
+            else:
+                tex.append(tax)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, price_unit, quantity, address_id=address_id, product=product, partner=partner)
+        for r in tin:
+            totalex -= r['amount']
+        for r in tex:
+            totalin += r['amount']
+        return {
+            'total': totalex,
+            'total_included': totalin,
+            'taxes': tin + tex
+        }
 
+    def compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        print "Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included"
+        return self._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -1585,7 +1618,6 @@ class account_tax(osv.osv):
             else:
                 r['amount'] = round(r['amount'] * quantity, self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
                 total += r['amount']
-
         return res
 
     def _unit_compute_inv(self, cr, uid, taxes, price_unit, address_id=None, product=None, partner=None):
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 77369bdca25..4c4a3f3a9ef 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -63,6 +63,7 @@
                             <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id)]" name="account_analytic_id" groups="base.group_user,base.group_extended"/>
                             <newline/>
                             <field name="price_subtotal"/>
+
                             <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                             <field colspan="4" name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]"/>
                         </page>
@@ -146,7 +147,7 @@
                         <field name="number" readonly="1"/>
                         <field name="type" invisible="1"/>
                         <field name="currency_id" domain="[('company_id','=', company_id)]" on_change="onchange_currency_id(currency_id, company_id)" width="50"/>
-                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change Currency"/>
+                        <button name="%(action_account_change_currency)d" type="action" icon="gtk-apply" string="Change"/>
                         <newline/>
                         <field name="partner_id" domain="[('supplier','=', 1)]" on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank,company_id)" context="{'default_customer': 0}"/>
                         <field domain="[('partner_id','=',partner_id)]" name="address_invoice_id"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a2729676fe3..5e8edd306e3 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -623,7 +623,7 @@
             <field name="arch" type="xml">
                 <tree string="Account Tax">
                     <field name="name"/>
-                    <field name="price_include"/>
+                    <field name="price_include" groups="base.group_extended"/>
                     <field name="description"/>
                 </tree>
             </field>
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index d8205ababa7..5ef80d40560 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -333,6 +333,7 @@ class account_invoice(osv.osv):
                 raise orm.except_orm(_('Configuration Error!'),
                      _('There is no Accounting Journal of type Sale/Purchase defined!'))
             else:
+                raise
                 raise orm.except_orm(_('UnknownError'), str(e))
 
     def confirm_paid(self, cr, uid, ids, context=None):
@@ -1131,17 +1132,17 @@ account_invoice()
 class account_invoice_line(osv.osv):
     def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
         res = {}
-        cur_obj=self.pool.get('res.currency')
+        tax_obj = self.pool.get('account.tax')
+        cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
+            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity)
+            res[line.id] = taxes['total']
             if line.invoice_id:
-                res[line.id] = line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0)
                 cur = line.invoice_id.currency_id
                 res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
-            else:
-                res[line.id] = round(line.price_unit * line.quantity * (1-(line.discount or 0.0)/100.0),self.pool.get('decimal.precision').precision_get(cr, uid, 'Account'))
         return res
 
-
     def _price_unit_default(self, cr, uid, context=None):
         if context is None:
             context = {}
@@ -1155,7 +1156,7 @@ class account_invoice_line(osv.osv):
                     taxes = l[2].get('invoice_line_tax_id')
                     if len(taxes[0]) >= 3 and taxes[0][2]:
                         taxes = tax_obj.browse(cr, uid, taxes[0][2])
-                        for tax in tax_obj.compute(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False)):
+                        for tax in tax_obj.compute_all(cr, uid, taxes, p,l[2].get('quantity'), context.get('address_invoice_id', False), l[2].get('product_id', False), context.get('partner_id', False))['taxes']:
                             t = t - tax['amount']
             return t
         return 0
@@ -1170,7 +1171,8 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null'),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Account')),
-        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal',store=True, type="float", digits_compute= dp.get_precision('Account')),
+        'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', type="float",
+            digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Account')),
         'invoice_line_tax_id': fields.many2many('account.tax', 'account_invoice_line_tax', 'invoice_line_id', 'tax_id', 'Taxes', domain=[('parent_id','=',False)]),
@@ -1339,10 +1341,10 @@ class account_invoice_line(osv.osv):
                 continue
             res.append(mres)
             tax_code_found= False
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id,
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
                     (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
                     line.quantity, inv.address_invoice_id.id, line.product_id,
-                    inv.partner_id):
+                    inv.partner_id)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
                     tax_code_id = tax['base_code_id']
@@ -1445,7 +1447,7 @@ class account_invoice_tax(osv.osv):
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id)['taxes']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']
@@ -1507,11 +1509,7 @@ account_invoice_tax()
 class res_partner(osv.osv):
     """ Inherits partner and adds invoice information in the partner form """
     _inherit = 'res.partner'
-
     _columns = {
-                'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
-                }
-
+        'invoice_ids': fields.one2many('account.invoice.line', 'partner_id', 'Invoices', readonly=True),
+    }
 res_partner()
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
deleted file mode 100644
index f96eb08f2fe..00000000000
--- a/addons/account_tax_include/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    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/>.
-#
-##############################################################################
-
-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
deleted file mode 100644
index 5bb1a2e2399..00000000000
--- a/addons/account_tax_include/__openerp__.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    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/>.
-#
-##############################################################################
-
-
-{
-    'name': 'Invoices and prices with taxes included',
-    'version': '1.0',
-    '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': ['account_tax_include_view.xml'],
-    'demo_xml': [],
-    'installable': True,
-    'active': False,
-    'certificate': '0070514190381',
-}
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account_tax_include/account_tax_include.py b/addons/account_tax_include/account_tax_include.py
deleted file mode 100644
index d84a21afff7..00000000000
--- a/addons/account_tax_include/account_tax_include.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    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/>.
-#
-##############################################################################
-import time
-
-from osv import fields, osv
-import decimal_precision as dp
-
-class account_invoice(osv.osv):
-    _inherit = "account.invoice"
-    _columns = {
-        'price_type': fields.selection([('tax_included','Tax included'),
-                                        ('tax_excluded','Tax excluded')],
-                                        'Price method', required=True, readonly=True,
-                                        states={'draft':[('readonly',False)]}),
-    }
-    _defaults = {
-        'price_type': 'tax_excluded',
-    }
-
-    def refund(self, cr, uid, ids, date=None, period_id=None, description=None):
-        map_old_new = {}
-        refund_ids = []
-        for old_inv_id in ids:
-            new_id = super(account_invoice,self).refund(cr, uid, ids, date=date, period_id=period_id, description=description)
-            refund_ids += new_id
-            map_old_new[old_inv_id] = new_id[0]
-
-        for old_inv_id in map_old_new.keys():
-            old_inv_record = self.read(cr, uid, [old_inv_id], ['price_type'])[0]['price_type']
-            self.write(cr, uid, [map_old_new[old_inv_id]], {'price_type' : old_inv_record})
-        return refund_ids
-
-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.
-        """
-        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)
-            res[line.id] = {
-                'price_subtotal': 0.0,
-                'price_subtotal_incl': 0.0,
-                'data': []
-            }
-            if not line.quantity:
-                continue
-            if line.invoice_id:
-                product_taxes = []
-                if line.product_id:
-                    if line.invoice_id.type in ('out_invoice', 'out_refund'):
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.taxes_id)
-                    else:
-                        product_taxes = filter(lambda x: x.price_include, line.product_id.supplier_taxes_id)
-
-                if ((set(product_taxes) == set(line.invoice_line_tax_id)) or not product_taxes) and (line.invoice_id.price_type == 'tax_included'):
-                    res[line.id]['price_subtotal_incl'] = cur and cur_obj.round(cr, uid, cur, res_init[line.id]) or res_init[line.id]
-                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'], 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]
-
-            if res[line.id]['price_subtotal']:
-                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)
-            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'], 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):
-        if context is None:
-            context = {}
-        if 'check_total' in context:
-            t = context['check_total']
-            if context.get('price_type', False) == 'tax_included':
-                for l in context.get('invoice_line', {}):
-                    if len(l) >= 3 and l[2]:
-                        p = l[2].get('price_unit', 0) * (1-l[2].get('discount', 0)/100.0)
-                        t = t - (p * l[2].get('quantity'))
-                return t
-            return super(account_invoice_line, self)._price_unit_default(cr, uid, context)
-        return 0
-
-    def _get_invoice(self, cr, uid, ids, context):
-        result = {}
-        for inv in self.pool.get('account.invoice').browse(cr, uid, ids, context=context):
-            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 {
-                'type':'src',
-                'name':line.name,
-                'price_unit':(line.quantity) and (line.price_subtotal / line.quantity) or line.price_subtotal,
-                'quantity':line.quantity,
-                'price':line.price_subtotal,
-                'account_id':line.account_id.id,
-                '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:
-            context = {}
-        # if the tax is already included, just return the value without calculations
-        if context.get('price_type', False) == 'tax_included':
-            return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-        else:
-            return super(account_invoice_line, self).product_id_change_unit_price_inv(cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=context)
-
-    def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
-        # note: will call product_id_change_unit_price_inv with context...
-
-        # Temporary trap, for bad context that came from koo:
-        # if isinstance(context, str):
-        #       print "str context:", context
-
-        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):
-        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 = line_obj._amount_line2(cr, uid, [line.id], [], [], context)[line.id]
-            for tax in data['data']:
-                val={}
-                val['invoice_id'] = inv.id
-                val['name'] = tax['name']
-                val['amount'] = tax['amount']
-                val['manual'] = False
-                val['sequence'] = tax['sequence']
-                val['base'] = tax['price_unit'] * line['quantity']
-
-                if inv.type in ('out_invoice','in_invoice'):
-                    val['base_code_id'] = tax['base_code_id']
-                    val['tax_code_id'] = tax['tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_collected_id'] or line.account_id.id
-                else:
-                    val['base_code_id'] = tax['ref_base_code_id']
-                    val['tax_code_id'] = tax['ref_tax_code_id']
-                    val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False)
-                    val['account_id'] = tax['account_paid_id'] or line.account_id.id
-
-                key = (val['tax_code_id'], val['base_code_id'], val['account_id'])
-                if not key in tax_grouped:
-                    tax_grouped[key] = val
-                else:
-                    tax_grouped[key]['amount'] += val['amount']
-                    tax_grouped[key]['base'] += val['base']
-                    tax_grouped[key]['base_amount'] += val['base_amount']
-                    tax_grouped[key]['tax_amount'] += val['tax_amount']
-
-        for t in tax_grouped.values():
-            t['amount'] = cur_obj.round(cr, uid, cur, t['amount'])
-            t['base_amount'] = cur_obj.round(cr, uid, cur, t['base_amount'])
-            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:
\ No newline at end of file
diff --git a/addons/account_tax_include/account_tax_include_view.xml b/addons/account_tax_include/account_tax_include_view.xml
deleted file mode 100644
index 32aea6802d1..00000000000
--- a/addons/account_tax_include/account_tax_include_view.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-
-        <record id="account_tax_view_price" model="ir.ui.view">
-            <field name="name">account.tax.exlcuded.view.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="python_compute" position="after">
-                    <separator colspan="4" string="Compute Code for Taxes included prices"/>
-                    <field colspan="4" name="python_compute_inv" nolabel="1"/>
-                </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>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_form"/>
-            <field name="arch" type="xml">
-                <field name="payment_term" position="after">
-                    <field name="price_type"/>
-                </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>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field colspan="4" default_get="{'check_total': check_total, 'invoice_line': invoice_line, 'address_invoice_id': address_invoice_id, 'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False}" name="invoice_line" nolabel="1" position="before">
-                    <field name="price_type"/>
-                </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>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </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>
-            <field name="model">account.invoice</field>
-            <field name="inherit_id" ref="account.invoice_supplier_form"/>
-            <field name="arch" type="xml">
-                <field name="product_id" position="replace">
-                    <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,{'price_type':parent.price_type})"/>
-                </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>
-            <field name="type">tree</field>
-            <field name="inherit_id" ref="account.view_invoice_line_tree"/>
-            <field name="arch" type="xml">
-                <field name="price_subtotal" position="after">
-                    <field name="price_subtotal_incl"/>
-                </field>
-            </field>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/account_tax_include/i18n/account_tax_include.pot b/addons/account_tax_include/i18n/account_tax_include.pot
deleted file mode 100644
index e19a7fd9712..00000000000
--- a/addons/account_tax_include/i18n/account_tax_include.pot
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01:51+0000\n"
-"PO-Revision-Date: 2009-08-28 16:01:51+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
diff --git a/addons/account_tax_include/i18n/ar.po b/addons/account_tax_include/i18n/ar.po
deleted file mode 100644
index 2ea3d31ed0a..00000000000
--- a/addons/account_tax_include/i18n/ar.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bg.po b/addons/account_tax_include/i18n/bg.po
deleted file mode 100644
index fff9c26bf05..00000000000
--- a/addons/account_tax_include/i18n/bg.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:06+0000\n"
-"Last-Translator: lem0na <nickyk@gmx.net>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Невалиден XML за преглед на архитектурата"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Начин на изчисляване"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С включен данък"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Без данък"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/bs.po b/addons/account_tax_include/i18n/bs.po
deleted file mode 100644
index ab16e300b28..00000000000
--- a/addons/account_tax_include/i18n/bs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-10 12:26+0000\n"
-"Last-Translator: adnan <adnankraljic@yahoo.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neodgovarajući XML za arhitekturu prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna procedura"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi i cijene sa uključenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Porez nije uključen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Izračunaj cijene sa porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub-ukupno"
diff --git a/addons/account_tax_include/i18n/ca.po b/addons/account_tax_include/i18n/ca.po
deleted file mode 100644
index 249686fa488..00000000000
--- a/addons/account_tax_include/i18n/ca.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-29 06:30+0000\n"
-"Last-Translator: Jordi Esteve - http://www.zikzakmedia.com "
-"<jesteve@zikzakmedia.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invàlid per a la definició de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Mètode preu"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures i preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impostos inclosos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impostos exclosos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Codi pel càlcul dels preus amb impostos inclosos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/cs.po b/addons/account_tax_include/i18n/cs.po
deleted file mode 100644
index 2cc4bc1bcc0..00000000000
--- a/addons/account_tax_include/i18n/cs.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-26 09:10+0000\n"
-"Last-Translator: Martin Volf <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-28 03:44+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatný XML pro zobrazení architektury"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda určování cen"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury a ceny včetně daní"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Daně zahrnuty"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Daně vyloučeny"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Výpočetní kód pro ceny včetně daně"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Mezisoučet"
diff --git a/addons/account_tax_include/i18n/de.po b/addons/account_tax_include/i18n/de.po
deleted file mode 100644
index fa5d2ce1610..00000000000
--- a/addons/account_tax_include/i18n/de.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-09 13:20+0000\n"
-"Last-Translator: Ferdinand @ ChriCar <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Fehlerhafter xml Code für diese Ansicht!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Preismethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Rechnungen und Preise mit inkludierten Steuern"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Steuer inklusive"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Steuern exklusive"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Berechnungsgrundlage (inkl. Steuer)"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Zwischensumme"
diff --git a/addons/account_tax_include/i18n/el.po b/addons/account_tax_include/i18n/el.po
deleted file mode 100644
index 6d3910fb43b..00000000000
--- a/addons/account_tax_include/i18n/el.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:27+0000\n"
-"Last-Translator: Makis Nicolaou <mark.nicolaou@gmail.com>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Άκυρο XML για την αρχιτεκτονική όψης!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Μέθοδος Τιμής"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Τιμολόγια και τιμές με ενσωμάτωση φόρων"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Συμπερίληψη φόρου"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Εξαιρούνται φόροι"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Κωδικός Υπολογισμού για Φόρους που εμπεριέχονται στις τιμές"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Υποσύνολο"
diff --git a/addons/account_tax_include/i18n/en_AU.po b/addons/account_tax_include/i18n/en_AU.po
deleted file mode 100644
index 892197cf816..00000000000
--- a/addons/account_tax_include/i18n/en_AU.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (Australia) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:19+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (Australia) <en_AU@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/en_GB.po b/addons/account_tax_include/i18n/en_GB.po
deleted file mode 100644
index 0341993acca..00000000000
--- a/addons/account_tax_include/i18n/en_GB.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-05-09 21:20+0000\n"
-"Last-Translator: MoLE <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-10 04:17+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalid XML for View Architecture!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Price method"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Invoices and prices with taxes included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tax included"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tax excluded"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Compute Code for Taxes included prices"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es.po b/addons/account_tax_include/i18n/es.po
deleted file mode 100644
index 4fa9a9219c7..00000000000
--- a/addons/account_tax_include/i18n/es.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-24 20:17+0000\n"
-"Last-Translator: Borja López Soilán (Pexego) <borjals@pexego.es>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos excluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para el cálculo de precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/es_AR.po b/addons/account_tax_include/i18n/es_AR.po
deleted file mode 100644
index 4d7230f383b..00000000000
--- a/addons/account_tax_include/i18n/es_AR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-14 18:28+0000\n"
-"Last-Translator: Silvana Herrera <sherrera@thymbra.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para la definición de la vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método de precio"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas y precios con impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Impuestos incluidos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Impuestos no incluidos"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código del cálculo para precios con impuestos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/et.po b/addons/account_tax_include/i18n/et.po
deleted file mode 100644
index 6bd6d5cdaa7..00000000000
--- a/addons/account_tax_include/i18n/et.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 16:28+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Vigane XML vaate arhitektuurile!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinna meetod"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Makse sisaldavad arved ja hinnad"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Maksuga"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Maksuta"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Arvuta kood maksuga hindadele"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Vahesumma"
diff --git a/addons/account_tax_include/i18n/fi.po b/addons/account_tax_include/i18n/fi.po
deleted file mode 100644
index 6e3c999484d..00000000000
--- a/addons/account_tax_include/i18n/fi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Finnish translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-17 10:06+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Finnish <fi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Virheellinen XML näkymä-arkkitehtuurille!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Hinnan tyyppi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Laskut ja hinnat veroilla"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Vero sisältyy"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Ilman veroa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Laske koodi hinnoille joissa on vero mukana"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Välisumma"
diff --git a/addons/account_tax_include/i18n/fr.po b/addons/account_tax_include/i18n/fr.po
deleted file mode 100644
index c26f075fd75..00000000000
--- a/addons/account_tax_include/i18n/fr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valide pour l'architecture de la vue"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Méthode de prix"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Factures et prix avec taxes comprises"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe comprise"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Hors-taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Code de calcul pour les prix taxes comprises"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sous-total"
diff --git a/addons/account_tax_include/i18n/gl.po b/addons/account_tax_include/i18n/gl.po
deleted file mode 100644
index e677bb72d35..00000000000
--- a/addons/account_tax_include/i18n/gl.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# translation of account-tax-include-es.po to Galego
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2009.
-msgid ""
-msgstr ""
-"Project-Id-Version: account-tax-include-es\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:37+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "¡XML non válido para a definición da vista!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método prezo"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prezos con impostos incluídos"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código para o cálculo dos impostos en prezos incluídos"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/hr.po b/addons/account_tax_include/i18n/hr.po
deleted file mode 100644
index ac67721e45b..00000000000
--- a/addons/account_tax_include/i18n/hr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Dragan Jovanovic <dragan.jovanovic@strojotex.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Nevažeći XML za Arhitekturu Prikaza!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cjenovna metoda"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi i cijene sa uključenim porezom"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Porez uključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nije uključen porez"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Kod za izračun cijena sa uključenim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Podzbroj"
diff --git a/addons/account_tax_include/i18n/hu.po b/addons/account_tax_include/i18n/hu.po
deleted file mode 100644
index 2ea3d31ed0a..00000000000
--- a/addons/account_tax_include/i18n/hu.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/id.po b/addons/account_tax_include/i18n/id.po
deleted file mode 100644
index bcb9daf3353..00000000000
--- a/addons/account_tax_include/i18n/id.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-09 13:44+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
deleted file mode 100644
index 0e304d60033..00000000000
--- a/addons/account_tax_include/i18n/it.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 08:32+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML non valido per Visualizzazione Architettura!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Tasse incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tasse escluse"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
deleted file mode 100644
index 118579be264..00000000000
--- a/addons/account_tax_include/i18n/ko.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Korean translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 16:43+0000\n"
-"Last-Translator: ekodaq <ceo@ekosdaq.com>\n"
-"Language-Team: Korean <ko@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "뷰 아키텍처의 XML이 유효하지 않습니다."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "가격 방식"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "세금이 포함된 인보이스와 가격"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "세금 포함"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "세금 제외"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "세금 포함 가격을 위한 컴퓨터 코드"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "서브토털"
diff --git a/addons/account_tax_include/i18n/lt.po b/addons/account_tax_include/i18n/lt.po
deleted file mode 100644
index 110d0fdd041..00000000000
--- a/addons/account_tax_include/i18n/lt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:54+0000\n"
-"Last-Translator: Donatas Stonys TeraxIT <donatelonow@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
deleted file mode 100644
index a5c550807f5..00000000000
--- a/addons/account_tax_include/i18n/nl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-12-14 21:11+0000\n"
-"Last-Translator: Pieter J. Kersten (EduSense BV) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor weergave!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Prijsmethode"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturen en prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Inclusief belastingen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Exclusief belastingen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Bereken code voor prijzen inclusief belastingen"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotaal"
diff --git a/addons/account_tax_include/i18n/nl_BE.po b/addons/account_tax_include/i18n/nl_BE.po
deleted file mode 100644
index 1854bbfc9d4..00000000000
--- a/addons/account_tax_include/i18n/nl_BE.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-04-24 15:12+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/oc.po b/addons/account_tax_include/i18n/oc.po
deleted file mode 100644
index 5d0f82c83d6..00000000000
--- a/addons/account_tax_include/i18n/oc.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Occitan (post 1500) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-04-29 14:21+0000\n"
-"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary@yahoo.fr>\n"
-"Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-05-05 03:47+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid per l'arquitectura de la vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metòde de prètz"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e prèses amb taxas inclusas"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxa inclusa"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fòra taxa"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Còde de calcul pels prèses amb taxas compresas"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sostotal"
diff --git a/addons/account_tax_include/i18n/pl.po b/addons/account_tax_include/i18n/pl.po
deleted file mode 100644
index aa4daff1f43..00000000000
--- a/addons/account_tax_include/i18n/pl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-21 15:43+0000\n"
-"Last-Translator: Andrzej MoST (Marcin Ostajewski) <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda wyceny"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktury i ceny zawierające podatki."
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Zawiera podatek"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Nie zawiera podatku"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Wylicz kod dla cen z podatkiem"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Suma częściowa"
diff --git a/addons/account_tax_include/i18n/pt.po b/addons/account_tax_include/i18n/pt.po
deleted file mode 100644
index 23c89d66568..00000000000
--- a/addons/account_tax_include/i18n/pt.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-28 23:29+0000\n"
-"Last-Translator: Paulino <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML inválido para a arquitectura da vista"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Método do preço"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturas e preços com imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Imposto incluído"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Imposto excluído"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Código de cálculo para preços com imposto incluído"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/pt_BR.po b/addons/account_tax_include/i18n/pt_BR.po
deleted file mode 100644
index 165ddba21ef..00000000000
--- a/addons/account_tax_include/i18n/pt_BR.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 12:28+0000\n"
-"Last-Translator: Pedro_Maschio <pedro.bicudo@tgtconsult.com.br>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Invalido XML para Arquitetura da View"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/ro.po b/addons/account_tax_include/i18n/ro.po
deleted file mode 100644
index 53f0beb8e17..00000000000
--- a/addons/account_tax_include/i18n/ro.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-28 16:40+0000\n"
-"Last-Translator: geopop65 <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "XML invalid pentru arhitectura machetei de afișare !"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda de pret"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Facturi şi preţuri cu taxele incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Taxe incluse"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Fără taxe"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Calcul cod pentru preţuri cu taxe incluse"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/ru.po b/addons/account_tax_include/i18n/ru.po
deleted file mode 100644
index e61c38be4a1..00000000000
--- a/addons/account_tax_include/i18n/ru.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 13:39+0000\n"
-"Last-Translator: Sergei Kostigoff <sergei.kostigoff@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильный XML для просмотра архитектуры!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Метод расчета цены"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Счета и цены с налогами"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "С налогами"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "До налогов"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Промежуточный итог"
diff --git a/addons/account_tax_include/i18n/sk.po b/addons/account_tax_include/i18n/sk.po
deleted file mode 100644
index 8518e5bcb1f..00000000000
--- a/addons/account_tax_include/i18n/sk.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Slovak translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-06 14:22+0000\n"
-"Last-Translator: Peter Kohaut <peter.kohaut@gmail.com>\n"
-"Language-Team: Slovak <sk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neplatné XML pre zobrazenie architektúry!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktúry a ceny zahrnuté s DPH"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Medzisúčet"
diff --git a/addons/account_tax_include/i18n/sl.po b/addons/account_tax_include/i18n/sl.po
deleted file mode 100644
index defa396c48f..00000000000
--- a/addons/account_tax_include/i18n/sl.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 09:23+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Neveljaven XML za arhitekturo pogleda."
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metoda cene"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Računi in cene z vključenimi davki"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Davek vključen"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Davek ni vključen"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "Koda izračuna za davke v cenah"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Delna vsota"
diff --git a/addons/account_tax_include/i18n/sq.po b/addons/account_tax_include/i18n/sq.po
deleted file mode 100644
index a2b9ac5d219..00000000000
--- a/addons/account_tax_include/i18n/sq.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 15:23:46+0000\n"
-"PO-Revision-Date: 2009-08-28 15:23:46+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
deleted file mode 100644
index 8991458538f..00000000000
--- a/addons/account_tax_include/i18n/sv.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 15:44+0000\n"
-"Last-Translator: Treecko <Unknown>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Felaktig XML för Vyarkitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tlh.po b/addons/account_tax_include/i18n/tlh.po
deleted file mode 100644
index 901fb52fa52..00000000000
--- a/addons/account_tax_include/i18n/tlh.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0_rc3\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-02-03 06:24+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
deleted file mode 100644
index fae1694aa91..00000000000
--- a/addons/account_tax_include/i18n/tr.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-02-14 21:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Görüntüleme mimarisi için Geçersiz XML"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Fiyat Yöntemi"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Vergiler dahil fiyat ve faturalar"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "KDV Dahil"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "KDV Hariç"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Alt Toplam"
diff --git a/addons/account_tax_include/i18n/uk.po b/addons/account_tax_include/i18n/uk.po
deleted file mode 100644
index 20833c98611..00000000000
--- a/addons/account_tax_include/i18n/uk.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.0\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-09-08 15:16+0000\n"
-"Last-Translator: Eugene Babiy <eugene.babiy@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Неправильний XML для Архітектури Вигляду!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/account_tax_include/i18n/vi.po b/addons/account_tax_include/i18n/vi.po
deleted file mode 100644
index 164b9c65f98..00000000000
--- a/addons/account_tax_include/i18n/vi.po
+++ /dev/null
@@ -1,104 +0,0 @@
-# Translation of OpenERP Server.
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:00:38+0000\n"
-"PO-Revision-Date: 2009-08-28 16:00:38+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
-
diff --git a/addons/account_tax_include/i18n/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
deleted file mode 100644
index b7cad52c049..00000000000
--- a/addons/account_tax_include/i18n/zh_CN.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.6\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-03-20 07:29+0000\n"
-"Last-Translator: Black Jack <onetimespeed@hotmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "无效的视图结构XML文件!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "价格规则"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "发票和含税价"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "含税"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "不含税"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "含税价格计算代码"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "小计"
-
-#~ msgid ""
-#~ "Allow the user to work tax included prices.\n"
-#~ "Especially useful for b2c businesses.\n"
-#~ "    \n"
-#~ "This module implement the modification on the invoice form.\n"
-#~ msgstr ""
-#~ "允许用户使用含税价格\n"
-#~ "特别适用于B2C商务\n"
-#~ "\n"
-#~ "这模块使发票的格式生效\n"
diff --git a/addons/account_tax_include/i18n/zh_TW.po b/addons/account_tax_include/i18n/zh_TW.po
deleted file mode 100644
index a2ba31339c4..00000000000
--- a/addons/account_tax_include/i18n/zh_TW.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account_tax_include
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.4\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-01-30 12:43+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-04-17 04:05+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr ""
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr ""
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr ""
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr ""
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr ""
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index c2e871f685a..4e83c369222 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -59,7 +59,7 @@ class purchase_order(osv.osv):
             val = val1 = 0.0
             cur=order.pricelist_id.currency_id
             for line in order.order_line:
-                for c in self.pool.get('account.tax').compute(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id):
+                for c in self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, order.partner_address_id.id, line.product_id, order.partner_id)['taxes']:
                     val+= c['amount']
                 val1 += line.price_subtotal
             res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val)
@@ -569,12 +569,15 @@ class purchase_order(osv.osv):
 purchase_order()
 
 class purchase_order_line(osv.osv):
-    def _amount_line(self, cr, uid, ids, prop, unknow_none,unknow_dict):
+    def _amount_line(self, cr, uid, ids, prop, arg,context):
         res = {}
         cur_obj=self.pool.get('res.currency')
-        for line in self.browse(cr, uid, ids):
+        tax_obj = self.pool.get('account.tax')
+        for line in self.browse(cr, uid, ids, context=context):
+            price = line.price_unit * line.product_qty
+            taxes = tax_obj.compute_all(cr, uid, line.taxes_id, price, line.product_qty)
             cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, line.price_unit * line.product_qty)
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     _columns = {
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index e684a1a6c1d..07c66ef91dc 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -72,7 +72,7 @@ class sale_order(osv.osv):
         if context is None:
             context = {}
         val = 0.0
-        for c in self.pool.get('account.tax').compute(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id):
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.order_id.partner_invoice_id.id, line.product_id, line.order_id.partner_id)['taxes']:
             val += c['amount']
         return val
 
@@ -774,23 +774,16 @@ sale_order()
 # - update it on change product and unit price
 # - use it in report if there is a uos
 class sale_order_line(osv.osv):
-    def _amount_line_net(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
-        res = {}
-        for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
-        return res
-
     def _amount_line(self, cr, uid, ids, field_name, arg, context=None):
-        if context is None:
-            context = {}
         res = {}
+        context = context or {}
+        tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids, context=context):
-            res[line.id] = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+            price = line.price_unit * line.product_uom_qty * (1 - (line.discount or 0.0) / 100.0)
+            taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty)
             cur = line.order_id.pricelist_id.currency_id
-            res[line.id] = cur_obj.round(cr, uid, cur, res[line.id])
+            res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
         return res
 
     def _number_packages(self, cr, uid, ids, field_name, arg, context=None):
@@ -799,7 +792,7 @@ class sale_order_line(osv.osv):
         res = {}
         for line in self.browse(cr, uid, ids, context=context):
             try:
-                res[line.id] = int(line.product_uom_qty / line.product_packaging.qty)
+                res[line.id] = int((line.product_uom_qty+line.product_packaging.qty-0.0001) / line.product_packaging.qty)
             except:
                 res[line.id] = 1
         return res
@@ -816,7 +809,6 @@ class sale_order_line(osv.osv):
         'invoiced': fields.boolean('Invoiced', readonly=True),
         'procurement_id': fields.many2one('mrp.procurement', 'Procurement'),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft':[('readonly',False)]}),
-        'price_net': fields.function(_amount_line_net, method=True, string='Net Price', digits_compute= dp.get_precision('Sale Price')),
         'price_subtotal': fields.function(_amount_line, method=True, string='Subtotal', digits_compute= dp.get_precision('Sale Price')),
         'tax_id': fields.many2many('account.tax', 'sale_order_tax', 'order_line_id', 'tax_id', 'Taxes', readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([('make_to_stock', 'from stock'), ('make_to_order', 'on order')], 'Procurement Method', required=True, readonly=True, states={'draft':[('readonly',False)]}),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 4d82e8595ad..273a9504f48 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -183,7 +183,6 @@
                                     <field name="product_uom" string="UoM"/>
                                     <field name="discount"/>
                                     <field name="price_unit"/>
-                                    <field name="price_net"/>
                                     <field name="price_subtotal"/>
                                 </tree>
                             </field>
@@ -351,7 +350,6 @@
                     <field name="product_uom_qty" string="Qty"/>
                     <field name="product_uom" string="UoM"/>
                     <field name="salesman_id"/>
-                    <field name="price_net"/>
                     <field name="price_subtotal"/>
                     <field name="th_weight"/>
                     <field name="state"/>