From 2c63a39497a6a24e3db177d685e5e9191c0a632e Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Sun, 17 Oct 2010 22:31:19 +0200
Subject: [PATCH] [IMP] access rights, account tax include no more required,
some fixes
bzr revid: fp@tinyerp.com-20101017203119-2p80zc0nz6tjpxr8
---
addons/account/invoice.py | 11 +-
addons/account/security/ir.model.access.csv | 2 +-
addons/account_tax_include/__init__.py | 25 --
addons/account_tax_include/__openerp__.py | 44 ----
.../account_tax_include.py | 228 ------------------
.../account_tax_include_view.xml | 79 ------
.../i18n/account_tax_include.pot | 52 ----
addons/account_tax_include/i18n/ar.po | 52 ----
addons/account_tax_include/i18n/bg.po | 52 ----
addons/account_tax_include/i18n/bs.po | 52 ----
addons/account_tax_include/i18n/ca.po | 53 ----
addons/account_tax_include/i18n/cs.po | 52 ----
addons/account_tax_include/i18n/de.po | 52 ----
addons/account_tax_include/i18n/el.po | 53 ----
addons/account_tax_include/i18n/en_AU.po | 53 ----
addons/account_tax_include/i18n/en_GB.po | 53 ----
addons/account_tax_include/i18n/es.po | 52 ----
addons/account_tax_include/i18n/es_AR.po | 52 ----
addons/account_tax_include/i18n/es_EC.po | 52 ----
addons/account_tax_include/i18n/et.po | 52 ----
addons/account_tax_include/i18n/fi.po | 53 ----
addons/account_tax_include/i18n/fr.po | 52 ----
addons/account_tax_include/i18n/gl.po | 54 -----
addons/account_tax_include/i18n/hr.po | 52 ----
addons/account_tax_include/i18n/hu.po | 52 ----
addons/account_tax_include/i18n/id.po | 52 ----
addons/account_tax_include/i18n/it.po | 52 ----
addons/account_tax_include/i18n/ko.po | 53 ----
addons/account_tax_include/i18n/lt.po | 52 ----
addons/account_tax_include/i18n/nb.po | 53 ----
addons/account_tax_include/i18n/nl.po | 52 ----
addons/account_tax_include/i18n/nl_BE.po | 52 ----
addons/account_tax_include/i18n/oc.po | 53 ----
addons/account_tax_include/i18n/pl.po | 52 ----
addons/account_tax_include/i18n/pt.po | 52 ----
addons/account_tax_include/i18n/pt_BR.po | 52 ----
addons/account_tax_include/i18n/ro.po | 52 ----
addons/account_tax_include/i18n/ru.po | 52 ----
addons/account_tax_include/i18n/sk.po | 53 ----
addons/account_tax_include/i18n/sl.po | 52 ----
addons/account_tax_include/i18n/sq.po | 53 ----
addons/account_tax_include/i18n/sr.po | 53 ----
addons/account_tax_include/i18n/sv.po | 52 ----
addons/account_tax_include/i18n/tlh.po | 52 ----
addons/account_tax_include/i18n/tr.po | 52 ----
addons/account_tax_include/i18n/uk.po | 52 ----
addons/account_tax_include/i18n/vi.po | 53 ----
addons/account_tax_include/i18n/zh_CN.po | 63 -----
addons/account_tax_include/i18n/zh_TW.po | 52 ----
.../test/account_tax_include.yml | 93 -------
addons/account_voucher/account_voucher.py | 19 +-
addons/board/board_administration_view.xml | 4 +-
addons/product/security/product_security.xml | 2 +-
addons/project/board_project_view.xml | 17 +-
addons/project/project.py | 153 ++----------
addons/project/project_demo.xml | 2 +-
addons/project/project_view.xml | 13 +-
addons/project/report/project_report_view.xml | 2 +-
addons/project/security/ir.model.access.csv | 8 -
addons/project/security/project_security.xml | 8 -
addons/project_gtd/project_gtd_view.xml | 2 +-
.../project_gtd/security/ir.model.access.csv | 2 -
addons/project_issue/project_issue_view.xml | 2 +-
.../report/project_issue_report_view.xml | 2 +-
.../security/ir.model.access.csv | 7 -
.../security/ir.model.access.csv | 5 -
.../project_long_term_view.xml | 4 +-
.../security/ir.model.access.csv | 5 -
.../security/ir.model.access.csv | 1 -
.../project_planning_view.xml | 2 +-
.../security/ir.model.access.csv | 3 -
.../security/ir.model.access.csv | 3 -
.../project_timesheet_view.xml | 2 +-
.../security/ir.model.access.csv | 2 -
74 files changed, 52 insertions(+), 2961 deletions(-)
delete mode 100644 addons/account_tax_include/__init__.py
delete mode 100644 addons/account_tax_include/__openerp__.py
delete mode 100644 addons/account_tax_include/account_tax_include.py
delete mode 100644 addons/account_tax_include/account_tax_include_view.xml
delete mode 100644 addons/account_tax_include/i18n/account_tax_include.pot
delete mode 100644 addons/account_tax_include/i18n/ar.po
delete mode 100644 addons/account_tax_include/i18n/bg.po
delete mode 100644 addons/account_tax_include/i18n/bs.po
delete mode 100644 addons/account_tax_include/i18n/ca.po
delete mode 100644 addons/account_tax_include/i18n/cs.po
delete mode 100644 addons/account_tax_include/i18n/de.po
delete mode 100644 addons/account_tax_include/i18n/el.po
delete mode 100644 addons/account_tax_include/i18n/en_AU.po
delete mode 100644 addons/account_tax_include/i18n/en_GB.po
delete mode 100644 addons/account_tax_include/i18n/es.po
delete mode 100644 addons/account_tax_include/i18n/es_AR.po
delete mode 100644 addons/account_tax_include/i18n/es_EC.po
delete mode 100644 addons/account_tax_include/i18n/et.po
delete mode 100644 addons/account_tax_include/i18n/fi.po
delete mode 100644 addons/account_tax_include/i18n/fr.po
delete mode 100644 addons/account_tax_include/i18n/gl.po
delete mode 100644 addons/account_tax_include/i18n/hr.po
delete mode 100644 addons/account_tax_include/i18n/hu.po
delete mode 100644 addons/account_tax_include/i18n/id.po
delete mode 100644 addons/account_tax_include/i18n/it.po
delete mode 100644 addons/account_tax_include/i18n/ko.po
delete mode 100644 addons/account_tax_include/i18n/lt.po
delete mode 100644 addons/account_tax_include/i18n/nb.po
delete mode 100644 addons/account_tax_include/i18n/nl.po
delete mode 100644 addons/account_tax_include/i18n/nl_BE.po
delete mode 100644 addons/account_tax_include/i18n/oc.po
delete mode 100644 addons/account_tax_include/i18n/pl.po
delete mode 100644 addons/account_tax_include/i18n/pt.po
delete mode 100644 addons/account_tax_include/i18n/pt_BR.po
delete mode 100644 addons/account_tax_include/i18n/ro.po
delete mode 100644 addons/account_tax_include/i18n/ru.po
delete mode 100644 addons/account_tax_include/i18n/sk.po
delete mode 100644 addons/account_tax_include/i18n/sl.po
delete mode 100644 addons/account_tax_include/i18n/sq.po
delete mode 100644 addons/account_tax_include/i18n/sr.po
delete mode 100644 addons/account_tax_include/i18n/sv.po
delete mode 100644 addons/account_tax_include/i18n/tlh.po
delete mode 100644 addons/account_tax_include/i18n/tr.po
delete mode 100644 addons/account_tax_include/i18n/uk.po
delete mode 100644 addons/account_tax_include/i18n/vi.po
delete mode 100644 addons/account_tax_include/i18n/zh_CN.po
delete mode 100644 addons/account_tax_include/i18n/zh_TW.po
delete mode 100644 addons/account_tax_include/test/account_tax_include.yml
diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 0b314109052e..239782963670 100644
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -1295,14 +1295,6 @@ class account_invoice_line(osv.osv):
'price_unit': _price_unit_default,
}
- def product_id_change_unit_price_inv(self, cr, uid, tax_id, price_unit, qty, address_invoice_id, product, partner_id, context=None):
- tax_obj = self.pool.get('account.tax')
- if price_unit:
- taxes = tax_obj.browse(cr, uid, tax_id)
- for tax in tax_obj.compute_inv(cr, uid, taxes, price_unit, qty, address_invoice_id, product, partner_id):
- price_unit = price_unit - tax['amount']
- return {'price_unit': price_unit,'invoice_line_tax_id': tax_id}
-
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):
if context is None:
context = {}
@@ -1402,8 +1394,7 @@ class account_invoice_line(osv.osv):
taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a).tax_ids or False)
tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes)
if type in ('in_invoice', 'in_refund'):
- to_update = self.product_id_change_unit_price_inv(cr, uid, tax_id, price_unit or res.standard_price, qty, address_invoice_id, product, partner_id, context=context)
- result.update(to_update)
+ result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} )
else:
result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id})
diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv
index 99692bc3e2e1..124593ff8f51 100644
--- a/addons/account/security/ir.model.access.csv
+++ b/addons/account/security/ir.model.access.csv
@@ -39,7 +39,7 @@
"access_account_invoice_uinvoice","account.invoice","model_account_invoice","account.group_account_invoice",1,1,1,1
"access_account_invoice_line_uinvoice","account.invoice.line","model_account_invoice_line","account.group_account_invoice",1,1,1,1
"access_account_invoice_tax_uinvoice","account.invoice.tax","model_account_invoice_tax","account.group_account_invoice",1,1,1,1
-"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,0,0,0
+"access_account_move_uinvoice","account.move","model_account_move","account.group_account_invoice",1,1,1,1
"access_account_move_line_uinvoice","account.move.line invoice","model_account_move_line","account.group_account_invoice",1,1,1,1
"access_account_move_reconcile_uinvoice","account.move.reconcile","model_account_move_reconcile","account.group_account_invoice",1,1,1,1
"access_account_journal_period_uinvoice","account.journal.period","model_account_journal_period","account.group_account_invoice",1,1,1,1
diff --git a/addons/account_tax_include/__init__.py b/addons/account_tax_include/__init__.py
deleted file mode 100644
index f96eb08f2fe5..000000000000
--- 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 a6bab18ce016..000000000000
--- a/addons/account_tax_include/__openerp__.py
+++ /dev/null
@@ -1,44 +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 implements the modification on the invoice form.
-""",
- 'author': 'OpenERP SA',
- 'website': 'http://www.openerp.com',
- 'depends': ['account'],
- 'init_xml': [],
- 'update_xml': ['account_tax_include_view.xml'],
- 'demo_xml': [],
- 'test': ['test/account_tax_include.yml'],
- '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 afd1ef36ae79..000000000000
--- a/addons/account_tax_include/account_tax_include.py
+++ /dev/null
@@ -1,228 +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
-
-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, journal_id=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, journal_id=journal_id)
- 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=None):
- 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:
-
- 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 4c103cd0d50f..000000000000
--- 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,{'company_id': parent.company_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 da7622102bd8..000000000000
--- 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 6.0dev\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 5090a5e011f0..000000000000
--- 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-09-29 05:00+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 f0b055241ccd..000000000000
--- 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 6.0dev\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-09-29 05:00+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 97a0c10e367d..000000000000
--- 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 6.0dev\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-09-29 05:00+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 ce0276a8c26c..000000000000
--- 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 6.0dev\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 (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-09-29 05:00+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 a8958b780d7c..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:35+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+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 4635a414aaa9..000000000000
--- 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 6.0dev\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-09-29 05:00+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 74d719a9b9ee..000000000000
--- 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-09-29 05:00+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 4c0e3609f247..000000000000
--- 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-09-29 05:00+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 cd72d7a2cacc..000000000000
--- 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-09-29 05:00+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 b01d20c9ec87..000000000000
--- 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 6.0dev\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-09-29 05:00+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 a9cc40c0d4c7..000000000000
--- 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-09-29 05:00+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/es_EC.po b/addons/account_tax_include/i18n/es_EC.po
deleted file mode 100644
index 1858f2a52bcb..000000000000
--- a/addons/account_tax_include/i18n/es_EC.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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-17 17:47+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-09-29 05:00+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/et.po b/addons/account_tax_include/i18n/et.po
deleted file mode 100644
index d4398a2ae582..000000000000
--- 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 6.0dev\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-09-29 05:00+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 0b8e8dfcee2b..000000000000
--- 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-08-02 23:40+0000\n"
-"Last-Translator: mga (Open ERP) <Unknown>\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-09-29 05:00+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 3f912c6ffba2..000000000000
--- 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 6.0dev\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-09-29 05:00+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 96e953870614..000000000000
--- 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-09-29 05:00+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 ba46ce2f95ab..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:43+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-09-29 05:00+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 5090a5e011f0..000000000000
--- 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-09-29 05:00+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 e0d1f76a6b18..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 14:41+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+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 tidak valid untuk Menampilkan Arsitektur!"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Metode Harga"
-
-#. module: account_tax_include
-#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
-msgid "Invoices and prices with taxes included"
-msgstr "Faktur dan harga sudah termasuk pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax included"
-msgstr "Termasuk Pajak"
-
-#. module: account_tax_include
-#: selection:account.invoice,price_type:0
-msgid "Tax excluded"
-msgstr "Tidak termasuk pajak"
-
-#. module: account_tax_include
-#: view:account.tax:0
-msgid "Compute Code for Taxes included prices"
-msgstr "menghitung kode untuk Pajak termasuk harga"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Sub Total"
diff --git a/addons/account_tax_include/i18n/it.po b/addons/account_tax_include/i18n/it.po
deleted file mode 100644
index 8b6d0f9df36e..000000000000
--- 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: 2010-10-14 07:31+0000\n"
-"Last-Translator: OpenERP Administrators <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-10-15 04:42+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 "Metodo di pagamento"
-
-#. 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 "Subtotale"
diff --git a/addons/account_tax_include/i18n/ko.po b/addons/account_tax_include/i18n/ko.po
deleted file mode 100644
index 254d3ffc1b16..000000000000
--- 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-09-29 05:00+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 35af6cdcb04d..000000000000
--- 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 6.0dev\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-09-29 05:00+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/nb.po b/addons/account_tax_include/i18n/nb.po
deleted file mode 100644
index a457b6a3c492..000000000000
--- a/addons/account_tax_include/i18n/nb.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Norwegian Bokmal 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-09-09 07:22+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Norwegian Bokmal <nb@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-09-29 05:00+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
-
-#. module: account_tax_include
-#: constraint:ir.ui.view:0
-msgid "Invalid XML for View Architecture!"
-msgstr "Ugyldig XML for visningsarkitektur!"
-
-#. 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 "Subtotal"
diff --git a/addons/account_tax_include/i18n/nl.po b/addons/account_tax_include/i18n/nl.po
deleted file mode 100644
index cfccf0663d4b..000000000000
--- 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 6.0dev\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-09-29 05:00+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 68a51f90ec3a..000000000000
--- 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-09-29 05:00+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 95700dc830e2..000000000000
--- 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-08-02 23:48+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-09-29 05:00+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 efa5a2bfdfb9..000000000000
--- 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 6.0dev\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-09-29 05:00+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 9f5c11b9832e..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:49+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+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 bd8ff06c8e48..000000000000
--- 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 6.0dev\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-09-29 05:00+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 c6c5a81169c1..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 23:52+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+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 0d7efd3ffdfb..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-06-06 06:51+0000\n"
-"Last-Translator: mr.The <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-09-29 05:00+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 eedd88d3edc0..000000000000
--- 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-08-02 23:53+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-09-29 05:00+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 22db03c58942..000000000000
--- 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 6.0dev\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-09-29 05:00+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 7c7b2189fd25..000000000000
--- a/addons/account_tax_include/i18n/sq.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Albanian 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-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Albanian <sq@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-09-29 05:00+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/sr.po b/addons/account_tax_include/i18n/sr.po
deleted file mode 100644
index bfcc7a710050..000000000000
--- a/addons/account_tax_include/i18n/sr.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Serbian 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-10-15 08:46+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
-"Language-Team: Serbian <sr@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-10-16 04: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 "Nevažeći XML za pregled arhitekture"
-
-#. module: account_tax_include
-#: field:account.invoice,price_type:0
-msgid "Price method"
-msgstr "Cenovna 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 cene 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 "Kompjuterski kod za izraÄunavanje cijena sa ukljuÄenim porezima"
-
-#. module: account_tax_include
-#: field:account.invoice.line,price_subtotal_incl:0
-msgid "Subtotal"
-msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/sv.po b/addons/account_tax_include/i18n/sv.po
deleted file mode 100644
index 30a63ed1824c..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 02:42+0000\n"
-"Last-Translator: mga (Open ERP) <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-09-29 05:00+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 334e888d03d3..000000000000
--- 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 6.0dev_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-09-29 05:00+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 a719aaf1b2b7..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-09-09 06:58+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-09-29 05:00+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 8b467132fb9d..000000000000
--- 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 6.0dev\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-09-29 05:00+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 055c25819016..000000000000
--- a/addons/account_tax_include/i18n/vi.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# Vietnamese 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-08-02 14:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@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-09-29 05:00+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/zh_CN.po b/addons/account_tax_include/i18n/zh_CN.po
deleted file mode 100644
index b5ed33802aeb..000000000000
--- 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 6.0dev\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-07-13 16:34+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-09-29 05:00+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 cc456963251c..000000000000
--- 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-09-29 05:00+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/test/account_tax_include.yml b/addons/account_tax_include/test/account_tax_include.yml
deleted file mode 100644
index a4b0f8531b92..000000000000
--- a/addons/account_tax_include/test/account_tax_include.yml
+++ /dev/null
@@ -1,93 +0,0 @@
-
--
- Creating a tax record
--
- !record {model: account.tax, id: account_tax_a0}:
- amount: 0.10000000000000001
- applicable_type: 'true'
- company_id: base.main_company
- description: a
- name: a
- sequence: 1
- type: percent
- type_tax_use: all
-
--
- Creating a account invoice record with tax excluded
--
- !record {model: account.invoice, id: account_invoice_tax_exclude}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 100.0
- quantity: 1.0
- invoice_line_tax_id:
- - account_tax_a0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- price_type: tax_excluded
- reference_type: none
-
--
- Performing an osv_memory action button_reset_taxes on module account.invoice
--
- !python {model: account.invoice}: |
- self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_exclude")], {"lang": "en_US", "tz": False,
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
- "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
- })
--
- Check if tax is excluded in invoice
--
- !assert {model: account.invoice, id: account_invoice_tax_exclude, severity: error, string: price type is tax excluded}:
- - state == "draft"
- - amount_untaxed == 100.0
- - amount_tax == 10.0
- - amount_total == 110.0
-
--
- Creating a account invoice record with tax include
--
- !record {model: account.invoice, id: account_invoice_tax_include}:
- account_id: account.a_recv
- address_contact_id: base.res_partner_address_3000
- address_invoice_id: base.res_partner_address_3000
- company_id: base.main_company
- currency_id: base.EUR
- invoice_line:
- - account_id: account.a_sale
- name: '[PC1] Basic PC'
- price_unit: 100.0
- quantity: 1.0
- invoice_line_tax_id:
- - account_tax_a0
- product_id: product.product_product_pc1
- uos_id: product.product_uom_unit
- journal_id: account.sales_journal
- partner_id: base.res_partner_desertic_hispafuentes
- price_type: tax_included
- reference_type: none
-
--
- Performing an osv_memory action button_reset_taxes on module account.invoice
--
- !python {model: account.invoice}: |
- self.button_reset_taxes(cr, uid, [ref("account_invoice_tax_include")], {"lang": "en_US", "tz": False,
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_action_invoice_tree1")],
- "type": "out_invoice", "active_id": ref("account.menu_action_invoice_tree1"),
- })
--
- Check if tax is included in invoice
--
- !assert {model: account.invoice, id: account_invoice_tax_include, severity: error, string: price type is tax included}:
- - state == "draft"
- - amount_untaxed == 90.91
- - amount_tax == 9.09
- - amount_total == 100.00
\ No newline at end of file
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index c048763ac5d4..a59b36a2736c 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -572,7 +572,6 @@ class account_voucher(osv.osv):
move_pool = self.pool.get('account.move')
move_line_pool = self.pool.get('account.move.line')
currency_pool = self.pool.get('res.currency')
- bank_st_line_obj = self.pool.get('account.bank.statement.line')
tax_obj = self.pool.get('account.tax')
for inv in self.browse(cr, uid, ids):
if inv.move_id:
@@ -593,11 +592,6 @@ class account_voucher(osv.osv):
'period_id': inv.period_id and inv.period_id.id or False
}
move_id = move_pool.create(cr, uid, move)
- line_bank_ids = bank_st_line_obj.search(cr, uid, [('voucher_id', '=', inv.id)], context=context)
- if line_bank_ids:
- bank_st_line_obj.write(cr, uid, line_bank_ids, {
- 'move_ids': [(4, move_id, False)]
- })
#create the first line manually
company_currency = inv.journal_id.company_id.currency_id.id
@@ -867,13 +861,20 @@ class account_bank_statement(osv.osv):
def create_move_from_st_line(self, cr, uid, st_line_id, company_currency_id, next_number, context=None):
voucher_obj = self.pool.get('account.voucher')
wf_service = netsvc.LocalService("workflow")
- st_line = self.pool.get('account.bank.statement.line').browse(cr, uid, st_line_id, context=context)
+ bank_st_line_obj = self.pool.get('account.bank.statement.line')
+ st_line = bank_st_line_obj.browse(cr, uid, st_line_id, context=context)
if st_line.voucher_id:
voucher_obj.write(cr, uid, [st_line.voucher_id.id], {'number': next_number}, context=context)
if st_line.voucher_id.state == 'cancel':
voucher_obj.action_cancel_draft(cr, uid, [st_line.voucher_id.id], context=context)
wf_service.trg_validate(uid, 'account.voucher', st_line.voucher_id.id, 'proforma_voucher', cr)
- return self.pool.get('account.move.line').write(cr, uid, [x.id for x in st_line.voucher_id.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
+
+ v = voucher_obj.browse(cr, uid, st_line.voucher_id.id, context=context)
+ bank_st_line_obj.write(cr, uid, [st_line_id], {
+ 'move_ids': [(4, v.move_id.id, False)]
+ })
+
+ return self.pool.get('account.move.line').write(cr, uid, [x.id for x in v.move_ids], {'statement_id': st_line.statement_id.id}, context=context)
return super(account_bank_statement, self).create_move_from_st_line(cr, uid, st_line.id, company_currency_id, next_number, context=context)
account_bank_statement()
@@ -915,4 +916,4 @@ class account_bank_statement_line(osv.osv):
self.pool.get('account.voucher').unlink(cr, uid, unlink_ids, context=context)
return super(account_bank_statement_line, self).unlink(cr, uid, ids, context=context)
-account_bank_statement_line()
\ No newline at end of file
+account_bank_statement_line()
diff --git a/addons/board/board_administration_view.xml b/addons/board/board_administration_view.xml
index 3352c915898e..257dfbd61507 100644
--- a/addons/board/board_administration_view.xml
+++ b/addons/board/board_administration_view.xml
@@ -32,9 +32,7 @@
<field name="view_mode">form</field>
<field name="view_id" ref="board_administration_form"/>
</record>
- <menuitem id="menu_reporting" name="Reporting" parent="base.menu_administration" sequence="11"
- groups="base.group_extended"/>
- <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="menu_reporting"/>
+ <menuitem id="board.admin_menu_dasboard" name="Dashboard" sequence="0" parent="base.menu_reporting"/>
<menuitem id="menu_board_admin" action="open_board_administration_form" icon="terp-graph" parent="board.admin_menu_dasboard" />
<!-- User Connection -->
diff --git a/addons/product/security/product_security.xml b/addons/product/security/product_security.xml
index 171cf523b8b3..32399358f68d 100644
--- a/addons/product/security/product_security.xml
+++ b/addons/product/security/product_security.xml
@@ -6,7 +6,7 @@
<field name="name">Useability / Product UoS View</field>
</record>
<record id="group_product_manager" model="res.groups">
- <field name="name">Product / Manager</field>
+ <field name="name">Product Manager</field>
</record>
<record id="base.group_sale_manager" model="res.groups">
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 8664538f86fe..bc86872110aa 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -23,7 +23,7 @@
<field name="progress" widget="progressbar"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
- <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
</tree>
@@ -36,25 +36,16 @@
<field name="type">tree</field>
<field eval="99" name="priority"/>
<field name="arch" type="xml">
- <tree colors="red:date_deadline<current_date;blue:date_deadline==current_date;black:date_deadline>current_date" string="My Delegated Tasks">
- <field name="user_id"/>
+ <tree colors="red:date_deadline<current_date" string="My Delegated Tasks">
<field name="name"/>
<field name="project_id"/>
+ <field name="delegated_user_id"/>
<field name="date_deadline"/>
<field name="total_hours" widget="float_time"/>
<field name="progress" widget="progressbar"/>
- <field name="type_id"/>
- <button name="next_type" invisible="context.get('set_visible',False)"
- states="draft,open,pending"
- string="Change Stage"
- type="object"
- icon="gtk-go-forward"
- groups="base.group_extended"
- help="Change Type"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
- <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
- <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="gtk-apply" help="For changing to done state"/>
</tree>
</field>
diff --git a/addons/project/project.py b/addons/project/project.py
index 8b8745fa45c4..640df9017d83 100644
--- a/addons/project/project.py
+++ b/addons/project/project.py
@@ -78,82 +78,30 @@ class project(osv.osv):
pricelist_id = pricelist.get('property_product_pricelist', False) and pricelist.get('property_product_pricelist')[0] or False
return {'value':{'contact_id': addr['contact'], 'pricelist_id': pricelist_id}}
- def _get_user_and_default_uom_ids(self, cr, uid):
- users_obj = self.pool.get('res.users')
- model_data_obj = self.pool.get('ir.model.data')
- model_data_id = model_data_obj._get_id(cr, uid, 'product', 'uom_hour')
- default_uom = user_uom = model_data_obj.read(cr, uid, [model_data_id], ['res_id'])[0]['res_id']
- obj_tm = users_obj.browse(cr, uid, uid).company_id.project_time_mode_id
- if obj_tm:
- user_uom = obj_tm.id
- return user_uom, default_uom
-
def _progress_rate(self, cr, uid, ids, names, arg, context=None):
- def _get_all_child_projects(ids):
- """Recursively get child project ids"""
- child_ids = flatten([project_hierarchy.get(idn, []) for idn in ids])
- if child_ids:
- child_ids = _get_all_child_projects(child_ids)
- return ids + child_ids
- # END _get_all_child_projects
-
res = {}.fromkeys(ids, 0.0)
progress = {}
if not ids:
return res
-
- par_child_projects = {}
- all_projects = list(ids)
-
- # get project hierarchy:
- cr.execute('''SELECT prp.id AS pr_parent_id, prpc.id AS pr_child_id
- FROM account_analytic_account AS p
- JOIN account_analytic_account AS c ON p.id = c.parent_id
- JOIN project_project AS prp ON prp.analytic_account_id = p.id
- JOIN project_project AS prpc ON prpc.analytic_account_id = c.id''')
-
- project_hierarchy = dict((k, list(set([v[1] for v in itr]))) for k, itr in groupby(cr.fetchall(), itemgetter(0)))
-
- for id in ids:
- child_projects = _get_all_child_projects([id])
- par_child_projects[id] = child_projects
- all_projects.extend(child_projects)
-
- all_projects = dict.fromkeys(all_projects).keys()
cr.execute('''SELECT
project_id, sum(planned_hours), sum(total_hours), sum(effective_hours)
FROM
- project_task
+ project_task
WHERE
- project_id IN %s AND
+ project_id in %s AND
state<>'cancelled'
GROUP BY
- project_id''',(tuple(all_projects),))
- progress = dict(map(lambda x: (x[0], (x[1] or 0.0, x[2] or 0.0, x[3] or 0.0)), cr.fetchall()))
-
- user_uom, def_uom = self._get_user_and_default_uom_ids(cr, uid)
- for project in self.browse(cr, uid, par_child_projects.keys(), context=context):
- s = [0.0, 0.0, 0.0]
- tocompute = par_child_projects[project.id]
- while tocompute:
- p = tocompute.pop()
- for i in range(3):
- s[i] += progress.get(p, (0.0, 0.0, 0.0))[i]
-
- uom_obj = self.pool.get('product.uom')
- if user_uom != def_uom:
- s[0] = uom_obj._compute_qty(cr, uid, user_uom, s[0], def_uom)
- s[1] = uom_obj._compute_qty(cr, uid, user_uom, s[1], def_uom)
- s[2] = uom_obj._compute_qty(cr, uid, user_uom, s[2], def_uom)
- if project.state == 'close':
- progress_rate = 100.0
- else:
- progress_rate = s[1] and round(min(100.0 * s[2] / s[1], 99.99), 2)
+ project_id''',
+ (tuple(ids),))
+ progress = dict(map(lambda x: (x[0], (x[1],x[2],x[3])), cr.fetchall()))
+
+ for project in self.browse(cr, uid, ids, context=context):
+ s = progress.get(project.id, (0.0,0.0,0.0))
res[project.id] = {
'planned_hours': s[0],
'effective_hours': s[2],
'total_hours': s[1],
- 'progress_rate': progress_rate
+ 'progress_rate': s[1] and (100.0 * s[2] / s[1]) or 0.0
}
return res
@@ -173,7 +121,6 @@ class project(osv.osv):
if work.task_id and work.task_id.project_id: result[work.task_id.project_id.id] = True
return result.keys()
-
def unlink(self, cr, uid, ids, *args, **kwargs):
for proj in self.browse(cr, uid, ids):
if proj.tasks:
@@ -227,11 +174,12 @@ class project(osv.osv):
'sequence': 10,
}
+ # TODO: Why not using a SQL contraints ?
def _check_dates(self, cr, uid, ids):
- leave = self.read(cr, uid, ids[0], ['date_start', 'date'])
- if leave['date_start'] and leave['date']:
- if leave['date_start'] > leave['date']:
- return False
+ for leave in self.read(cr, uid, ids, ['date_start', 'date']):
+ if leave['date_start'] and leave['date']:
+ if leave['date_start'] > leave['date']:
+ return False
return True
_constraints = [
@@ -387,23 +335,9 @@ class task(osv.osv):
res = {}
cr.execute("SELECT task_id, COALESCE(SUM(hours),0) FROM project_task_work WHERE task_id IN %s GROUP BY task_id",(tuple(ids),))
hours = dict(cr.fetchall())
-
- uom_obj = self.pool.get('product.uom')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- if user_uom != default_uom:
- for task in self.browse(cr, uid, ids, context=context):
- if hours.get(task.id, False):
- dur_in_user_uom = uom_obj._compute_qty(cr, uid, default_uom, hours.get(task.id, 0.0), user_uom)
- hours[task.id] = dur_in_user_uom
- timespent=0
for task in self.browse(cr, uid, ids, context=context):
- res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': task.remaining_hours + hours.get(task.id, 0.0)}
-# res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
-
- for ctimespent in task.work_ids:
- timespent=timespent+ctimespent.hours
- res[task.id]['delay_hours'] = task.planned_hours - timespent
-
+ res[task.id] = {'effective_hours': hours.get(task.id, 0.0), 'total_hours': (task.remaining_hours or 0.0) + hours.get(task.id, 0.0)}
+ res[task.id]['delay_hours'] = res[task.id]['total_hours'] - task.planned_hours
res[task.id]['progress'] = 0.0
if (task.remaining_hours + hours.get(task.id, 0.0)):
res[task.id]['progress'] = round(min(100.0 * hours.get(task.id, 0.0) / res[task.id]['total_hours'], 99.99),2)
@@ -483,23 +417,23 @@ class task(osv.osv):
'planned_hours': fields.float('Planned Hours', help='Estimated time to do the task, usually set by the project manager when the task is in draft state.'),
'effective_hours': fields.function(_hours_get, method=True, string='Hours Spent', multi='hours', help="Computed using the sum of the task work done.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'remaining_hours': fields.float('Remaining Hours', digits=(16,2), help="Total remaining time, can be re-estimated periodically by the assignee of the task."),
'total_hours': fields.function(_hours_get, method=True, string='Total Hours', multi='hours', help="Computed as: Time Spent + Remaining Time.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'progress': fields.function(_hours_get, method=True, string='Progress (%)', multi='hours', group_operator="avg", help="Computed as: Time Spent / Total Time.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours','state'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'delay_hours': fields.function(_hours_get, method=True, string='Delay Hours', multi='hours', help="Computed as difference of the time estimated by the project manager and the real time to close the task.",
store = {
- 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids'], 10),
+ 'project.task': (lambda self, cr, uid, ids, c={}: ids, ['work_ids', 'remaining_hours', 'planned_hours'], 10),
'project.task.work': (_get_task, ['hours'], 10),
}),
'user_id': fields.many2one('res.users', 'Assigned to'),
@@ -779,53 +713,6 @@ class project_work(osv.osv):
_order = "date desc"
- def create(self, cr, uid, vals, *args, **kwargs):
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- if vals.get('hours', False):
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- duration = vals['hours']
- if user_uom != default_uom:
- duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours - %s where id=%s', (duration, vals['task_id']))
- return super(project_work, self).create(cr, uid, vals, *args, **kwargs)
-
- def write(self, cr, uid, ids, vals, context=None):
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- if vals.get('hours', False):
- old_hours = self.browse(cr, uid, ids, context=context)
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- duration = vals['hours']
- for old in old_hours:
- if vals.get('hours') != old.hours:
- # this code is only needed when we update the hours of the project
- # TODO: it may still a second calculation if the task.id is changed
- # at this task.
- if user_uom == default_uom:
- for work in self.browse(cr, uid, ids, context=context):
- cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, work.hours, work.task_id.id))
- else:
- for work in self.browse(cr, uid, ids, context=context):
- duration = uom_obj._compute_qty(cr, uid, default_uom, duration, user_uom)
- del_work = uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours - %s + (%s) where id=%s', (duration, del_work, work.task_id.id))
- return super(project_work,self).write(cr, uid, ids, vals, context=context)
-
- def unlink(self, cr, uid, ids, *args, **kwargs):
- context = kwargs.get('context', {})
- project_obj = self.pool.get('project.project')
- uom_obj = self.pool.get('product.uom')
- user_uom, default_uom = project_obj._get_user_and_default_uom_ids(cr, uid)
- if user_uom == default_uom:
- for work in self.browse(cr, uid, ids, context):
- cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (work.hours, work.task_id.id))
- else:
- for work in self.browse(cr, uid, ids, context):
- duration = uom_obj._compute_qty(cr, uid, default_uom, work.hours, user_uom)
- cr.execute('update project_task set remaining_hours=remaining_hours + %s where id=%s', (duration, work.task_id.id))
- return super(project_work, self).unlink(cr, uid, ids, *args, **kwargs)
-
project_work()
class account_analytic_account(osv.osv):
diff --git a/addons/project/project_demo.xml b/addons/project/project_demo.xml
index 8d3752c09793..34ab831bbe2d 100644
--- a/addons/project/project_demo.xml
+++ b/addons/project/project_demo.xml
@@ -42,7 +42,7 @@
</record>
<record id="res_users_finacial_manager" model="res.users">
<field name="name">Fabian</field>
- <field eval="[(6, 0, [ref('base.group_user'), ref('project.group_project_finance')])]" name="groups_id"/>
+ <field eval="[(6, 0, [ref('base.group_user')])]" name="groups_id"/>
<field name="login">fbs</field>
<field name="password">fbs</field>
</record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index f41018b886db..a69903c34d20 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -5,10 +5,10 @@
<menuitem
icon="terp-project" id="base.menu_main_pm"
name="Project" sequence="10"
- groups="group_project_manager,group_project_user,group_project_finance_user"/>
+ groups="group_project_manager,group_project_user"/>
<menuitem id="menu_project_management" name="Project" parent="base.menu_main_pm" sequence="1"/>
- <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60" groups="group_project_finance_user"/>
+ <menuitem id="menu_definitions" name="Configuration" parent="base.menu_main_pm" sequence="60"/>
<!-- Project -->
<record id="edit_project" model="ir.ui.view">
@@ -304,16 +304,13 @@
<field name="type">tree</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
- <tree colors="grey:state in ('cancelled','done');blue:remaining_hours<0 and state in ('pending');red:date_deadline and (date_deadline<current_date) and (state in ('draft','open'))" string="Tasks">
- <field name="id"/>
+ <tree colors="grey:state in ('cancelled','done');blue:state == 'pending';red:date_deadline and (date_deadline<current_date) and (state in ('draft','pending','open'))" string="Tasks">
<field name="sequence" invisible="not context.get('seq_visible', False)"/>
<field name="name"/>
<field name="project_id" icon="gtk-indent" domain="['|',('user_id','=',uid),('members','=',uid)]" invisible="context.get('user_invisible', False)"/>
<field name="user_id" invisible="context.get('user_invisible', False)"/>
<field name="delegated_user_id" invisible="context.get('show_delegated', True)"/>
<field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/>
- <field name="planned_hours"/>
- <field name="delay_hours"/>
<field name="date_deadline" invisible="context.get('set_visible',False)"/>
<field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/>
<button name="next_type" invisible="context.get('set_visible',False)"
@@ -328,7 +325,7 @@
<field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/>
<field name="state" invisible="context.get('set_visible',False)"/>
<button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/>
- <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
+ <button name="do_open" states="pending,draft,done,cancel" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/>
<button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/>
<button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/>
</tree>
@@ -497,7 +494,7 @@
<field name="help">Define here the steps that will be used on the project from the creation of the task, up to the closing of the task or issue. You will use these stages in order to track the progress of the resolution of a task or an issue.</field>
</record>
- <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
+ <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
<menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/>
<act_window context="{'search_default_user_id': [active_id]}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/>
diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml
index a00918bfcd8c..53d97c028029 100644
--- a/addons/project/report/project_report_view.xml
+++ b/addons/project/report/project_report_view.xml
@@ -149,7 +149,7 @@
<field name="help">This report allows you to analyse the performance of your projects and users. You can analyse the quantities of tasks, the hours spent compared to the planned hours, the average number of days to open or close a task, etc.</field>
</record>
- <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1" groups="group_project_finance_user"/>
+ <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/>
<!-- Views and action for project dashboard -->
<record id="view_project_vs_remaining_hours_tree" model="ir.ui.view">
diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv
index f01d05b82ba4..fb237e88769d 100644
--- a/addons/project/security/ir.model.access.csv
+++ b/addons/project/security/ir.model.access.csv
@@ -21,11 +21,3 @@
"access_project_vs_hours_manager","project.vs.hours.manager","model_project_vs_hours","project.group_project_manager",1,1,1,1
"access_project_task_sale_user","project.task salesman","model_project_task","base.group_sale_salesman",1,0,0,0
"access_project_project_sale_user","project.project salesman","model_project_project","base.group_sale_salesman",1,0,0,0
-"access_project_project_project_financial_user","project.project.project.financial.user","model_project_project","group_project_finance_user",1,0,0,0
-"access_project_task_project_financial_user","project.task.project.financial.user","model_project_task","group_project_finance_user",1,0,0,0
-"access_project_task_work_project_financial_user","project.task.work.project.financial.user","model_project_task_work","group_project_finance_user",1,0,0,0
-"access_report_project_task_user_project_financial_user","report.project.task.user.project.financial.user","model_report_project_task_user","group_project_finance_user",1,0,0,0
-"access_project_board_project_financial_user","board.board.project.financial.user","board.model_board_board","group_project_finance_user",1,0,0,0
-"access_account_analytic_account_project_financial_user","account.analytic.account.project.financial.user","analytic.model_account_analytic_account","group_project_finance_user",1,0,0,0
-"access_project_task_type_project_financial_user","project.task.type.project.financial.user","model_project_task_type","group_project_finance_user",1,0,0,0
-"access_project_vs_hours_project_financial_user","project.vs.hours.project.financial.user","model_project_vs_hours","group_project_finance_user",1,0,0,0
diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml
index 97453dcb33b6..e77b1f338d10 100644
--- a/addons/project/security/project_security.xml
+++ b/addons/project/security/project_security.xml
@@ -2,14 +2,6 @@
<openerp>
<data noupdate="1">
- <record id="group_project_finance" model="res.groups">
- <field name="name">Project / Financial Manager</field>
- </record>
-
- <record id="group_project_finance_user" model="res.groups">
- <field name="name">Project / Financial User</field>
- </record>
-
<record id="group_project_manager" model="res.groups">
<field name="name">Project / Manager</field>
</record>
diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml
index 318cb365271f..427bd7fd87e8 100644
--- a/addons/project_gtd/project_gtd_view.xml
+++ b/addons/project_gtd/project_gtd_view.xml
@@ -31,7 +31,7 @@
<field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at office, at home, when I take my car, etc.</field>
</record>
- <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting,project.group_project_finance_user"
+ <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting"
parent="project.menu_tasks_config" action="open_gtd_context_tree"/>
<record model="ir.ui.view" id="view_gtd_timebox_tree">
diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv
index 42a4790b7454..0398fbfb0ee3 100644
--- a/addons/project_gtd/security/ir.model.access.csv
+++ b/addons/project_gtd/security/ir.model.access.csv
@@ -5,5 +5,3 @@
"access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0
"access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1
"access_project_gtd_timebox_manager","project.gtd.timebox project manager","model_project_gtd_timebox","project.group_project_manager",1,1,1,1
-"access_project_gtd_context_finacial_user","project.gtd.context.financial.user","model_project_gtd_context","project.group_project_finance_user",1,0,0,0
-"access_project_gtd_timebox_finacial_user","project.gtd.timebox.financial.user","model_project_gtd_timebox","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index af99e9efe169..3894740f0f12 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -2,7 +2,7 @@
<openerp>
<data>
- <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2" groups="project.group_project_finance_user"/>
+ <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/>
<record model="ir.ui.view" id="project_issue_version_search_view">
<field name="name">Issue Version</field>
diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml
index e2e34a0f5f52..5a8c4886d2f6 100644
--- a/addons/project_issue/report/project_issue_report_view.xml
+++ b/addons/project_issue/report/project_issue_report_view.xml
@@ -177,7 +177,7 @@
</record>
<menuitem icon="terp-project" id="base.menu_main_pm" name="Project" sequence="10"/>
<menuitem id="base.menu_project_report" name="Reporting" parent="base.menu_main_pm" sequence="50"/>
- <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager,project.group_project_finance_user"/>
+ <menuitem action="action_project_issue_report" id="menu_project_issue_report_tree" parent="base.menu_project_report" groups="project.group_project_manager"/>
</data>
diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv
index f52df8356a70..f5602f5ae4b9 100755
--- a/addons/project_issue/security/ir.model.access.csv
+++ b/addons/project_issue/security/ir.model.access.csv
@@ -8,13 +8,6 @@
"access_crm_case_categ_supp","crm.case.categ","crm.model_crm_case_categ","project_issue.group_project_supporter",1,0,0,0
"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
"access_project_issue_version","project_issue_version manager","model_project_issue_version","project_issue.group_project_supporter",1,0,0,0
-"access_project_issue_version_financial_user","project.issue.version.financial.user","model_project_issue_version","project.group_project_finance_user",1,0,0,0
-"access_crm_case_categ_financial_user","crm.case.categ.financial.user","crm.model_crm_case_categ","project.group_project_finance_user",1,0,0,0
-"access_crm_case_stage_financial_user","crm.case.stage.financial.user","crm.model_crm_case_stage","project.group_project_finance_user",1,0,0,0
-"access_project_issue_report_financial_user","project.issue.report.financial.user","model_project_issue_report","project.group_project_finance_user",1,0,0,0
-"access_project_issue_board_project_financial_user","board.board.project.issue.financial.user","board.model_board_board","project.group_project_finance_user",1,0,0,0
-"access_project_issue_project_financial_user","project.issue.financial.user","model_project_issue","project.group_project_finance_user",1,0,0,0
-"access_mailgate_message_project_financial_user","mailgate.message.financial.user","mail_gateway.model_mailgate_message","project.group_project_finance_user",1,0,0,0
"access_mailgate_message_project_manager","mailgate.message.manager","mail_gateway.model_mailgate_message","project.group_project_manager",1,1,1,1
"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,1,1,0
diff --git a/addons/project_issue_sheet/security/ir.model.access.csv b/addons/project_issue_sheet/security/ir.model.access.csv
index 15c23202cea2..0e6c92c038ba 100644
--- a/addons/project_issue_sheet/security/ir.model.access.csv
+++ b/addons/project_issue_sheet/security/ir.model.access.csv
@@ -3,11 +3,6 @@
"access_hr_analytic_timesheet_project_user","hr_analytic_timesheet user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
"access_hr_analytic_timesheet_project_manager","hr_analytic_timesheet manager","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_manager",1,0,0,0
"access_hr_timesheet_sheet_sheet_project_manager","hr_timesheet_sheet.sheet manager","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_manager",1,0,0,0
-"access_hr_analytic_timesheet_project_financial_user","account.analytic.line.timesheet.project.financial.user","account.model_account_analytic_line","project.group_project_finance_user",1,1,1,0
-"access_account_analytic_journal_project_financial_user","account.analytic.journal.project.financial.user","account.model_account_analytic_journal","project.group_project_finance_user",1,1,1,0
-"access_account_fiscalyear_project_financial_user","account.fiscalyear.project.financial.user","account.model_account_fiscalyear","project.group_project_finance_user",1,1,1,0
-"access_hr_timesheet_invoice_factor_project_financial_user","hr_timesheet_invoice.factor.project.financial.user","hr_timesheet_invoice.model_hr_timesheet_invoice_factor","project.group_project_finance_user",1,1,1,0
-"access_account_invoice_project_financial_user","account.invoice.project.financial.user","account.model_account_invoice","project.group_project_finance_user",1,1,1,0
"access_hr_analytic_timesheet_project_manager","account.analytic.line.timesheet.project.manager","account.model_account_analytic_line","project.group_project_manager",1,1,1,1
"access_account_analytic_journal_project_manager","account.analytic.journal.project.manager","account.model_account_analytic_journal","project.group_project_manager",1,1,1,1
"access_account_fiscalyear_project_manager","account.fiscalyear.project.manager","account.model_account_fiscalyear","project.group_project_manager",1,1,1,1
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index ac6f884f3a4c..71e965432327 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -379,10 +379,10 @@
name="Resource Allocations" parent="base.menu_project_long_term" sequence="2"/>
<menuitem id="menu_pm_resources_project1"
- groups="base.group_extended,project.group_project_finance_user"
+ groups="base.group_extended"
name="Resources" parent="project.menu_definitions" sequence="3"/>
- <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
+ <menuitem id="menu_phase_schedule" name="Scheduling" parent="base.menu_main_pm" sequence="4" groups="project.group_project_user,project.group_project_manager"/>
<menuitem action="resource.action_resource_resource_tree" id="menu_view_resource" parent="menu_pm_resources_project1" sequence="2"/>
<menuitem action="resource.action_resource_calendar_form" id="menu_view_resource_calendar" parent="menu_pm_resources_project1" sequence="1"/>
<menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves" parent="menu_pm_resources_project1" sequence="1"/>
diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv
index 3d91ca956ced..3aaebb64294b 100644
--- a/addons/project_long_term/security/ir.model.access.csv
+++ b/addons/project_long_term/security/ir.model.access.csv
@@ -6,9 +6,4 @@
"access_resource_resource_user","resource.resource user","resource.model_resource_resource","project.group_project_user",1,0,0,0
"access_resource_calendar_leaves_user","resource.calendar.leaves user","resource.model_resource_calendar_leaves","project.group_project_user",1,1,1,1
"access_resource_resource_manager","resource.resource manager","resource.model_resource_resource","project.group_project_manager",1,1,1,1
-"access_project_resource_allocation_financial_user","project.resource.allocation.financial.user","model_project_resource_allocation","project.group_project_finance_user",1,0,0,0
-"access_project_phase_financial_user","project.phase.financial.user","model_project_phase","project.group_project_finance_user",1,0,0,0
-"access_resource_resource_financial_user","resource.resource.financial.user","model_resource_resource","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar","project.group_project_finance_user",1,0,0,0
-"access_resource_calendar_financial_user","resource.calendar.financial.user","resource.model_resource_calendar_leaves","project.group_project_finance_user",1,0,0,0
"access_project_resource_allocation_manager","project.resource.allocation.manager","model_project_resource_allocation","project.group_project_manager",1,1,1,1
diff --git a/addons/project_messages/security/ir.model.access.csv b/addons/project_messages/security/ir.model.access.csv
index e31ffd860cb5..5756a7456bb5 100644
--- a/addons/project_messages/security/ir.model.access.csv
+++ b/addons/project_messages/security/ir.model.access.csv
@@ -1,5 +1,4 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
"access_project_messages","project.messages","model_project_messages","project.group_project_user",1,1,1,1
"access_project_messages_manager","project.messages manager","model_project_messages","project.group_project_manager",1,1,1,1
-"access_project_messages_financial_user","project.messages.financial.user","model_project_messages","project.group_project_finance_user",1,0,0,0
"access_project_message_project_user","project.project.user","model_project_project","project.group_project_user",1,0,0,0
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index bd0b5c359b28..9abff817d170 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -219,7 +219,7 @@
parent="base.menu_main_pm" />
<menuitem action="action_account_analytic_planning_form"
- id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager,project.group_project_finance_user"/>
+ id="menu_report_account_analytic_planning" parent="base.menu_project_long_term" sequence="3" groups="project.group_project_user,project.group_project_manager"/>
<!--
Planning statistics
diff --git a/addons/project_planning/security/ir.model.access.csv b/addons/project_planning/security/ir.model.access.csv
index c42263370f31..d5cb64be83da 100644
--- a/addons/project_planning/security/ir.model.access.csv
+++ b/addons/project_planning/security/ir.model.access.csv
@@ -8,7 +8,4 @@
"access_report_account_analytic_planning_account_project_manager","report_account_analytic.planning.account","model_report_account_analytic_planning_account","project.group_project_manager",1,1,1,1
"access_report_account_analytic_planning_line_project_user","report_account_analytic.planning.line user","model_report_account_analytic_planning_line","project.group_project_user",1,1,1,0
"access_report_account_analytic_planning_account_project_user","report_account_analytic.planning.account user","model_report_account_analytic_planning_account","project.group_project_user",1,1,1,0
-"access_report_account_analytic_planning_financial_user","report_account_analytic.planning.financial.user","model_report_account_analytic_planning","project.group_project_finance_user",1,0,0,0
-"access_report_account_analytic_planning_stat_financial_user","report_account_analytic.planning.stat.financial.user","model_report_account_analytic_planning_stat","project.group_project_finance_user",1,0,0,0
"access_report_account_analytic_planning__project_manager","report_account_analytic.planning.manager","model_report_account_analytic_planning_user","project.group_project_manager",1,1,1,1
-"access_report_account_analytic_planning__project_finance_user","report_account_analytic.planning.finance.user","model_report_account_analytic_planning_user","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_scrum/security/ir.model.access.csv b/addons/project_scrum/security/ir.model.access.csv
index 0a4746e185a6..88e8c506e14b 100644
--- a/addons/project_scrum/security/ir.model.access.csv
+++ b/addons/project_scrum/security/ir.model.access.csv
@@ -7,6 +7,3 @@
"access_scrum_product_backlog_manager","project_scrum.product.backlog manager","model_project_scrum_product_backlog","project.group_project_manager",1,1,1,1
"access_product_uom_project_manager","product.uom project manager","product.model_product_uom","project.group_project_manager",1,1,1,1
"access_product_uom_project_user","product.uom project user","product.model_product_uom","project.group_project_user",1,0,0,0
-"access_project_scrum_backlog_financial_user","project_scrum.product.backlog.financial.user","model_project_scrum_product_backlog","project.group_project_finance_user",1,0,0,0
-"access_project_scrum_sprint_financial_user","project_scrum.sprint.financial.user","model_project_scrum_sprint","project.group_project_finance_user",1,0,0,0
-"access_scrum_meeting_financial_user","project_scrum.meeting.financial.user","model_project_scrum_meeting","project.group_project_finance_user",1,0,0,0
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c0dcd3a46bc8..5ceaf83890e7 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -37,6 +37,6 @@
<menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
parent="menu_project_billing" action="hr_timesheet_invoice.action_hr_analytic_timesheet_open_tree"/>
<menuitem id="base.menu_project_management_time_tracking" name="Time Tracking"
- parent="base.menu_main_pm" sequence="5" groups="project.group_project_finance_user"/>
+ parent="base.menu_main_pm" sequence="5"/>
</data>
</openerp>
diff --git a/addons/project_timesheet/security/ir.model.access.csv b/addons/project_timesheet/security/ir.model.access.csv
index 54e359562488..4888811df2f9 100644
--- a/addons/project_timesheet/security/ir.model.access.csv
+++ b/addons/project_timesheet/security/ir.model.access.csv
@@ -2,5 +2,3 @@
"access_report_timesheet_task_user_manager","report.timesheet.task.user.manager","model_report_timesheet_task_user","project.group_project_manager",1,1,1,1
"access_hr_analytic_timesheet_user","hr.analytic.timesheet.user","hr_timesheet_sheet.model_hr_analytic_timesheet","project.group_project_user",1,1,1,0
"access_hr_timesheet_sheet_sheet_user","hr.timesheet.sheet.sheet.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_user",1,1,1,0
-"access_project_timesheet_project_financial_user","hr_timesheet_sheet.sheet.project.financial.user","hr_timesheet_sheet.model_hr_timesheet_sheet_sheet","project.group_project_finance_user",1,1,1,0
-"access_report_timesheet_task_user_financial_user","report.timesheet.task.user.financial.user","model_report_timesheet_task_user","project.group_project_finance_user",1,0,0,0
--
GitLab