diff --git a/account_invoice_currency/__init__.py b/account_invoice_currency/__init__.py
deleted file mode 100644
index 8e877eba3..000000000
--- a/account_invoice_currency/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) 2004-2011 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-#
-# 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 .
-#
-##############################################################################
-
-
-import invoice
diff --git a/account_invoice_currency/__openerp__.py b/account_invoice_currency/__openerp__.py
deleted file mode 100644
index 2ea0bbf62..000000000
--- a/account_invoice_currency/__openerp__.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# OpenERP - Account invoice currency
-# Copyright (C) 2004-2011 Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-# Jordi Esteve
-# Copyright (c) 2013 Joaquin Gutierrez (http://www.gutierrezweb.es)
-#
-# 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 .
-#
-##############################################################################
-
-{
- 'name': "Company currency in invoices",
- 'version': "1.0",
- 'author': "Zikzakmedia SL",
- 'website': "http://www.zikzakmedia.com",
- 'category': "Localisation / Accounting",
- 'contributors': ['Joaquín Gutierrez'],
- "description": """
-This Module adds functional fields to show invoice in the company currency
-==========================================================================
-
-Amount Untaxed, Amount Tax and Amount Total invoice fields in the company currency.
-These fields are shown in "Other information" tab in invoice form.
- """,
- 'license': "AGPL-3",
- 'depends': ["account"],
- 'data': [
- "account_invoice_view.xml"
- ],
- 'installable': True,
- 'active': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/account_invoice_currency/account_invoice_view.xml b/account_invoice_currency/account_invoice_view.xml
deleted file mode 100644
index 14270ace6..000000000
--- a/account_invoice_currency/account_invoice_view.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
- Account invoice supplier (form) - add company currency
- account.invoice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Account invoice (form) - add company currency
- account.invoice
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/account_invoice_currency/i18n/account_invoice_currency.pot b/account_invoice_currency/i18n/account_invoice_currency.pot
deleted file mode 100644
index 07b9e1152..000000000
--- a/account_invoice_currency/i18n/account_invoice_currency.pot
+++ /dev/null
@@ -1,57 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_invoice_currency
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0-20130927-231103\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-18 11:53+0000\n"
-"PO-Revision-Date: 2013-11-18 11:53+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_invoice_currency
-#: help:account.invoice,cc_amount_total:0
-msgid "Invoice total amount in the company currency (useful when invoice currency is different from company currency)."
-msgstr "Invoice total amount in the company currency (useful when invoice currency is different from company currency)."
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_total:0
-msgid "Company Cur. Total"
-msgstr "Company Cur. Total"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_tax:0
-msgid "Company Cur. Tax"
-msgstr "Company Cur. Tax"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_tax:0
-msgid "Invoice tax amount in the company currency (useful when invoice currency is different from company currency)."
-msgstr "Invoice tax amount in the company currency (useful when invoice currency is different from company currency)."
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_untaxed:0
-msgid "Invoice untaxed amount in the company currency(useful when invoice currency is different from company currency)."
-msgstr "Invoice untaxed amount in the company currency(useful when invoice currency is different from company currency)."
-
-#. module: account_invoice_currency
-#: view:account.invoice:0
-msgid "Amounts in company currency"
-msgstr "Amounts in company currency"
-
-#. module: account_invoice_currency
-#: model:ir.model,name:account_invoice_currency.model_account_invoice
-msgid "Invoice"
-msgstr "Invoice"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_untaxed:0
-msgid "Company Cur. Untaxed"
-msgstr "Company Cur. Untaxed"
-
diff --git a/account_invoice_currency/i18n/ca.po b/account_invoice_currency/i18n/ca.po
deleted file mode 100644
index 3ed0d59c5..000000000
--- a/account_invoice_currency/i18n/ca.po
+++ /dev/null
@@ -1,68 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_invoice_currency
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.9\n"
-"Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2013-11-18 11:53+0000\n"
-"PO-Revision-Date: 2014-02-04 16:50+0000\n"
-"Last-Translator: Jordi Esteve (www.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: 2014-06-12 06:31+0000\n"
-"X-Generator: Launchpad (build 17041)\n"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_total:0
-msgid ""
-"Invoice total amount in the company currency (useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-"Total de la factura en la moneda de la companyia (útil quan les monedes de "
-"la factura i de la companyia són diferents)."
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_total:0
-msgid "Company Cur. Total"
-msgstr "Total moneda companyia"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_tax:0
-msgid "Company Cur. Tax"
-msgstr "Impostos moneda companyia"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_tax:0
-msgid ""
-"Invoice tax amount in the company currency (useful when invoice currency is "
-"different from company currency)."
-msgstr ""
-"Impostos de la factura en la moneda de la companyia (útil quan les monedes "
-"de la factura i de la companyia són diferents)."
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_untaxed:0
-msgid ""
-"Invoice untaxed amount in the company currency(useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-
-#. module: account_invoice_currency
-#: view:account.invoice:0
-msgid "Amounts in company currency"
-msgstr ""
-
-#. module: account_invoice_currency
-#: model:ir.model,name:account_invoice_currency.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_untaxed:0
-msgid "Company Cur. Untaxed"
-msgstr "Base moneda companyia"
diff --git a/account_invoice_currency/i18n/es.po b/account_invoice_currency/i18n/es.po
deleted file mode 100644
index 771caade6..000000000
--- a/account_invoice_currency/i18n/es.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account_invoice_currency
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 5.0.9\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-18 11:53+0000\n"
-"PO-Revision-Date: 2014-04-08 19:42+0000\n"
-"Last-Translator: Pedro Manuel Baeza \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: 2014-06-12 06:31+0000\n"
-"X-Generator: Launchpad (build 17041)\n"
-"Language: \n"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_total:0
-msgid ""
-"Invoice total amount in the company currency (useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-"Total de la factura en la moneda de la compañía (útil cuando las monedas de "
-"la factura y de la compañía son distintas)."
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_total:0
-msgid "Company Cur. Total"
-msgstr "Total moneda compañía"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_tax:0
-msgid "Company Cur. Tax"
-msgstr "Impuestos moneda compañía"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_tax:0
-msgid ""
-"Invoice tax amount in the company currency (useful when invoice currency is "
-"different from company currency)."
-msgstr ""
-"Impuestos de la factura en la moneda de la compañía (útil cuando las monedas "
-"de la factura y de la compañía son distintas)."
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_untaxed:0
-msgid ""
-"Invoice untaxed amount in the company currency(useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-"Importe sin impuestos de la factura en la moneda de la compañía (útil cuando "
-" la moneda de la factura es diferente de la moneda de la compañía)."
-
-#. module: account_invoice_currency
-#: view:account.invoice:0
-msgid "Amounts in company currency"
-msgstr "Importes moneda empresa"
-
-#. module: account_invoice_currency
-#: model:ir.model,name:account_invoice_currency.model_account_invoice
-msgid "Invoice"
-msgstr "Factura"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_untaxed:0
-msgid "Company Cur. Untaxed"
-msgstr "Base moneda compañía"
diff --git a/account_invoice_currency/i18n/pt.po b/account_invoice_currency/i18n/pt.po
deleted file mode 100644
index 8808f6c0a..000000000
--- a/account_invoice_currency/i18n/pt.po
+++ /dev/null
@@ -1,68 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR , 2011.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-11-18 11:53+0000\n"
-"PO-Revision-Date: 2014-02-04 16:49+0000\n"
-"Last-Translator: Joaquin Gutierrez \n"
-"Language-Team: Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-06-12 06:31+0000\n"
-"X-Generator: Launchpad (build 17041)\n"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_total:0
-msgid ""
-"Invoice total amount in the company currency (useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-"Montante da factura total na moeda da empresa (útil quando moeda de "
-"facturação é diferente da moeda da empresa)."
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_total:0
-msgid "Company Cur. Total"
-msgstr "Total Moeda da Empresas"
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_tax:0
-msgid "Company Cur. Tax"
-msgstr "Imposto da Moeda da Empresa"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_tax:0
-msgid ""
-"Invoice tax amount in the company currency (useful when invoice currency is "
-"different from company currency)."
-msgstr ""
-"Montante de factura de imposto na moeda da empresa(Útil quando moeda de "
-"facturação é diferente da moeda da empresa)."
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_untaxed:0
-msgid ""
-"Invoice untaxed amount in the company currency(useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-
-#. module: account_invoice_currency
-#: view:account.invoice:0
-msgid "Amounts in company currency"
-msgstr ""
-
-#. module: account_invoice_currency
-#: model:ir.model,name:account_invoice_currency.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_untaxed:0
-msgid "Company Cur. Untaxed"
-msgstr "Moeda da Empresa não Tributada"
diff --git a/account_invoice_currency/i18n/pt_BR.po b/account_invoice_currency/i18n/pt_BR.po
deleted file mode 100644
index 3a8af858e..000000000
--- a/account_invoice_currency/i18n/pt_BR.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# Brazilian Portuguese translation for account-financial-tools
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the account-financial-tools package.
-# FIRST AUTHOR , 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: account-financial-tools\n"
-"Report-Msgid-Bugs-To: FULL NAME \n"
-"POT-Creation-Date: 2013-11-18 11:53+0000\n"
-"PO-Revision-Date: 2014-06-15 10:06+0000\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Brazilian Portuguese \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-06-16 06:09+0000\n"
-"X-Generator: Launchpad (build 17045)\n"
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_total:0
-msgid ""
-"Invoice total amount in the company currency (useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_total:0
-msgid "Company Cur. Total"
-msgstr ""
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_tax:0
-msgid "Company Cur. Tax"
-msgstr ""
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_tax:0
-msgid ""
-"Invoice tax amount in the company currency (useful when invoice currency is "
-"different from company currency)."
-msgstr ""
-
-#. module: account_invoice_currency
-#: help:account.invoice,cc_amount_untaxed:0
-msgid ""
-"Invoice untaxed amount in the company currency(useful when invoice currency "
-"is different from company currency)."
-msgstr ""
-
-#. module: account_invoice_currency
-#: view:account.invoice:0
-msgid "Amounts in company currency"
-msgstr ""
-
-#. module: account_invoice_currency
-#: model:ir.model,name:account_invoice_currency.model_account_invoice
-msgid "Invoice"
-msgstr ""
-
-#. module: account_invoice_currency
-#: field:account.invoice,cc_amount_untaxed:0
-msgid "Company Cur. Untaxed"
-msgstr ""
diff --git a/account_invoice_currency/invoice.py b/account_invoice_currency/invoice.py
deleted file mode 100644
index 724bf4b23..000000000
--- a/account_invoice_currency/invoice.py
+++ /dev/null
@@ -1,148 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-# Copyright (C) 2004-2011
-# Pexego Sistemas Informáticos. (http://pexego.es) All Rights Reserved
-# Zikzakmedia S.L. (http://zikzakmedia.com) All Rights Reserved.
-#
-# 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 .
-#
-##############################################################################
-
-
-from openerp.osv import fields
-from openerp.osv import orm
-from openerp.tools.translate import _
-import openerp.addons.decimal_precision as dp
-
-
-class account_invoice(orm.Model):
- """
- Inheritance of account invoice to add company currency amounts
- """
-
- _inherit = "account.invoice"
-
- def _get_invoice_line2(self, cr, uid, ids, context=None):
- result = {}
- for line in self.pool.get('account.invoice.line').browse(cr,
- uid,
- ids,
- context=context):
- result[line.invoice_id.id] = True
- return result.keys()
-
- def _get_invoice_tax2(self, cr, uid, ids, context=None):
- result = {}
- for tax in self.pool.get('account.invoice.tax').browse(cr,
- uid,
- ids,
- context=context):
- result[tax.invoice_id.id] = True
- return result.keys()
-
- def _cc_amount_all(self, cr, uid, ids, name, args, context=None):
- res = {}
- for invoice in self.browse(cr, uid, ids, context=context):
- if invoice.company_id.currency_id == invoice.currency_id:
- res[invoice.id] = {
- 'cc_amount_untaxed': invoice.amount_untaxed,
- 'cc_amount_tax': invoice.amount_tax,
- 'cc_amount_total': invoice.amount_total,
- }
- else:
- res[invoice.id] = {
- 'cc_amount_untaxed': 0.0,
- 'cc_amount_tax': 0.0,
- 'cc_amount_total': 0.0,
- }
-
- ## It could be computed only in open or paid invoices with a generated account move
- if invoice.move_id:
- ## Accounts to compute amount_untaxed
- line_account = []
- for line in invoice.invoice_line:
- if line.account_id.id not in line_account:
- line_account.append(line.account_id.id)
-
- ## Accounts to compute amount_tax
- tax_account = []
- for line in invoice.tax_line:
- if line.account_id.id not in tax_account and line.amount != 0:
- tax_account.append(line.account_id.id)
-
- ## The company currency amounts are the debit-credit amounts in the account moves
- for line in invoice.move_id.line_id:
- if line.account_id.id in line_account:
- res[invoice.id]['cc_amount_untaxed'] += line.debit - line.credit
- if line.account_id.id in tax_account:
- res[invoice.id]['cc_amount_tax'] += line.debit - line.credit
- if invoice.type in ('out_invoice', 'in_refund'):
- res[invoice.id]['cc_amount_untaxed'] = -res[invoice.id]['cc_amount_untaxed']
- res[invoice.id]['cc_amount_tax'] = -res[invoice.id]['cc_amount_tax']
- res[invoice.id]['cc_amount_total'] = res[invoice.id]['cc_amount_tax'] + res[invoice.id]['cc_amount_untaxed']
- return res
-
- _columns = {
- 'cc_amount_untaxed': fields.function(_cc_amount_all,
- method=True,
- digits_compute=dp.get_precision('Account'),
- string='Company Cur. Untaxed',
- help="Invoice untaxed amount in the company currency"\
- "(useful when invoice currency is different from company currency).",
- store={
- 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line',
- 'currency_id',
- 'move_id'], 20),
- 'account.invoice.tax': (_get_invoice_tax2, None, 20),
- 'account.invoice.line': (_get_invoice_line2, ['price_unit',
- 'invoice_line_tax_id',
- 'quantity', 'discount'], 20),
- },
- multi='cc_all'),
- 'cc_amount_tax': fields.function(_cc_amount_all,
- method=True,
- digits_compute=dp.get_precision('Account'),
- string='Company Cur. Tax',
- help="Invoice tax amount in the company currency "\
- "(useful when invoice currency is different from company currency).",
- store={
- 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line',
- 'currency_id',
- 'move_id'], 20),
- 'account.invoice.tax': (_get_invoice_tax2, None, 20),
- 'account.invoice.line': (_get_invoice_line2, ['price_unit',
- 'invoice_line_tax_id',
- 'quantity', 'discount'], 20),
- },
- multi='cc_all'),
- 'cc_amount_total': fields.function(_cc_amount_all,
- method=True,
- digits_compute=dp.get_precision('Account'),
- string='Company Cur. Total',
- help="Invoice total amount in the company currency "\
- "(useful when invoice currency is different from company currency).",
- store={
- 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line',
- 'currency_id',
- 'move_id'], 20),
- 'account.invoice.tax': (_get_invoice_tax2, None, 20),
- 'account.invoice.line': (_get_invoice_line2, ['price_unit',
- 'invoice_line_tax_id',
- 'quantity', 'discount'], 20),
- },
- multi='cc_all'),
- }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: