From eedb5d2da7550559f18c3e629f1e87718233293d Mon Sep 17 00:00:00 2001 From: Quentin Groulard Date: Sun, 19 Apr 2020 17:07:38 +0200 Subject: [PATCH 1/4] [12.0] [ADD] Account Clearance Plan --- account_clearance_plan/README.rst | 97 ++++ account_clearance_plan/__init__.py | 2 + account_clearance_plan/__manifest__.py | 19 + account_clearance_plan/models/__init__.py | 3 + .../models/account_invoice.py | 31 ++ account_clearance_plan/models/res_company.py | 20 + .../models/res_config_settings.py | 23 + .../readme/CONTRIBUTORS.rst | 1 + account_clearance_plan/readme/DESCRIPTION.rst | 5 + account_clearance_plan/readme/ROADMAP.rst | 1 + account_clearance_plan/readme/USAGE.rst | 11 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 441 ++++++++++++++++++ account_clearance_plan/tests/__init__.py | 1 + .../tests/test_account_clearance_plan.py | 134 ++++++ .../views/res_config_settings.xml | 47 ++ account_clearance_plan/wizard/__init__.py | 1 + .../wizard/account_clearance_plan.py | 161 +++++++ .../wizard/account_clearance_plan_wizard.xml | 56 +++ .../odoo/addons/account_clearance_plan | 1 + setup/account_clearance_plan/setup.py | 6 + 21 files changed, 1061 insertions(+) create mode 100644 account_clearance_plan/README.rst create mode 100644 account_clearance_plan/__init__.py create mode 100644 account_clearance_plan/__manifest__.py create mode 100644 account_clearance_plan/models/__init__.py create mode 100644 account_clearance_plan/models/account_invoice.py create mode 100644 account_clearance_plan/models/res_company.py create mode 100644 account_clearance_plan/models/res_config_settings.py create mode 100644 account_clearance_plan/readme/CONTRIBUTORS.rst create mode 100644 account_clearance_plan/readme/DESCRIPTION.rst create mode 100644 account_clearance_plan/readme/ROADMAP.rst create mode 100644 account_clearance_plan/readme/USAGE.rst create mode 100644 account_clearance_plan/static/description/icon.png create mode 100644 account_clearance_plan/static/description/index.html create mode 100644 account_clearance_plan/tests/__init__.py create mode 100644 account_clearance_plan/tests/test_account_clearance_plan.py create mode 100644 account_clearance_plan/views/res_config_settings.xml create mode 100644 account_clearance_plan/wizard/__init__.py create mode 100644 account_clearance_plan/wizard/account_clearance_plan.py create mode 100644 account_clearance_plan/wizard/account_clearance_plan_wizard.xml create mode 120000 setup/account_clearance_plan/odoo/addons/account_clearance_plan create mode 100644 setup/account_clearance_plan/setup.py diff --git a/account_clearance_plan/README.rst b/account_clearance_plan/README.rst new file mode 100644 index 000000000..76dbbd3b4 --- /dev/null +++ b/account_clearance_plan/README.rst @@ -0,0 +1,97 @@ +====================== +Account Clearance Plan +====================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! 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/12.0/account_clearance_plan + :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-12-0/account-financial-tools-12-0-account_clearance_plan + :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/12.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to reorganize customers debts in case of difficult financial conditions in order to spread the debts over a longer period of time. +The module can also be used in a similar way for the user's company in case their suppliers offer them the opportunity to discuss a clearance plan. + +One can decide the debts to be part of the clearance plan (all partner's debts or some of them only) and split this amount into new financial commitments at new dates. +Please notice that one clearance plan = one payable/receivable account. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you need to: + +#. Go to *Invoicing > Accounting > Journal Items*, or *Invoicing > Vendor Bills*, or *Invoicing > Customer Invoices* + +#. Then select the journal items or invoices and go to *Action > Clearance Plan* + +#. Choose a journal for the new entry that will be created. Default journal can be configured in *Invoicing > Configuration > Settings > Clearance Plan* + +#. Add one line for each new payment amounts and dates you would like to set. + +#. Click *Confirm*, the journal items or invoices you selected are now reconciled and new journal items are open according to your choices. + +Known issues / Roadmap +====================== + +* Support VAT on collection (Taxes due upon payment, e.g. in France) + +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 +~~~~~~~ + +* ACSONE SA/NV + +Contributors +~~~~~~~~~~~~ + +* Quentin Groulard + +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_clearance_plan/__init__.py b/account_clearance_plan/__init__.py new file mode 100644 index 000000000..134df2743 --- /dev/null +++ b/account_clearance_plan/__init__.py @@ -0,0 +1,2 @@ +from . import wizard +from . import models diff --git a/account_clearance_plan/__manifest__.py b/account_clearance_plan/__manifest__.py new file mode 100644 index 000000000..5c3e60ba7 --- /dev/null +++ b/account_clearance_plan/__manifest__.py @@ -0,0 +1,19 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Account Clearance Plan", + "summary": """ + This addon allows to define clearance plans + in order to reorganize debts (own and customers' ones).""", + "version": "12.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV, Odoo Community Association (OCA)", + "website": "https://github.com/OCA/account-financial-tools", + "depends": ["account"], + "data": [ + "views/res_config_settings.xml", + "wizard/account_clearance_plan_wizard.xml", + ], + "demo": [], +} diff --git a/account_clearance_plan/models/__init__.py b/account_clearance_plan/models/__init__.py new file mode 100644 index 000000000..7010b6f98 --- /dev/null +++ b/account_clearance_plan/models/__init__.py @@ -0,0 +1,3 @@ +from . import res_company +from . import res_config_settings +from . import account_invoice diff --git a/account_clearance_plan/models/account_invoice.py b/account_clearance_plan/models/account_invoice.py new file mode 100644 index 000000000..d8f2b06a7 --- /dev/null +++ b/account_clearance_plan/models/account_invoice.py @@ -0,0 +1,31 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import models, _ +from odoo.exceptions import UserError + + +class AccountInvoice(models.Model): + + _inherit = "account.invoice" + + def get_clearance_plan_wizard(self): + account = self.mapped("account_id") + if len(account.ids) != 1: + raise UserError(_("Please select invoices from exactly one account.")) + move_lines = self.mapped("move_id.line_ids").filtered( + lambda l: l.account_id == account + ) + context = self.env.context.copy() + context.update( + {"active_ids": move_lines.ids, "active_model": "account.move.line"} + ) + + return { + "type": "ir.actions.act_window", + "res_model": "account.clearance.plan", + "name": "Clearance Plan", + "target": "new", + "view_mode": "form", + "context": context, + } diff --git a/account_clearance_plan/models/res_company.py b/account_clearance_plan/models/res_company.py new file mode 100644 index 000000000..be43f40e2 --- /dev/null +++ b/account_clearance_plan/models/res_company.py @@ -0,0 +1,20 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResCompany(models.Model): + _inherit = "res.company" + + clearance_plan_journal_id = fields.Many2one( + comodel_name="account.journal", + string="Default Clearance Plan Journal", + help="The journal used by default on clearance plans.", + ) + clearance_plan_move_line_name = fields.Char( + string="Default Clearance Plan Move Line Name", + help="Default name that will be given to new open " + "move lines created by clearance plans", + default="Clearance Plan", + ) diff --git a/account_clearance_plan/models/res_config_settings.py b/account_clearance_plan/models/res_config_settings.py new file mode 100644 index 000000000..fa10209d0 --- /dev/null +++ b/account_clearance_plan/models/res_config_settings.py @@ -0,0 +1,23 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class ResConfigSettings(models.TransientModel): + _inherit = "res.config.settings" + + clearance_plan_journal_id = fields.Many2one( + comodel_name="account.journal", + related="company_id.clearance_plan_journal_id", + readonly=False, + string="Default Clearance Plan Journal", + help="The journal used by default on clearance plans.", + ) + clearance_plan_move_line_name = fields.Char( + string="Default Clearance Plan Move Line Name", + help="Default name that will be given to new open " + "move lines created by clearance plans", + related="company_id.clearance_plan_move_line_name", + readonly=False, + ) diff --git a/account_clearance_plan/readme/CONTRIBUTORS.rst b/account_clearance_plan/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..5914f5529 --- /dev/null +++ b/account_clearance_plan/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Quentin Groulard diff --git a/account_clearance_plan/readme/DESCRIPTION.rst b/account_clearance_plan/readme/DESCRIPTION.rst new file mode 100644 index 000000000..5241b9ff1 --- /dev/null +++ b/account_clearance_plan/readme/DESCRIPTION.rst @@ -0,0 +1,5 @@ +This module allows to reorganize customers debts in case of difficult financial conditions in order to spread the debts over a longer period of time. +The module can also be used in a similar way for the user's company in case their suppliers offer them the opportunity to discuss a clearance plan. + +One can decide the debts to be part of the clearance plan (all partner's debts or some of them only) and split this amount into new financial commitments at new dates. +Please notice that one clearance plan = one payable/receivable account. diff --git a/account_clearance_plan/readme/ROADMAP.rst b/account_clearance_plan/readme/ROADMAP.rst new file mode 100644 index 000000000..7ba8ba891 --- /dev/null +++ b/account_clearance_plan/readme/ROADMAP.rst @@ -0,0 +1 @@ +* Support VAT on collection (Taxes due upon payment, e.g. in France) diff --git a/account_clearance_plan/readme/USAGE.rst b/account_clearance_plan/readme/USAGE.rst new file mode 100644 index 000000000..6f38d467e --- /dev/null +++ b/account_clearance_plan/readme/USAGE.rst @@ -0,0 +1,11 @@ +To use this module, you need to: + +#. Go to *Invoicing > Accounting > Journal Items*, or *Invoicing > Vendor Bills*, or *Invoicing > Customer Invoices* + +#. Then select the journal items or invoices and go to *Action > Clearance Plan* + +#. Choose a journal for the new entry that will be created. Default journal can be configured in *Invoicing > Configuration > Settings > Clearance Plan* + +#. Add one line for each new payment amounts and dates you would like to set. + +#. Click *Confirm*, the journal items or invoices you selected are now reconciled and new journal items are open according to your choices. diff --git a/account_clearance_plan/static/description/icon.png b/account_clearance_plan/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_clearance_plan/static/description/index.html b/account_clearance_plan/static/description/index.html new file mode 100644 index 000000000..16b112c00 --- /dev/null +++ b/account_clearance_plan/static/description/index.html @@ -0,0 +1,441 @@ + + + + + + +Account Clearance Plan + + + +
+

Account Clearance Plan

+ + +

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

+

This module allows to reorganize customers debts in case of difficult financial conditions in order to spread the debts over a longer period of time. +The module can also be used in a similar way for the user’s company in case their suppliers offer them the opportunity to discuss a clearance plan.

+

One can decide the debts to be part of the clearance plan (all partner’s debts or some of them only) and split this amount into new financial commitments at new dates. +Please notice that one clearance plan = one payable/receivable account.

+

Table of contents

+ +
+

Usage

+

To use this module, you need to:

+
    +
  1. Go to Invoicing > Accounting > Journal Items, or Invoicing > Vendor Bills, or Invoicing > Customer Invoices
    2. +
  2. Then select the journal items or invoices and go to Action > Clearance Plan
    3. +
  3. Choose a journal for the new entry that will be created. Default journal can be configured in Invoicing > Configuration > Settings > Clearance Plan
    4. +
  4. Add one line for each new payment amounts and dates you would like to set.
    5. +
  5. Click Confirm, the journal items or invoices you selected are now reconciled and new journal items are open according to your choices.
    6. +
+
+
+

Known issues / Roadmap

+
    +
  • Support VAT on collection (Taxes due upon payment, e.g. in France)
    • +
+
+
+

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

+
    +
  • ACSONE SA/NV
    • +
+
+
+

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_clearance_plan/tests/__init__.py b/account_clearance_plan/tests/__init__.py new file mode 100644 index 000000000..7e9e095bf --- /dev/null +++ b/account_clearance_plan/tests/__init__.py @@ -0,0 +1 @@ +from . import test_account_clearance_plan diff --git a/account_clearance_plan/tests/test_account_clearance_plan.py b/account_clearance_plan/tests/test_account_clearance_plan.py new file mode 100644 index 000000000..da362dc41 --- /dev/null +++ b/account_clearance_plan/tests/test_account_clearance_plan.py @@ -0,0 +1,134 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import TransactionCase, Form +from odoo.exceptions import ValidationError + +from datetime import datetime, timedelta + + +class TestAccountClearancePlan(TransactionCase): + def setUp(self): + super(TestAccountClearancePlan, self).setUp() + self.company = self.env.ref("base.main_company") + self.partner = self.env["res.partner"].create({"name": "Test"}) + self.account_type_receivable = self.env["account.account.type"].create( + {"name": "Test Receivable", "type": "receivable"} + ) + self.account_type_regular = self.env["account.account.type"].create( + {"name": "Test Regular", "type": "other"} + ) + self.account_receivable = self.env["account.account"].create( + { + "name": "Test Receivable", + "code": "TEST_AR", + "user_type_id": self.account_type_receivable.id, + "reconcile": True, + } + ) + self.account_income = self.env["account.account"].create( + { + "name": "Test Income", + "code": "TEST_IN", + "user_type_id": self.account_type_regular.id, + "reconcile": False, + } + ) + self.sale_journal = self.env["account.journal"].search( + [("type", "=", "sale"), ("company_id", "=", self.company.id)] + )[0] + self.cash_journal = self.env["account.journal"].search( + [("type", "=", "cash"), ("company_id", "=", self.company.id)] + )[0] + self.general_journal = self.env["account.journal"].search( + [("type", "=", "general"), ("company_id", "=", self.company.id)] + )[0] + self.company.clearance_plan_journal_id = self.general_journal + self.payment_method_manual_in = self.env.ref( + "account.account_payment_method_manual_in" + ) + self.invoice_line = self.env["account.invoice.line"].create( + { + "name": "Line", + "price_unit": 1000.0, + "account_id": self.account_income.id, + "quantity": 1, + } + ) + self.invoice = self.env["account.invoice"].create( + { + "name": "Test Customer Invoice", + "journal_id": self.sale_journal.id, + "partner_id": self.partner.id, + "account_id": self.account_receivable.id, + "invoice_line_ids": [(4, self.invoice_line.id)], + } + ) + self.invoice.action_invoice_open() + self.invoice_ctx = { + "active_model": "account.invoice", + "active_ids": [self.invoice.id], + } + self.register_payments = ( + self.env["account.register.payments"] + .with_context(self.invoice_ctx) + .create( + { + "payment_date": datetime.now().strftime("%Y-%m-%d"), + "payment_method_id": self.payment_method_manual_in.id, + "journal_id": self.cash_journal.id, + "amount": 200.0, + } + ) + ) + self.register_payments.create_payments() + + def create_and_fill_wizard(self): + res = self.invoice.with_context(self.invoice_ctx).get_clearance_plan_wizard() + clearance_plan_wizard = Form( + self.env[res["res_model"]].with_context(res["context"]) + ) + i = 1 + while i <= 4: + with clearance_plan_wizard.clearance_plan_line_ids.new() as line: + line.amount = 200.0 + line.date_maturity = (datetime.now() + timedelta(days=30 * i)).strftime( + "%Y-%m-%d" + ) + i += 1 + return clearance_plan_wizard + + def test_wizard_values(self): + clearance_plan = self.create_and_fill_wizard().save() + self.assertEqual(clearance_plan.journal_id.id, self.general_journal.id) + self.assertEqual(clearance_plan.amount_to_allocate, 800.0) + self.assertEqual(clearance_plan.amount_allocated, 800.0) + + def test_wizard_negative_amount(self): + clearance_plan_wizard = self.create_and_fill_wizard() + with clearance_plan_wizard.clearance_plan_line_ids.new() as line: + line.amount = -200.0 + line.date_maturity = datetime.now().strftime("%Y-%m-%d") + with self.assertRaises(ValidationError): + clearance_plan_wizard.save() + + def test_confirm_clearance_plan(self): + clearance_plan = self.create_and_fill_wizard().save() + res = clearance_plan.confirm_plan() + move = self.env["account.move"].browse(res["res_id"]) + self.assertEqual(move.journal_id, clearance_plan.journal_id) + for line in clearance_plan.clearance_plan_line_ids: + self.assertTrue( + move.line_ids.filtered( + lambda l: l.debit == line.amount + and l.date_maturity == line.date_maturity + ) + ) + for line in self.invoice.move_id.line_ids.filtered( + lambda l: l.account_id == self.invoice.account_id + ): + self.assertTrue(line.reconciled) + for reconciled_line in line.full_reconcile_id.reconciled_line_ids.filtered( + lambda l: l.credit == line.debit + ): + self.assertEqual(reconciled_line.move_id.id, move.id) diff --git a/account_clearance_plan/views/res_config_settings.xml b/account_clearance_plan/views/res_config_settings.xml new file mode 100644 index 000000000..54bba655c --- /dev/null +++ b/account_clearance_plan/views/res_config_settings.xml @@ -0,0 +1,47 @@ + + + + + + + + res.config.settings.form (in account_clearance_plan) + res.config.settings + + + +

Clearance Plan

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + diff --git a/account_clearance_plan/wizard/__init__.py b/account_clearance_plan/wizard/__init__.py new file mode 100644 index 000000000..d8b203bcf --- /dev/null +++ b/account_clearance_plan/wizard/__init__.py @@ -0,0 +1 @@ +from . import account_clearance_plan diff --git a/account_clearance_plan/wizard/account_clearance_plan.py b/account_clearance_plan/wizard/account_clearance_plan.py new file mode 100644 index 000000000..1d4865e8e --- /dev/null +++ b/account_clearance_plan/wizard/account_clearance_plan.py @@ -0,0 +1,161 @@ +# Copyright 2020 ACSONE SA/NV +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models, _ +from odoo.exceptions import UserError + + +class AccountClearancePlanLine(models.TransientModel): + _name = "account.clearance.plan.line" + _description = "Clearance Plan Line" + + clearance_plan_id = fields.Many2one( + comodel_name="account.clearance.plan", required=True + ) + amount = fields.Float(required=True) + date_maturity = fields.Date(string="Due Date", required=True) + + @api.constrains("amount") + def _check_positive_amount(self): + for rec in self: + if rec.amount < 0: + raise Warning(_("Amounts should all be positive.")) + + +class AccountClearancePlan(models.TransientModel): + _name = "account.clearance.plan" + _description = "Clearance Plan" + + move_line_ids = fields.Many2many("account.move.line", readonly=True) + journal_id = fields.Many2one( + string="Journal", + comodel_name="account.journal", + required=True, + help="Journal of the new entry.", + ) + move_ref = fields.Char( + string="Journal Entry Reference", + help="Reference of the new journal entry that will be generated.", + ) + move_narration = fields.Text( + string="Journal Entry Internal Note", + help="Internal note of the new journal entry that will be generated.", + ) + amount_to_allocate = fields.Float(string="Total Amount to Allocate", readonly=True) + amount_allocated = fields.Float( + string="Amount Allocated", compute="_compute_amount_allocated" + ) + clearance_plan_line_ids = fields.One2many( + comodel_name="account.clearance.plan.line", inverse_name="clearance_plan_id" + ) + + @api.onchange("clearance_plan_line_ids") + def _compute_amount_allocated(self): + for rec in self: + rec.amount_allocated = sum(rec.clearance_plan_line_ids.mapped("amount")) + + @api.model + def default_get(self, fields): + rec = super().default_get(fields) + + if not self._context.get("active_model") == "account.move.line": + raise UserError( + _( + "Programming error: wizard action executed with 'active_model' " + "different from 'account.move.line' in context." + ) + ) + + move_lines = self.env["account.move.line"].browse( + self._context.get("active_ids") + ) + account_id = move_lines.mapped("account_id") + + # Check all move lines are from same partner + if len(move_lines.mapped("partner_id").ids) != 1: + raise UserError(_("Please select items from exactly one partner.")) + # Check all move lines are from same account + if len(account_id.ids) != 1: + raise UserError(_("Please select items from exactly one account.")) + # Check account is of type type is 'receivable' or 'payable' + if account_id.user_type_id.type not in ("receivable", "payable"): + raise UserError( + _( + "Please select items from an account " + "of type 'receivable' or 'payable'." + ) + ) + + rec.update( + { + "journal_id": self.env.user.company_id.clearance_plan_journal_id.id, + "amount_to_allocate": abs(sum(move_lines.mapped("amount_residual"))), + "move_line_ids": move_lines.ids, + } + ) + + return rec + + def _create_reverse_amount_residual_lines(self, move): + new_lines = self.env["account.move.line"] + for line in self.move_line_ids: + new_line = line.with_context(check_move_validity=False).copy( + default={ + "move_id": move.id, + "debit": abs(line.amount_residual) if line.credit > 0 else 0, + "credit": abs(line.amount_residual) if line.debit > 0 else 0, + } + ) + new_line.write({"name": (_("Clearance Plan: ") + new_line.name)}) + new_lines |= new_line + return new_lines + + def _create_clearance_move_lines(self, move): + account_id = self.move_line_ids.mapped("account_id") + partner_id = self.move_line_ids.mapped("partner_id") + move_line_name = self.env.user.company_id.clearance_plan_move_line_name + negative_amount_residual = sum(move.line_ids.mapped("amount_residual")) < 0 + for line in self.clearance_plan_line_ids: + self.env["account.move.line"].with_context( + check_move_validity=False + ).create( + { + "move_id": move.id, + "debit": line.amount if negative_amount_residual else 0, + "credit": line.amount if not negative_amount_residual else 0, + "date_maturity": line.date_maturity, + "name": move_line_name, + "account_id": account_id.id, + "partner_id": partner_id.id, + } + ) + + def confirm_plan(self): + self.ensure_one() + if self.amount_to_allocate != self.amount_allocated: + raise UserError( + _("Amount to allocate and amount allocated must be equals.") + ) + + move = self.env["account.move"].create( + { + "journal_id": self.journal_id.id, + "ref": self.move_ref, + "narration": self.move_narration, + } + ) + reversed_lines = self._create_reverse_amount_residual_lines(move) + self._create_clearance_move_lines(move) + + # Assert balance once all mv_line created + move.assert_balanced() + move.action_post() + (self.move_line_ids | reversed_lines).reconcile() + + return { + "type": "ir.actions.act_window", + "res_model": "account.move", + "res_id": move.id, + "view_mode": "form", + "context": self.env.context, + } diff --git a/account_clearance_plan/wizard/account_clearance_plan_wizard.xml b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml new file mode 100644 index 000000000..412b5c4e4 --- /dev/null +++ b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml @@ -0,0 +1,56 @@ + + + + + Clearance Plan + account.clearance.plan + +
+ + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + + Clearance Plan + + + action + code + action = records.get_clearance_plan_wizard() + + + + + diff --git a/setup/account_clearance_plan/odoo/addons/account_clearance_plan b/setup/account_clearance_plan/odoo/addons/account_clearance_plan new file mode 120000 index 000000000..e601c30e0 --- /dev/null +++ b/setup/account_clearance_plan/odoo/addons/account_clearance_plan @@ -0,0 +1 @@ +../../../../account_clearance_plan \ No newline at end of file diff --git a/setup/account_clearance_plan/setup.py b/setup/account_clearance_plan/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/account_clearance_plan/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 524db91cff699b72a4f43bcd66a6892de73b471b Mon Sep 17 00:00:00 2001 From: Quentin Groulard Date: Thu, 23 Apr 2020 17:41:47 +0200 Subject: [PATCH 2/4] [REF] Invoice Action Action server has no property 'groups_ids', therefore refactored into an action window --- .../models/account_invoice.py | 28 ++++--------------- .../tests/test_account_clearance_plan.py | 3 +- .../wizard/account_clearance_plan.py | 26 +++++++++++------ .../wizard/account_clearance_plan_wizard.xml | 19 ++++++------- 4 files changed, 34 insertions(+), 42 deletions(-) diff --git a/account_clearance_plan/models/account_invoice.py b/account_clearance_plan/models/account_invoice.py index d8f2b06a7..cee91f4ee 100644 --- a/account_clearance_plan/models/account_invoice.py +++ b/account_clearance_plan/models/account_invoice.py @@ -1,31 +1,15 @@ # Copyright 2020 ACSONE SA/NV # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -from odoo import models, _ -from odoo.exceptions import UserError +from odoo import models class AccountInvoice(models.Model): _inherit = "account.invoice" - def get_clearance_plan_wizard(self): - account = self.mapped("account_id") - if len(account.ids) != 1: - raise UserError(_("Please select invoices from exactly one account.")) - move_lines = self.mapped("move_id.line_ids").filtered( - lambda l: l.account_id == account - ) - context = self.env.context.copy() - context.update( - {"active_ids": move_lines.ids, "active_model": "account.move.line"} - ) - - return { - "type": "ir.actions.act_window", - "res_model": "account.clearance.plan", - "name": "Clearance Plan", - "target": "new", - "view_mode": "form", - "context": context, - } + def _get_open_move_lines_ids(self): + self.ensure_one() + return self.mapped("move_id.line_ids").filtered( + lambda l: l.account_id == self.account_id and not l.reconciled + ).ids diff --git a/account_clearance_plan/tests/test_account_clearance_plan.py b/account_clearance_plan/tests/test_account_clearance_plan.py index da362dc41..8cb676835 100644 --- a/account_clearance_plan/tests/test_account_clearance_plan.py +++ b/account_clearance_plan/tests/test_account_clearance_plan.py @@ -84,9 +84,8 @@ class TestAccountClearancePlan(TransactionCase): self.register_payments.create_payments() def create_and_fill_wizard(self): - res = self.invoice.with_context(self.invoice_ctx).get_clearance_plan_wizard() clearance_plan_wizard = Form( - self.env[res["res_model"]].with_context(res["context"]) + self.env["account.clearance.plan"].with_context(self.invoice_ctx) ) i = 1 while i <= 4: diff --git a/account_clearance_plan/wizard/account_clearance_plan.py b/account_clearance_plan/wizard/account_clearance_plan.py index 1d4865e8e..a2c698164 100644 --- a/account_clearance_plan/wizard/account_clearance_plan.py +++ b/account_clearance_plan/wizard/account_clearance_plan.py @@ -54,21 +54,31 @@ class AccountClearancePlan(models.TransientModel): for rec in self: rec.amount_allocated = sum(rec.clearance_plan_line_ids.mapped("amount")) - @api.model - def default_get(self, fields): - rec = super().default_get(fields) - - if not self._context.get("active_model") == "account.move.line": + def _get_move_lines_from_context(self): + active_model = self._context.get("active_model") + if active_model == "account.invoice": + move_line_ids = [] + for invoice in self.env["account.invoice"].browse( + self._context.get("active_ids") + ): + move_line_ids += invoice._get_open_move_lines_ids() + elif not self._context.get("active_model") == "account.move.line": raise UserError( _( "Programming error: wizard action executed with 'active_model' " "different from 'account.move.line' in context." ) ) + else: + move_line_ids = self._context.get("active_ids") - move_lines = self.env["account.move.line"].browse( - self._context.get("active_ids") - ) + return self.env["account.move.line"].browse(move_line_ids) + + @api.model + def default_get(self, fields): + rec = super().default_get(fields) + + move_lines = self._get_move_lines_from_context() account_id = move_lines.mapped("account_id") # Check all move lines are from same partner diff --git a/account_clearance_plan/wizard/account_clearance_plan_wizard.xml b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml index 412b5c4e4..6927b6dcd 100644 --- a/account_clearance_plan/wizard/account_clearance_plan_wizard.xml +++ b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml @@ -32,7 +32,7 @@ - - - Clearance Plan - - - action - code - action = records.get_clearance_plan_wizard() - - + From 1484331be51c688412f43d34ee453e711cc7f2be Mon Sep 17 00:00:00 2001 From: Quentin Groulard Date: Mon, 11 May 2020 17:38:53 +0200 Subject: [PATCH 3/4] [FIX] Invoice payment widget 'view' button --- account_clearance_plan/wizard/account_clearance_plan.py | 1 + 1 file changed, 1 insertion(+) diff --git a/account_clearance_plan/wizard/account_clearance_plan.py b/account_clearance_plan/wizard/account_clearance_plan.py index a2c698164..a441fd73b 100644 --- a/account_clearance_plan/wizard/account_clearance_plan.py +++ b/account_clearance_plan/wizard/account_clearance_plan.py @@ -114,6 +114,7 @@ class AccountClearancePlan(models.TransientModel): "move_id": move.id, "debit": abs(line.amount_residual) if line.credit > 0 else 0, "credit": abs(line.amount_residual) if line.debit > 0 else 0, + "invoice_id": False, } ) new_line.write({"name": (_("Clearance Plan: ") + new_line.name)}) From 7a1d385c869655d87e9faf9e81225ef3265d4a7f Mon Sep 17 00:00:00 2001 From: Quentin Groulard Date: Tue, 12 May 2020 09:09:15 +0200 Subject: [PATCH 4/4] [ADD] Improve usability --- .../tests/test_account_clearance_plan.py | 2 +- .../wizard/account_clearance_plan.py | 25 +++++++++++-------- .../wizard/account_clearance_plan_wizard.xml | 3 ++- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/account_clearance_plan/tests/test_account_clearance_plan.py b/account_clearance_plan/tests/test_account_clearance_plan.py index 8cb676835..a622be939 100644 --- a/account_clearance_plan/tests/test_account_clearance_plan.py +++ b/account_clearance_plan/tests/test_account_clearance_plan.py @@ -101,7 +101,7 @@ class TestAccountClearancePlan(TransactionCase): clearance_plan = self.create_and_fill_wizard().save() self.assertEqual(clearance_plan.journal_id.id, self.general_journal.id) self.assertEqual(clearance_plan.amount_to_allocate, 800.0) - self.assertEqual(clearance_plan.amount_allocated, 800.0) + self.assertEqual(clearance_plan.amount_unallocated, 0.0) def test_wizard_negative_amount(self): clearance_plan_wizard = self.create_and_fill_wizard() diff --git a/account_clearance_plan/wizard/account_clearance_plan.py b/account_clearance_plan/wizard/account_clearance_plan.py index a441fd73b..a21fc39ec 100644 --- a/account_clearance_plan/wizard/account_clearance_plan.py +++ b/account_clearance_plan/wizard/account_clearance_plan.py @@ -9,6 +9,12 @@ class AccountClearancePlanLine(models.TransientModel): _name = "account.clearance.plan.line" _description = "Clearance Plan Line" + name = fields.Char( + string="Label", + required=True, + default=lambda self: + self.env.user.company_id.clearance_plan_move_line_name, + ) clearance_plan_id = fields.Many2one( comodel_name="account.clearance.plan", required=True ) @@ -42,17 +48,19 @@ class AccountClearancePlan(models.TransientModel): help="Internal note of the new journal entry that will be generated.", ) amount_to_allocate = fields.Float(string="Total Amount to Allocate", readonly=True) - amount_allocated = fields.Float( - string="Amount Allocated", compute="_compute_amount_allocated" + amount_unallocated = fields.Float( + string="Amount Unallocated", compute="_compute_amount_unallocated" ) clearance_plan_line_ids = fields.One2many( comodel_name="account.clearance.plan.line", inverse_name="clearance_plan_id" ) @api.onchange("clearance_plan_line_ids") - def _compute_amount_allocated(self): + def _compute_amount_unallocated(self): for rec in self: - rec.amount_allocated = sum(rec.clearance_plan_line_ids.mapped("amount")) + rec.amount_unallocated = rec.amount_to_allocate - sum( + rec.clearance_plan_line_ids.mapped("amount") + ) def _get_move_lines_from_context(self): active_model = self._context.get("active_model") @@ -124,7 +132,6 @@ class AccountClearancePlan(models.TransientModel): def _create_clearance_move_lines(self, move): account_id = self.move_line_ids.mapped("account_id") partner_id = self.move_line_ids.mapped("partner_id") - move_line_name = self.env.user.company_id.clearance_plan_move_line_name negative_amount_residual = sum(move.line_ids.mapped("amount_residual")) < 0 for line in self.clearance_plan_line_ids: self.env["account.move.line"].with_context( @@ -135,7 +142,7 @@ class AccountClearancePlan(models.TransientModel): "debit": line.amount if negative_amount_residual else 0, "credit": line.amount if not negative_amount_residual else 0, "date_maturity": line.date_maturity, - "name": move_line_name, + "name": line.name, "account_id": account_id.id, "partner_id": partner_id.id, } @@ -143,10 +150,8 @@ class AccountClearancePlan(models.TransientModel): def confirm_plan(self): self.ensure_one() - if self.amount_to_allocate != self.amount_allocated: - raise UserError( - _("Amount to allocate and amount allocated must be equals.") - ) + if self.amount_unallocated != 0: + raise UserError(_("%s still to allocate.") % self.amount_unallocated) move = self.env["account.move"].create( { diff --git a/account_clearance_plan/wizard/account_clearance_plan_wizard.xml b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml index 6927b6dcd..8d199ecc5 100644 --- a/account_clearance_plan/wizard/account_clearance_plan_wizard.xml +++ b/account_clearance_plan/wizard/account_clearance_plan_wizard.xml @@ -11,12 +11,13 @@ - + +