mirror of
https://github.com/OCA/account-financial-tools.git
synced 2025-02-02 12:47:26 +02:00
[MIG] account_invoice_currency: Migrated to 10.0
This commit is contained in:
Sébastien Namèche
committed by
Pedro M. Baeza
Pedro M. Baeza
parent
cf13a193e4
commit
13e8e32d4f
@@ -57,6 +57,7 @@ Contributors
|
||||
* Joaquín Gutierrez <joaquing.pedrosa@gmail.com>
|
||||
* Pedro M. Baeza <pedro.baeza@serviciosbaeza.com>
|
||||
* Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
* Sébastien Namèche <seb@itik.fr>
|
||||
|
||||
Maintainer
|
||||
----------
|
||||
|
||||
@@ -8,18 +8,18 @@
|
||||
|
||||
{
|
||||
'name': "Company currency in invoices",
|
||||
'version': "9.0.1.0.0",
|
||||
'version': "10.0.1.0.0",
|
||||
'author': "Zikzakmedia SL, "
|
||||
"Joaquín Gutierrez, "
|
||||
"Serv. Tecnol. Avanzados - Pedro M. Baeza, "
|
||||
"Tecnativa, "
|
||||
"Odoo Community Association (OCA) ",
|
||||
'website': "https://odoo-community.org/",
|
||||
'category': "Localisation / Accounting",
|
||||
'category': "Accounting",
|
||||
'license': "AGPL-3",
|
||||
'depends': ["account"],
|
||||
'data': [
|
||||
"views/account_invoice_view.xml"
|
||||
"views/account_invoice.xml"
|
||||
],
|
||||
'installable': True,
|
||||
}
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from openupgradelib import openupgrade
|
||||
|
||||
column_renames = {
|
||||
'account_invoice': [
|
||||
('cc_amount_tax', 'amount_tax_signed'),
|
||||
],
|
||||
}
|
||||
|
||||
column_copies = {
|
||||
'account_invoice': [
|
||||
('cc_amount_untaxed', 'amount_untaxed_signed', None),
|
||||
('cc_amount_total', 'amount_total_company_signed', None),
|
||||
],
|
||||
}
|
||||
|
||||
|
||||
def migrate(cr, version):
|
||||
openupgrade.rename_columns(cr, column_renames)
|
||||
openupgrade.copy_columns(cr, column_copies)
|
||||
@@ -6,7 +6,7 @@
|
||||
# © 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
|
||||
|
||||
from openerp import models, fields, api
|
||||
from odoo import models, fields, api
|
||||
|
||||
|
||||
class AccountInvoice(models.Model):
|
||||
@@ -18,10 +18,11 @@ class AccountInvoice(models.Model):
|
||||
help="Invoice tax amount in the company currency, "
|
||||
"negative for credit notes.")
|
||||
|
||||
@api.one
|
||||
@api.multi
|
||||
@api.depends('invoice_line_ids.price_subtotal', 'tax_line_ids.amount',
|
||||
'currency_id', 'company_id')
|
||||
def _compute_amount(self):
|
||||
super(AccountInvoice, self)._compute_amount()
|
||||
self.amount_tax_signed = (
|
||||
self.amount_total_company_signed - self.amount_untaxed_signed)
|
||||
for inv in self:
|
||||
inv.amount_tax_signed = (
|
||||
inv.amount_total_company_signed - inv.amount_untaxed_signed)
|
||||
|
||||
@@ -2,13 +2,12 @@
|
||||
# Copyright 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||
|
||||
from openerp.tests.common import TransactionCase
|
||||
from odoo.tests.common import TransactionCase
|
||||
|
||||
|
||||
class TestAccountInvoiceCurrency(TransactionCase):
|
||||
def setUp(self, *args, **kwargs):
|
||||
super(TestAccountInvoiceCurrency, self).setUp(*args, **kwargs)
|
||||
|
||||
def setUp(self):
|
||||
super(TestAccountInvoiceCurrency, self).setUp()
|
||||
type_revenue = self.env.ref('account.data_account_type_revenue')
|
||||
type_payable = self.env.ref('account.data_account_type_payable')
|
||||
tax_group_taxes = self.env.ref('account.tax_group_taxes')
|
||||
|
||||
87
account_invoice_currency/views/account_invoice.xml
Normal file
87
account_invoice_currency/views/account_invoice.xml
Normal file
@@ -0,0 +1,87 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright 2004-2011 Pexego Sistemas Informáticos. (http://pexego.es)
|
||||
Copyright 2004-2011 Zikzakmedia S.L. (http://zikzakmedia.com)
|
||||
Jordi Esteve <jesteve@zikzakmedia.com>
|
||||
Copyright 2014-2015 Serv. Tecnol. Avanzados - Pedro M. Baeza
|
||||
Copyright 2016 - Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
Copyright 2017 - Sébastien Namèche <seb@itik.fr>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
<odoo>
|
||||
|
||||
<!-- ## Suppliers Form ## -->
|
||||
<record id="invoice_supplier_form" model="ir.ui.view">
|
||||
<field name="name">Account invoice supplier (form) - add company currency</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='move_id']/.." position="after">
|
||||
<group string="Amounts in company currency">
|
||||
<field name="amount_untaxed_signed"/>
|
||||
<field name="amount_tax_signed"/>
|
||||
<field name="amount_total_company_signed"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ## Suppliers Tree ## -->
|
||||
<record id="invoice_supplier_tree" model="ir.ui.view">
|
||||
<field name="name">account.invoice.supplier.currency.tree</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_supplier_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<!-- It makes no sense to do the sum of multiple currencies -->
|
||||
<field name="amount_total_signed" position="attributes">
|
||||
<attribute name="sum"/>
|
||||
</field>
|
||||
<field name="residual_signed" position="attributes">
|
||||
<attribute name="sum"/>
|
||||
</field>
|
||||
<!-- Here, amounts are all in company currency -->
|
||||
<field name="amount_total_signed" position="after">
|
||||
<field name="amount_total_company_signed" sum="Total"
|
||||
string="Total (Company Currency)" widget="monetary"
|
||||
options="{'currency_field': 'company_currency_id'}"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ## Customers Form ## -->
|
||||
<record id="invoice_form" model="ir.ui.view">
|
||||
<field name="name">Account invoice (form) - add company currency</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='move_id']/.." position="after">
|
||||
<group string="Amounts in company currency">
|
||||
<field name="amount_untaxed_signed"/>
|
||||
<field name="amount_tax_signed"/>
|
||||
<field name="amount_total_company_signed"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
<!-- ## Customers Tree ## -->
|
||||
<record id="invoice_tree" model="ir.ui.view">
|
||||
<field name="name">account.invoice.currency.tree</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<!-- It makes no sense to do the sum of multiple currencies -->
|
||||
<field name="amount_total_signed" position="attributes">
|
||||
<attribute name="sum"/>
|
||||
</field>
|
||||
<field name="residual_signed" position="attributes">
|
||||
<attribute name="sum"/>
|
||||
</field>
|
||||
<!-- Here, amounts are all in company currency -->
|
||||
<field name="amount_total_signed" position="after">
|
||||
<field name="amount_total_company_signed" sum="Total"
|
||||
string="Total (Company Currency)" widget="monetary"
|
||||
options="{'currency_field': 'company_currency_id'}"/>
|
||||
</field>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright 2004-2011 Pexego Sistemas Informáticos. (http://pexego.es)
|
||||
Copyright 2004-2011 Zikzakmedia S.L. (http://zikzakmedia.com)
|
||||
Jordi Esteve <jesteve@zikzakmedia.com>
|
||||
Copyright 2014-2015 Serv. Tecnol. Avanzados - Pedro M. Baeza
|
||||
Copyright 2016 - Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||
License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
|
||||
<odoo>
|
||||
|
||||
<!-- ## Suppliers ## -->
|
||||
<record id="invoice_supplier_company_currency_form" model="ir.ui.view">
|
||||
<field name="name">Account invoice supplier (form) - add company currency</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_supplier_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='move_id']/.." position="after">
|
||||
<group string="Amounts in company currency">
|
||||
<field name="amount_untaxed_signed"/>
|
||||
<field name="amount_tax_signed"/>
|
||||
<field name="amount_total_company_signed"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
<!-- ## Customers ## -->
|
||||
<record id="invoice_company_currency_form" model="ir.ui.view">
|
||||
<field name="name">Account invoice (form) - add company currency</field>
|
||||
<field name="model">account.invoice</field>
|
||||
<field name="inherit_id" ref="account.invoice_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="//field[@name='move_id']/.." position="after">
|
||||
<group string="Amounts in company currency">
|
||||
<field name="amount_untaxed_signed"/>
|
||||
<field name="amount_tax_signed"/>
|
||||
<field name="amount_total_company_signed"/>
|
||||
</group>
|
||||
</xpath>
|
||||
</field>
|
||||
</record>
|
||||
|
||||
</odoo>
|
||||
Reference in New Issue
Block a user