From 02368a5952bebeb75b6f60f6ff7b15ff56c85a3b Mon Sep 17 00:00:00 2001 From: Lorenzo Battistini Date: Mon, 24 Sep 2018 10:54:29 +0200 Subject: [PATCH 01/14] ADD l10n_it_vat_registries_split_payment to fix the following case: (#570) - Configure Split Payment fiscal position and tax - Make a customer invoice with SP - Print VAT register Split Payment VAT must not appear as deductible VAT --- .../README.rst | 73 +++ .../__init__.py | 4 + .../__manifest__.py | 21 + .../l10n_it_vat_registries_split_payment.pot | 20 + .../models/__init__.py | 4 + .../models/account_tax.py | 16 + .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 419 ++++++++++++++++++ .../tests/__init__.py | 3 + .../tests/test_sp.py | 101 +++++ 12 files changed, 663 insertions(+) create mode 100644 l10n_it_vat_registries_split_payment/README.rst create mode 100644 l10n_it_vat_registries_split_payment/__init__.py create mode 100644 l10n_it_vat_registries_split_payment/__manifest__.py create mode 100644 l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot create mode 100644 l10n_it_vat_registries_split_payment/models/__init__.py create mode 100644 l10n_it_vat_registries_split_payment/models/account_tax.py create mode 100644 l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst create mode 100644 l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst create mode 100644 l10n_it_vat_registries_split_payment/static/description/icon.png create mode 100644 l10n_it_vat_registries_split_payment/static/description/index.html create mode 100644 l10n_it_vat_registries_split_payment/tests/__init__.py create mode 100644 l10n_it_vat_registries_split_payment/tests/test_sp.py diff --git a/l10n_it_vat_registries_split_payment/README.rst b/l10n_it_vat_registries_split_payment/README.rst new file mode 100644 index 000000000000..a30f962a1790 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/README.rst @@ -0,0 +1,73 @@ +============================== +VAT registries + Split Payment +============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github + :target: https://github.com/OCA/l10n-italy/tree/10.0/l10n_it_vat_registries_split_payment + :alt: OCA/l10n-italy +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/l10n-italy-10-0/l10n-italy-10-0-l10n_it_vat_registries_split_payment + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/122/10.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Bridge module to make VAT registries module work along with Split Payment module + +**Table of contents** + +.. contents:: + :local: + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Agile Business Group + +Contributors +~~~~~~~~~~~~ + +* Lorenzo Battistini + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +This module is part of the `OCA/l10n-italy `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_it_vat_registries_split_payment/__init__.py b/l10n_it_vat_registries_split_payment/__init__.py new file mode 100644 index 000000000000..b44d765940f6 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import models diff --git a/l10n_it_vat_registries_split_payment/__manifest__.py b/l10n_it_vat_registries_split_payment/__manifest__.py new file mode 100644 index 000000000000..bac0d8543d81 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/__manifest__.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Copyright 2018 Lorenzo Battistini +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "VAT registries + Split Payment", + "summary": "Bridge module to make VAT registries work with Split Payment", + "version": "10.0.1.0.0", + "development_status": "Beta", + "category": "Hidden", + "website": "https://github.com/OCA/l10n-italy/", + "author": "Agile Business Group, Odoo Community Association (OCA)", + "license": "AGPL-3", + "application": False, + "installable": True, + "auto_install": True, + "depends": [ + "l10n_it_vat_registries", + "l10n_it_split_payment" + ], +} diff --git a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot new file mode 100644 index 000000000000..d8cb4e86776d --- /dev/null +++ b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * l10n_it_vat_registries_split_payment +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 10.0\n" +"Report-Msgid-Bugs-To: \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: l10n_it_vat_registries_split_payment +#: model:ir.model,name:l10n_it_vat_registries_split_payment.model_account_tax +msgid "Tax" +msgstr "" + diff --git a/l10n_it_vat_registries_split_payment/models/__init__.py b/l10n_it_vat_registries_split_payment/models/__init__.py new file mode 100644 index 000000000000..43583b2f71f7 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/models/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from . import account_tax diff --git a/l10n_it_vat_registries_split_payment/models/account_tax.py b/l10n_it_vat_registries_split_payment/models/account_tax.py new file mode 100644 index 000000000000..ae8b78708b87 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/models/account_tax.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class AccountTax(models.Model): + _inherit = 'account.tax' + + def _compute_totals_tax(self, data): + res = super(AccountTax, self)._compute_totals_tax(data) + if self.is_split_payment: + # res is (tax_name, base, tax, deductible, undeductible) + # so, in case of SP, SP VAT must not appear as deductible + return (res[0], res[1], res[2], 0.0, res[4]) + return res diff --git a/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst b/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000000..65a7e30bc6a5 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Lorenzo Battistini diff --git a/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst b/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst new file mode 100644 index 000000000000..2dac6dacef55 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +Bridge module to make VAT registries module work along with Split Payment module diff --git a/l10n_it_vat_registries_split_payment/static/description/icon.png b/l10n_it_vat_registries_split_payment/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/l10n_it_vat_registries_split_payment/static/description/index.html b/l10n_it_vat_registries_split_payment/static/description/index.html new file mode 100644 index 000000000000..5d826ed7f4d6 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/static/description/index.html @@ -0,0 +1,419 @@ + + + + + + +VAT registries + Split Payment + + + +
+

VAT registries + Split Payment

+ + +

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runbot

+

Bridge module to make VAT registries module work along with Split Payment module

+

Table of contents

+ +
+

Bug Tracker

+

Bugs are tracked on GitHub Issues. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +feedback.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Agile Business Group
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

This module is part of the OCA/l10n-italy project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/l10n_it_vat_registries_split_payment/tests/__init__.py b/l10n_it_vat_registries_split_payment/tests/__init__.py new file mode 100644 index 000000000000..167c7245e866 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/tests/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import test_sp diff --git a/l10n_it_vat_registries_split_payment/tests/test_sp.py b/l10n_it_vat_registries_split_payment/tests/test_sp.py new file mode 100644 index 000000000000..84ce7e9b76b6 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/tests/test_sp.py @@ -0,0 +1,101 @@ +# -*- coding: utf-8 -*- + +from odoo.addons.account.tests.account_test_users import AccountTestUsers + + +class TestSP(AccountTestUsers): + + def setUp(self): + super(TestSP, self).setUp() + self.tax_model = self.env['account.tax'] + self.invoice_model = self.env['account.invoice'] + self.inv_line_model = self.env['account.invoice.line'] + self.fp_model = self.env['account.fiscal.position'] + self.tax22sp = self.tax_model.create({ + 'name': '22% SP', + 'amount': 22, + }) + self.tax22 = self.tax_model.create({ + 'name': '22%', + 'amount': 22, + }) + self.sp_fp = self.fp_model.create({ + 'name': 'Split payment', + 'split_payment': True, + 'tax_ids': [(0, 0, { + 'tax_src_id': self.tax22.id, + 'tax_dest_id': self.tax22sp.id + })] + }) + self.company = self.env.ref('base.main_company') + self.company.sp_account_id = self.env['account.account'].search([ + ( + 'user_type_id', '=', + self.env.ref('account.data_account_type_current_assets').id + ) + ], limit=1) + account_user_type = self.env.ref( + 'account.data_account_type_receivable') + self.a_recv = self.account_model.sudo(self.account_manager.id).create( + dict( + code="cust_acc", + name="customer account", + user_type_id=account_user_type.id, + reconcile=True, + )) + self.a_sale = self.env['account.account'].search([ + ( + 'user_type_id', '=', + self.env.ref('account.data_account_type_revenue').id) + ], limit=1) + self.sales_journal = self.env['account.journal'].search( + [('type', '=', 'sale')])[0] + # Set invoice date to recent date in the system + # This solves problems with account_invoice_sequential_dates + self.recent_date = self.invoice_model.search( + [('date_invoice', '!=', False)], order='date_invoice desc', + limit=1).date_invoice + + def test_invoice(self): + invoice = self.invoice_model.create({ + 'date_invoice': self.recent_date, + 'partner_id': self.env.ref('base.res_partner_3').id, + 'journal_id': self.sales_journal.id, + 'account_id': self.a_recv.id, + 'fiscal_position_id': self.sp_fp.id, + 'invoice_line_ids': [(0, 0, { + 'name': 'service', + 'account_id': self.a_sale.id, + 'quantity': 1, + 'price_unit': 100, + 'invoice_line_tax_ids': [(6, 0, { + self.tax22sp.id + })] + })] + }) + invoice.action_invoice_open() + invoice2 = self.invoice_model.create({ + 'date_invoice': self.recent_date, + 'partner_id': self.env.ref('base.res_partner_3').id, + 'journal_id': self.sales_journal.id, + 'account_id': self.a_recv.id, + 'fiscal_position_id': self.sp_fp.id, + 'invoice_line_ids': [(0, 0, { + 'name': 'service', + 'account_id': self.a_sale.id, + 'quantity': 1, + 'price_unit': 100, + 'invoice_line_tax_ids': [(6, 0, { + self.tax22.id + })] + })] + }) + invoice2.action_invoice_open() + data = { + 'from_date': self.recent_date, + 'to_date': self.recent_date, + } + totals_sp = self.tax22sp._compute_totals_tax(data) + totals = self.tax22._compute_totals_tax(data) + self.assertEqual(totals_sp, (u'22% SP', 100.0, 22.0, 0.0, 0)) + self.assertEqual(totals, (u'22%', 100.0, 22.0, 22.0, 0)) From b46767b9e39206876e943002460fad4dfbab71c4 Mon Sep 17 00:00:00 2001 From: Matteo Bilotta Date: Thu, 6 Jun 2019 18:29:04 +0200 Subject: [PATCH 02/14] [MIG] l10n_it_vat_registries_split_payment: Migration to 11.0 --- .../README.rst | 27 ++++++++++----- .../__init__.py | 1 - .../__manifest__.py | 34 ++++++++++--------- .../l10n_it_vat_registries_split_payment.pot | 4 ++- .../models/__init__.py | 1 - .../models/account_tax.py | 6 ++-- .../readme/CONTRIBUTORS.rst | 1 + .../readme/DESCRIPTION.rst | 10 +++++- .../static/description/index.html | 20 +++++++---- .../tests/__init__.py | 2 -- .../tests/test_sp.py | 8 ++--- 11 files changed, 69 insertions(+), 45 deletions(-) diff --git a/l10n_it_vat_registries_split_payment/README.rst b/l10n_it_vat_registries_split_payment/README.rst index a30f962a1790..2c5b96102ec3 100644 --- a/l10n_it_vat_registries_split_payment/README.rst +++ b/l10n_it_vat_registries_split_payment/README.rst @@ -1,6 +1,6 @@ -============================== -VAT registries + Split Payment -============================== +============================================ +ITA - Registro IVA + Scissione dei pagamenti +============================================ .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! @@ -14,18 +14,26 @@ VAT registries + Split Payment :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-italy/tree/10.0/l10n_it_vat_registries_split_payment + :target: https://github.com/OCA/l10n-italy/tree/11.0/l10n_it_vat_registries_split_payment :alt: OCA/l10n-italy .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-italy-10-0/l10n-italy-10-0-l10n_it_vat_registries_split_payment + :target: https://translation.odoo-community.org/projects/l10n-italy-11-0/l10n-italy-11-0-l10n_it_vat_registries_split_payment :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/122/10.0 + :target: https://runbot.odoo-community.org/runbot/122/11.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| -Bridge module to make VAT registries module work along with Split Payment module +**Italiano** + +Modulo di congiunzione tra le funzionalità legate ai registri IVA e le +funzionalità inerenti alla scissione dei pagamenti. + +**English** + +Bridge module to make "VAT Registries" module work along with "Split Payment" +module. **Table of contents** @@ -38,7 +46,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -54,6 +62,7 @@ Contributors ~~~~~~~~~~~~ * Lorenzo Battistini +* Matteo Bilotta Maintainers ~~~~~~~~~~~ @@ -68,6 +77,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/l10n-italy `_ project on GitHub. +This module is part of the `OCA/l10n-italy `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_it_vat_registries_split_payment/__init__.py b/l10n_it_vat_registries_split_payment/__init__.py index b44d765940f6..31660d6a9650 100644 --- a/l10n_it_vat_registries_split_payment/__init__.py +++ b/l10n_it_vat_registries_split_payment/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import models diff --git a/l10n_it_vat_registries_split_payment/__manifest__.py b/l10n_it_vat_registries_split_payment/__manifest__.py index bac0d8543d81..10468a88eacf 100644 --- a/l10n_it_vat_registries_split_payment/__manifest__.py +++ b/l10n_it_vat_registries_split_payment/__manifest__.py @@ -1,21 +1,23 @@ -# -*- coding: utf-8 -*- # Copyright 2018 Lorenzo Battistini +# Copyright (c) 2019 Matteo Bilotta # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). { - "name": "VAT registries + Split Payment", - "summary": "Bridge module to make VAT registries work with Split Payment", - "version": "10.0.1.0.0", - "development_status": "Beta", - "category": "Hidden", - "website": "https://github.com/OCA/l10n-italy/", - "author": "Agile Business Group, Odoo Community Association (OCA)", - "license": "AGPL-3", - "application": False, - "installable": True, - "auto_install": True, - "depends": [ - "l10n_it_vat_registries", - "l10n_it_split_payment" - ], + 'name': "ITA - Registro IVA + Scissione dei pagamenti", + 'summary': "Modulo di congiunzione tra registri" + " IVA e scissione dei pagamenti", + 'version': '11.0.1.0.0', + 'development_status': "Beta", + 'category': "Accounting & Finance", + 'website': 'https://github.com/OCA/l10n-italy', + 'author': "Agile Business Group, " + "Odoo Community Association (OCA)", + 'license': 'AGPL-3', + 'application': False, + 'installable': True, + 'auto_install': True, + 'depends': [ + 'l10n_it_vat_registries', + 'l10n_it_split_payment' + ] } diff --git a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot index d8cb4e86776d..6e7b0377c5b7 100644 --- a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot +++ b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot @@ -4,8 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 10.0\n" +"Project-Id-Version: Odoo Server 11.0+e-20190417\n" "Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-06-11 10:24+0000\n" +"PO-Revision-Date: 2019-06-11 10:24+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/l10n_it_vat_registries_split_payment/models/__init__.py b/l10n_it_vat_registries_split_payment/models/__init__.py index 43583b2f71f7..3263c1a41d48 100644 --- a/l10n_it_vat_registries_split_payment/models/__init__.py +++ b/l10n_it_vat_registries_split_payment/models/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from . import account_tax diff --git a/l10n_it_vat_registries_split_payment/models/account_tax.py b/l10n_it_vat_registries_split_payment/models/account_tax.py index ae8b78708b87..ee9cd43f2df5 100644 --- a/l10n_it_vat_registries_split_payment/models/account_tax.py +++ b/l10n_it_vat_registries_split_payment/models/account_tax.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# Copyright (c) 2019 Matteo Bilotta # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). from odoo import models @@ -8,9 +8,11 @@ class AccountTax(models.Model): _inherit = 'account.tax' def _compute_totals_tax(self, data): - res = super(AccountTax, self)._compute_totals_tax(data) + res = super()._compute_totals_tax(data) + if self.is_split_payment: # res is (tax_name, base, tax, deductible, undeductible) # so, in case of SP, SP VAT must not appear as deductible return (res[0], res[1], res[2], 0.0, res[4]) + return res diff --git a/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst b/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst index 65a7e30bc6a5..69aa5ff06a97 100644 --- a/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst +++ b/l10n_it_vat_registries_split_payment/readme/CONTRIBUTORS.rst @@ -1 +1,2 @@ * Lorenzo Battistini +* Matteo Bilotta diff --git a/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst b/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst index 2dac6dacef55..161a6ed65e18 100644 --- a/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst +++ b/l10n_it_vat_registries_split_payment/readme/DESCRIPTION.rst @@ -1 +1,9 @@ -Bridge module to make VAT registries module work along with Split Payment module +**Italiano** + +Modulo di congiunzione tra le funzionalità legate ai registri IVA e le +funzionalità inerenti alla scissione dei pagamenti. + +**English** + +Bridge module to make "VAT Registries" module work along with "Split Payment" +module. diff --git a/l10n_it_vat_registries_split_payment/static/description/index.html b/l10n_it_vat_registries_split_payment/static/description/index.html index 5d826ed7f4d6..3aaeadb61b84 100644 --- a/l10n_it_vat_registries_split_payment/static/description/index.html +++ b/l10n_it_vat_registries_split_payment/static/description/index.html @@ -4,7 +4,7 @@ -VAT registries + Split Payment +ITA - Registro IVA + Scissione dei pagamenti -
-

VAT registries + Split Payment

+
+

ITA - Registro IVA + Scissione dei pagamenti

-

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runbot

-

Bridge module to make VAT registries module work along with Split Payment module

+

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runbot

+

Italiano

+

Modulo di congiunzione tra le funzionalità legate ai registri IVA e le +funzionalità inerenti alla scissione dei pagamenti.

+

English

+

Bridge module to make “VAT Registries” module work along with “Split Payment” +module.

Table of contents

    @@ -386,7 +391,7 @@

    Bug Tracker

    Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

    +feedback.

    Do not contact contributors directly about support or help with technical issues.

@@ -401,6 +406,7 @@

Authors

Contributors

@@ -410,7 +416,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/l10n-italy project on GitHub.

+

This module is part of the OCA/l10n-italy project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/l10n_it_vat_registries_split_payment/tests/__init__.py b/l10n_it_vat_registries_split_payment/tests/__init__.py index 167c7245e866..ed30c68e3d31 100644 --- a/l10n_it_vat_registries_split_payment/tests/__init__.py +++ b/l10n_it_vat_registries_split_payment/tests/__init__.py @@ -1,3 +1 @@ -# -*- coding: utf-8 -*- - from . import test_sp diff --git a/l10n_it_vat_registries_split_payment/tests/test_sp.py b/l10n_it_vat_registries_split_payment/tests/test_sp.py index 84ce7e9b76b6..47edba7f15c3 100644 --- a/l10n_it_vat_registries_split_payment/tests/test_sp.py +++ b/l10n_it_vat_registries_split_payment/tests/test_sp.py @@ -1,12 +1,10 @@ -# -*- coding: utf-8 -*- - from odoo.addons.account.tests.account_test_users import AccountTestUsers class TestSP(AccountTestUsers): def setUp(self): - super(TestSP, self).setUp() + super().setUp() self.tax_model = self.env['account.tax'] self.invoice_model = self.env['account.invoice'] self.inv_line_model = self.env['account.invoice.line'] @@ -97,5 +95,5 @@ def test_invoice(self): } totals_sp = self.tax22sp._compute_totals_tax(data) totals = self.tax22._compute_totals_tax(data) - self.assertEqual(totals_sp, (u'22% SP', 100.0, 22.0, 0.0, 0)) - self.assertEqual(totals, (u'22%', 100.0, 22.0, 22.0, 0)) + self.assertEqual(totals_sp, ('22% SP', 100.0, 22.0, 0.0, 0)) + self.assertEqual(totals, ('22%', 100.0, 22.0, 22.0, 0)) From 88d3f044469b22aba5048d348734e5b0b8b54dbd Mon Sep 17 00:00:00 2001 From: Matteo Bilotta Date: Tue, 11 Jun 2019 12:28:41 +0200 Subject: [PATCH 03/14] [MIG] l10n_it_vat_registries_split_payment: Migration to 12.0 --- l10n_it_vat_registries_split_payment/README.rst | 10 +++++----- l10n_it_vat_registries_split_payment/__manifest__.py | 2 +- .../i18n/l10n_it_vat_registries_split_payment.pot | 4 +--- .../static/description/index.html | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/l10n_it_vat_registries_split_payment/README.rst b/l10n_it_vat_registries_split_payment/README.rst index 2c5b96102ec3..a1db30aa64ba 100644 --- a/l10n_it_vat_registries_split_payment/README.rst +++ b/l10n_it_vat_registries_split_payment/README.rst @@ -14,13 +14,13 @@ ITA - Registro IVA + Scissione dei pagamenti :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fl10n--italy-lightgray.png?logo=github - :target: https://github.com/OCA/l10n-italy/tree/11.0/l10n_it_vat_registries_split_payment + :target: https://github.com/OCA/l10n-italy/tree/12.0/l10n_it_vat_registries_split_payment :alt: OCA/l10n-italy .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/l10n-italy-11-0/l10n-italy-11-0-l10n_it_vat_registries_split_payment + :target: https://translation.odoo-community.org/projects/l10n-italy-12-0/l10n-italy-12-0-l10n_it_vat_registries_split_payment :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/122/11.0 + :target: https://runbot.odoo-community.org/runbot/122/12.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -46,7 +46,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -77,6 +77,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/l10n-italy `_ project on GitHub. +This module is part of the `OCA/l10n-italy `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/l10n_it_vat_registries_split_payment/__manifest__.py b/l10n_it_vat_registries_split_payment/__manifest__.py index 10468a88eacf..a573328ac99d 100644 --- a/l10n_it_vat_registries_split_payment/__manifest__.py +++ b/l10n_it_vat_registries_split_payment/__manifest__.py @@ -6,7 +6,7 @@ 'name': "ITA - Registro IVA + Scissione dei pagamenti", 'summary': "Modulo di congiunzione tra registri" " IVA e scissione dei pagamenti", - 'version': '11.0.1.0.0', + 'version': '12.0.1.0.0', 'development_status': "Beta", 'category': "Accounting & Finance", 'website': 'https://github.com/OCA/l10n-italy', diff --git a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot index 6e7b0377c5b7..b6253ddc818b 100644 --- a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot +++ b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot @@ -4,10 +4,8 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 11.0+e-20190417\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-06-11 10:24+0000\n" -"PO-Revision-Date: 2019-06-11 10:24+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" diff --git a/l10n_it_vat_registries_split_payment/static/description/index.html b/l10n_it_vat_registries_split_payment/static/description/index.html index 3aaeadb61b84..c32430af0003 100644 --- a/l10n_it_vat_registries_split_payment/static/description/index.html +++ b/l10n_it_vat_registries_split_payment/static/description/index.html @@ -367,7 +367,7 @@

ITA - Registro IVA + Scissione dei pagamenti

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/l10n-italy Translate me on Weblate Try me on Runbot

Italiano

Modulo di congiunzione tra le funzionalità legate ai registri IVA e le funzionalità inerenti alla scissione dei pagamenti.

@@ -391,7 +391,7 @@

Bug Tracker

Bugs are tracked on GitHub Issues. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us smashing it by providing a detailed and welcomed -feedback.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -416,7 +416,7 @@

Maintainers

OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use.

-

This module is part of the OCA/l10n-italy project on GitHub.

+

This module is part of the OCA/l10n-italy project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

From 73c7c8aa0953d6328b344e31073b9090800865bd Mon Sep 17 00:00:00 2001 From: Matteo Bilotta Date: Fri, 14 Jun 2019 11:55:14 +0200 Subject: [PATCH 04/14] [FIX] Cambio logica di computazione delle tasse SP. --- .../__init__.py | 2 +- .../__manifest__.py | 2 +- .../l10n_it_vat_registries_split_payment.pot | 4 ++-- .../models/account_tax.py | 18 ---------------- .../{models => report}/__init__.py | 2 +- .../report/report_vat_registry.py | 21 +++++++++++++++++++ .../static/description/index.html | 2 +- .../tests/test_sp.py | 19 +++++++++++++---- 8 files changed, 42 insertions(+), 28 deletions(-) delete mode 100644 l10n_it_vat_registries_split_payment/models/account_tax.py rename l10n_it_vat_registries_split_payment/{models => report}/__init__.py (66%) create mode 100644 l10n_it_vat_registries_split_payment/report/report_vat_registry.py diff --git a/l10n_it_vat_registries_split_payment/__init__.py b/l10n_it_vat_registries_split_payment/__init__.py index 31660d6a9650..9dda666c2631 100644 --- a/l10n_it_vat_registries_split_payment/__init__.py +++ b/l10n_it_vat_registries_split_payment/__init__.py @@ -1,3 +1,3 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import models +from . import report diff --git a/l10n_it_vat_registries_split_payment/__manifest__.py b/l10n_it_vat_registries_split_payment/__manifest__.py index a573328ac99d..5d23f2c8a28a 100644 --- a/l10n_it_vat_registries_split_payment/__manifest__.py +++ b/l10n_it_vat_registries_split_payment/__manifest__.py @@ -6,7 +6,7 @@ 'name': "ITA - Registro IVA + Scissione dei pagamenti", 'summary': "Modulo di congiunzione tra registri" " IVA e scissione dei pagamenti", - 'version': '12.0.1.0.0', + 'version': '12.0.1.0.1', 'development_status': "Beta", 'category': "Accounting & Finance", 'website': 'https://github.com/OCA/l10n-italy', diff --git a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot index b6253ddc818b..2ed93878fbc8 100644 --- a/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot +++ b/l10n_it_vat_registries_split_payment/i18n/l10n_it_vat_registries_split_payment.pot @@ -14,7 +14,7 @@ msgstr "" "Plural-Forms: \n" #. module: l10n_it_vat_registries_split_payment -#: model:ir.model,name:l10n_it_vat_registries_split_payment.model_account_tax -msgid "Tax" +#: model:ir.model,name:l10n_it_vat_registries_split_payment.model_report_l10n_it_vat_registries_report_registro_iva +msgid "Report VAT registry" msgstr "" diff --git a/l10n_it_vat_registries_split_payment/models/account_tax.py b/l10n_it_vat_registries_split_payment/models/account_tax.py deleted file mode 100644 index ee9cd43f2df5..000000000000 --- a/l10n_it_vat_registries_split_payment/models/account_tax.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2019 Matteo Bilotta -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import models - - -class AccountTax(models.Model): - _inherit = 'account.tax' - - def _compute_totals_tax(self, data): - res = super()._compute_totals_tax(data) - - if self.is_split_payment: - # res is (tax_name, base, tax, deductible, undeductible) - # so, in case of SP, SP VAT must not appear as deductible - return (res[0], res[1], res[2], 0.0, res[4]) - - return res diff --git a/l10n_it_vat_registries_split_payment/models/__init__.py b/l10n_it_vat_registries_split_payment/report/__init__.py similarity index 66% rename from l10n_it_vat_registries_split_payment/models/__init__.py rename to l10n_it_vat_registries_split_payment/report/__init__.py index 3263c1a41d48..86d932de5fc0 100644 --- a/l10n_it_vat_registries_split_payment/models/__init__.py +++ b/l10n_it_vat_registries_split_payment/report/__init__.py @@ -1,3 +1,3 @@ # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -from . import account_tax +from . import report_vat_registry diff --git a/l10n_it_vat_registries_split_payment/report/report_vat_registry.py b/l10n_it_vat_registries_split_payment/report/report_vat_registry.py new file mode 100644 index 000000000000..a957ebfd1288 --- /dev/null +++ b/l10n_it_vat_registries_split_payment/report/report_vat_registry.py @@ -0,0 +1,21 @@ +# Copyright (c) 2019 Matteo Bilotta +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, models + + +class ReportVatRegistry(models.AbstractModel): + _inherit = 'report.l10n_it_vat_registries.report_registro_iva' + + @api.model + def _compute_totals_tax(self, tax, data): + res = super()._compute_totals_tax(tax, data) + + if tax.is_split_payment: + # res = (tax_name, base, tax, deductible, undeductible) + # + # In case of SP tax, SP VAT must not appear as deductible. + # + return (res[0], res[1], res[2], 0.0, res[4]) + + return res diff --git a/l10n_it_vat_registries_split_payment/static/description/index.html b/l10n_it_vat_registries_split_payment/static/description/index.html index c32430af0003..27d69d06b90f 100644 --- a/l10n_it_vat_registries_split_payment/static/description/index.html +++ b/l10n_it_vat_registries_split_payment/static/description/index.html @@ -3,7 +3,7 @@ - + ITA - Registro IVA + Scissione dei pagamenti