From a0c75a3eff88d7b203da2d1bba6464fdbf152790 Mon Sep 17 00:00:00 2001 From: Humberto Arocha Date: Mon, 21 Sep 2020 16:03:36 +0000 Subject: [PATCH] [ADD] account_cash_basis_group_base_line: add module account: Compacting the creation of Journal Lines for CABA base lines. Main - Creation of Cash Basis (CABA) Journal Entries can lead to the creation of a huge number of lines that are not quite useful and its creations can lead to a lengthy process of creation of payment when several invoices with a huge amount of invoice lines involved or to a lengthy process of cancelation of payment because of reversion of the CABA, in case of l10n_mx, many users have opted for using l10n_mx_edi_avoid_reversal_entry, and then this causes a lengthy process of deletions of CABA entries. Justification - CABA Entry is divided into two parts when it is created - Tax Part: The part that deals with the taxes themselves (this PR does not mess with them). - Base Part: The part of the base of the taxes (what this PR is all about) So far the Base Part has been using a Brigde/Order account that does not have any financial use other than providing the source for computing the base of the amount of taxes due. In the financial statements, the value of the account used is always zero. So providing a huge amount of details on this account has proved, in the wild, of no use. Scenario - - Configure Tax based on payment. - Configure the tax base account in the Tax. - Have four invoices, each one with one hundred invoice lines, each line is a different product or a different account. (4 invoices x 100 lines = 400 lines to be used as a tax base) - Make three partial payments to each invoice. (3 payments x 4 invoices = 12 payments) Before this change - - Check the CABA entry created: Chances are that each CABA Journal Entry will end up having: -- 1 Entry line per tax collected. -- 1 Entry line per tax to be collected. -- 200 Entry lines for the base (100 lines in debit, 100 lines in credit) That is a **whopping 2424 lines** for CABA entries where 2400 are only base lines. And let us say that I have made a mistake on all the 12 payment (I am that dumb). Reversal Method will clone your 2424 lines so now there are 2424 additional lines. And remember I have to fix my payments and that creates again 2424 additional lines. So **I end up with 2424 x 3 = 7272 lines.** This only for 3 invoices and 4 payment, for payments canceled and their corrections. After this change - - Check the CABA entry created: -- 1 Entry line per tax collected. -- 1 Entry line per tax to be collected. -- 2 Entry lines for the base, one debit, one credit. Chances are that this could be increased but the algorithm tries only to group by a set of keys. So with the same steps, payments reversals and corrections, I could end up with 12 payment x 4 lines x 3 steps = **144 lines down from 7272 lines.** --- account_cash_basis_group_base_line/README.rst | 82 ++++ .../__init__.py | 1 + .../__manifest__.py | 13 + .../account_cash_basis_group_base_line.pot | 20 + .../models/__init__.py | 1 + .../models/account_move.py | 54 +++ .../readme/CONTRIBUTORS.rst | 2 + .../readme/DESCRIPTION.rst | 4 + .../readme/USAGE.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 427 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_reconciliation.py | 214 +++++++++ 13 files changed, 820 insertions(+) create mode 100644 account_cash_basis_group_base_line/README.rst create mode 100644 account_cash_basis_group_base_line/__init__.py create mode 100644 account_cash_basis_group_base_line/__manifest__.py create mode 100644 account_cash_basis_group_base_line/i18n/account_cash_basis_group_base_line.pot create mode 100644 account_cash_basis_group_base_line/models/__init__.py create mode 100644 account_cash_basis_group_base_line/models/account_move.py create mode 100644 account_cash_basis_group_base_line/readme/CONTRIBUTORS.rst create mode 100644 account_cash_basis_group_base_line/readme/DESCRIPTION.rst create mode 100644 account_cash_basis_group_base_line/readme/USAGE.rst create mode 100644 account_cash_basis_group_base_line/static/description/icon.png create mode 100644 account_cash_basis_group_base_line/static/description/index.html create mode 100644 account_cash_basis_group_base_line/tests/__init__.py create mode 100644 account_cash_basis_group_base_line/tests/test_reconciliation.py diff --git a/account_cash_basis_group_base_line/README.rst b/account_cash_basis_group_base_line/README.rst new file mode 100644 index 000000000..514a7aa27 --- /dev/null +++ b/account_cash_basis_group_base_line/README.rst @@ -0,0 +1,82 @@ +=============================== +Tax Cash Basis Group Base Lines +=============================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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%2Faccount--financial--tools-lightgray.png?logo=github + :target: https://github.com/OCA/account-financial-tools/tree/13.0/account_cash_basis_group_base_line + :alt: OCA/account-financial-tools +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/account-financial-tools-13.0/account-financial-tools-13.0-account_cash_basis_group_base_line + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/92/13.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module compact the creation of Journal Lines for Cash Basis base lines. + +Instead of creating two base lines per line with cash basis tax, let us group +the creation lines so that there are fewer lines in the Cash Basis Journal Entry. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +Just Install the module. No extra configuration is needed. + +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 +~~~~~~~ + +* Vauxoo + +Contributors +~~~~~~~~~~~~ + +* Humberto Arocha +* Gabriela Mogollón + +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/account-financial-tools `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/account_cash_basis_group_base_line/__init__.py b/account_cash_basis_group_base_line/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/account_cash_basis_group_base_line/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/account_cash_basis_group_base_line/__manifest__.py b/account_cash_basis_group_base_line/__manifest__.py new file mode 100644 index 000000000..00e949c03 --- /dev/null +++ b/account_cash_basis_group_base_line/__manifest__.py @@ -0,0 +1,13 @@ +{ + "name": "Tax Cash Basis Group Base Lines", + "version": "13.0.0.0.1", + "summary": "Compacting the creation of Journal Lines for CABA base lines.", + "sequence": 5, + "category": "Accounting", + "depends": ["account"], + "author": "Vauxoo, Odoo Community Association (OCA)", + "license": "AGPL-3", + "data": [], + "installable": True, + "auto_install": False, +} diff --git a/account_cash_basis_group_base_line/i18n/account_cash_basis_group_base_line.pot b/account_cash_basis_group_base_line/i18n/account_cash_basis_group_base_line.pot new file mode 100644 index 000000000..36504f40f --- /dev/null +++ b/account_cash_basis_group_base_line/i18n/account_cash_basis_group_base_line.pot @@ -0,0 +1,20 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * account_cash_basis_group_base_line +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 13.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: account_cash_basis_group_base_line +#: model:ir.model,name:account_cash_basis_group_base_line.model_account_partial_reconcile +msgid "Partial Reconcile" +msgstr "" + diff --git a/account_cash_basis_group_base_line/models/__init__.py b/account_cash_basis_group_base_line/models/__init__.py new file mode 100644 index 000000000..9c0a42138 --- /dev/null +++ b/account_cash_basis_group_base_line/models/__init__.py @@ -0,0 +1 @@ +from . import account_move diff --git a/account_cash_basis_group_base_line/models/account_move.py b/account_cash_basis_group_base_line/models/account_move.py new file mode 100644 index 000000000..f28cb6f2a --- /dev/null +++ b/account_cash_basis_group_base_line/models/account_move.py @@ -0,0 +1,54 @@ +from odoo import models + + +class AccountPartialReconcile(models.Model): + _inherit = "account.partial.reconcile" + + def _get_tax_cash_basis_base_key(self, tax, move, line): + account_id = self._get_tax_cash_basis_base_account(line, tax) + tax_rep_lines = ( + tax.refund_repartition_line_ids + if line.move_id.type in ("in_refund", "out_refund") + else tax.invoice_repartition_line_ids + ) + original_base_tags = tax_rep_lines.filtered( + lambda x: x.repartition_type == "base" + ).tag_ids + base_tags = tuple(line._convert_tags_for_cash_basis(original_base_tags).ids) + return ( + move.id, + account_id.id, + tax.id, + line.tax_repartition_line_id.id, + base_tags, + line.currency_id.id, + line.partner_id.id, + line.move_id.type, + ) + + def _get_tax_cash_basis_base_common_vals(self, key, new_move): + self.ensure_one() + # pylint: disable=W0612 + ( + move, + account_id, + tax_id, + tax_repartition_line_id, + base_tags, + currency_id, + partner_id, + move_type, + ) = key + move = self.env["account.move"].browse(move) + return { + "name": move.name, + "account_id": account_id, + "journal_id": new_move.journal_id.id, + "tax_exigible": True, + "tax_ids": [(6, 0, [tax_id])], + "tag_ids": [(6, 0, base_tags)], + "move_id": new_move.id, + "currency_id": currency_id, + "partner_id": partner_id, + "tax_repartition_line_id": tax_repartition_line_id, + } diff --git a/account_cash_basis_group_base_line/readme/CONTRIBUTORS.rst b/account_cash_basis_group_base_line/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..7a7b700eb --- /dev/null +++ b/account_cash_basis_group_base_line/readme/CONTRIBUTORS.rst @@ -0,0 +1,2 @@ +* Humberto Arocha +* Gabriela Mogollón diff --git a/account_cash_basis_group_base_line/readme/DESCRIPTION.rst b/account_cash_basis_group_base_line/readme/DESCRIPTION.rst new file mode 100644 index 000000000..59a7ec5ce --- /dev/null +++ b/account_cash_basis_group_base_line/readme/DESCRIPTION.rst @@ -0,0 +1,4 @@ +This module compact the creation of Journal Lines for Cash Basis base lines. + +Instead of creating two base lines per line with cash basis tax, let us group +the creation lines so that there are fewer lines in the Cash Basis Journal Entry. diff --git a/account_cash_basis_group_base_line/readme/USAGE.rst b/account_cash_basis_group_base_line/readme/USAGE.rst new file mode 100644 index 000000000..fdd456511 --- /dev/null +++ b/account_cash_basis_group_base_line/readme/USAGE.rst @@ -0,0 +1 @@ +Just Install the module. No extra configuration is needed. diff --git a/account_cash_basis_group_base_line/static/description/icon.png b/account_cash_basis_group_base_line/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/account_cash_basis_group_base_line/static/description/index.html b/account_cash_basis_group_base_line/static/description/index.html new file mode 100644 index 000000000..e08551219 --- /dev/null +++ b/account_cash_basis_group_base_line/static/description/index.html @@ -0,0 +1,427 @@ + + + + + + +Tax Cash Basis Group Base Lines + + + +
+

Tax Cash Basis Group Base Lines

+ + +

Beta License: AGPL-3 OCA/account-financial-tools Translate me on Weblate Try me on Runbot

+

This module compact the creation of Journal Lines for Cash Basis base lines.

+

Instead of creating two base lines per line with cash basis tax, let us group +the creation lines so that there are fewer lines in the Cash Basis Journal Entry.

+

Table of contents

+ +
+

Usage

+

Just Install the module. No extra configuration is needed.

+
+
+

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

+
    +
  • Vauxoo
    • +
+
+
+

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/account-financial-tools project on GitHub.

+

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

+
+
+
+ + diff --git a/account_cash_basis_group_base_line/tests/__init__.py b/account_cash_basis_group_base_line/tests/__init__.py new file mode 100644 index 000000000..5eaab0190 --- /dev/null +++ b/account_cash_basis_group_base_line/tests/__init__.py @@ -0,0 +1 @@ +from . import test_reconciliation diff --git a/account_cash_basis_group_base_line/tests/test_reconciliation.py b/account_cash_basis_group_base_line/tests/test_reconciliation.py new file mode 100644 index 000000000..78879ecb1 --- /dev/null +++ b/account_cash_basis_group_base_line/tests/test_reconciliation.py @@ -0,0 +1,214 @@ +from odoo.addons.account.tests.test_reconciliation import TestReconciliation + + +class TestAccountReconciliationPartial(TestReconciliation): + + """Tests for Account Reconciliation Partial""" + + def __init__(self, methodName="runTest"): + super(TestAccountReconciliationPartial, self).__init__(methodName) + # Skip original test from inherited class + custom_attributes = set(dir(TestAccountReconciliationPartial)) - set( + dir(TestReconciliation) + ) + custom_test_methods = [ + name + for name in custom_attributes + if name.startswith("test_") and callable(getattr(self, name)) + ] + + if methodName not in custom_test_methods: + method = getattr(self, methodName) + method.__dict__["__unittest_skip__"] = True + method.__dict__[ + "__unittest_skip_why__" + ] = "Test executed from original module" + + def setUp(self): + super(TestAccountReconciliationPartial, self).setUp() + self.env.ref("base.main_company").write( + { + "tax_exigibility": True, + "tax_cash_basis_journal_id": self.cash_basis_journal.id, + } + ) + + def test_reconciliation_cash_basis(self): + # Simulates an expense made up by 2 lines + # one is subject to a cash basis tax + # the other is not subject to tax + + aml_obj = self.env["account.move.line"].with_context(check_move_validity=False) + + # Purchase + purchase_move = self.env["account.move"].create( + {"name": "purchase", "journal_id": self.purchase_journal.id} + ) + + purchase_payable_line0 = aml_obj.create( + { + "account_id": self.account_rsa.id, + "credit": 1350, + "move_id": purchase_move.id, + } + ) + purchase_payable_line1 = aml_obj.create( + { + "account_id": self.account_rsa.id, + "credit": 450, + "move_id": purchase_move.id, + } + ) + aml_obj.create( + { + "name": "expenseTaxed_0", + "account_id": self.expense_account.id, + "debit": 1000, + "move_id": purchase_move.id, + "tax_ids": [(4, self.tax_cash_basis.id, False)], + "tax_exigible": False, + } + ) + aml_obj.create( + { + "name": "expenseTaxed_1", + "account_id": self.expense_account.id, + "debit": 300, + "move_id": purchase_move.id, + "tax_ids": [(4, self.tax_cash_basis.id, False)], + "tax_exigible": False, + } + ) + aml_obj.create( + { + "name": "expenseTaxed_2", + "account_id": self.expense_account.id, + "debit": 200, + "move_id": purchase_move.id, + "tax_ids": [(4, self.tax_cash_basis.id, False)], + "tax_exigible": False, + } + ) + tax_line = aml_obj.create( + { + "name": "TaxLine", + "account_id": self.tax_waiting_account.id, + "debit": 300, + "move_id": purchase_move.id, + "tax_line_id": self.tax_cash_basis.id, + "tax_exigible": False, + "tax_repartition_line_id": ( + self.tax_cash_basis.invoice_repartition_line_ids.filtered( + lambda x: x.repartition_type == "tax" + ).id + ), + "tax_base_amount": 1500, + } + ) + purchase_move.post() + + # Payment Move + payment_move = self.env["account.move"].create( + {"name": "payment", "journal_id": self.bank_journal_euro.id} + ) + payment_payable_line = aml_obj.create( + { + "account_id": self.account_rsa.id, + "debit": 1800, + "move_id": payment_move.id, + } + ) + aml_obj.create( + { + "account_id": self.account_euro.id, + "credit": 1800, + "move_id": payment_move.id, + } + ) + payment_move.post() + + to_reconcile = ( + (purchase_move + payment_move) + .mapped("line_ids") + .filtered(lambda l: l.account_id.internal_type == "payable") + ) + to_reconcile.reconcile() + + apr_ids = to_reconcile.matched_debit_ids | to_reconcile.matched_credit_ids + cash_basis_moves = self.env["account.move"].search( + [("tax_cash_basis_rec_id", "in", apr_ids.ids)], + ) + + self.assertEqual(len(cash_basis_moves), 2, "There should be Two CABA Entries") + self.assertTrue(cash_basis_moves.exists()) + + # check reconciliation in Payable account + self.assertTrue(purchase_payable_line0.full_reconcile_id.exists()) + self.assertEqual( + purchase_payable_line0.full_reconcile_id.reconciled_line_ids, + purchase_payable_line0 + purchase_payable_line1 + payment_payable_line, + ) + + cash_basis_aml_ids = cash_basis_moves.mapped("line_ids") + # check reconciliation in the tax waiting account + self.assertTrue(tax_line.full_reconcile_id.exists()) + self.assertEqual( + tax_line.full_reconcile_id.reconciled_line_ids, + cash_basis_aml_ids.filtered( + lambda l: l.account_id == self.tax_waiting_account + ) + + tax_line, + ) + + self.assertEqual(len(cash_basis_aml_ids), 8, "There should 8 lines not 16") + + # check amounts + cash_basis_move1 = cash_basis_moves.filtered(lambda m: m.amount_total == 1350) + cash_basis_move2 = cash_basis_moves.filtered(lambda m: m.amount_total == 450) + + self.assertTrue(cash_basis_move1.exists()) + self.assertTrue(cash_basis_move2.exists()) + + # For first move + move_lines = cash_basis_move1.line_ids + base_amount_tax_lines = move_lines.filtered( + lambda l: l.account_id == self.tax_base_amount_account + ) + self.assertEqual(len(base_amount_tax_lines), 2, "There should be 2 lines not 6") + self.assertAlmostEqual(sum(base_amount_tax_lines.mapped("credit")), 1125) + self.assertAlmostEqual(sum(base_amount_tax_lines.mapped("debit")), 1125) + + self.assertAlmostEqual( + (move_lines - base_amount_tax_lines) + .filtered(lambda l: l.account_id == self.tax_waiting_account) + .credit, + 225, + ) + self.assertAlmostEqual( + (move_lines - base_amount_tax_lines) + .filtered(lambda l: l.account_id == self.tax_final_account) + .debit, + 225, + ) + + # For second move + move_lines = cash_basis_move2.line_ids + base_amount_tax_lines = move_lines.filtered( + lambda l: l.account_id == self.tax_base_amount_account + ) + self.assertEqual(len(base_amount_tax_lines), 2, "There should be 2 lines not 6") + self.assertAlmostEqual(sum(base_amount_tax_lines.mapped("credit")), 375) + self.assertAlmostEqual(sum(base_amount_tax_lines.mapped("debit")), 375) + + self.assertAlmostEqual( + (move_lines - base_amount_tax_lines) + .filtered(lambda l: l.account_id == self.tax_waiting_account) + .credit, + 75, + ) + self.assertAlmostEqual( + (move_lines - base_amount_tax_lines) + .filtered(lambda l: l.account_id == self.tax_final_account) + .debit, + 75, + )