diff --git a/purchase_invoice_plan_deposit/README.rst b/purchase_invoice_plan_deposit/README.rst new file mode 100644 index 00000000000..af3138798e1 --- /dev/null +++ b/purchase_invoice_plan_deposit/README.rst @@ -0,0 +1,98 @@ +============================================== +Purchase Invoice Plan - Deposit on 1st invoice +============================================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png + :target: https://odoo-community.org/page/development-status + :alt: Alpha +.. |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%2Fpurchase--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/purchase-workflow/tree/15.0/purchase_invoice_plan_deposit + :alt: OCA/purchase-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/purchase-workflow-15-0/purchase-workflow-15-0-purchase_invoice_plan_deposit + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/142/15.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module bridge features from purchase_invoice_plan and purchase_deposit. +Now, it posssible create invoice plan with 1st invoice as a deposit invoice. + +.. IMPORTANT:: + This is an alpha version, the data model and design can change at any time without warning. + Only for development or testing purpose, do not use in production. + `More details on development status `_ + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +- Create new purchase quotation as per normal process +- Select option "Use Invoice Plan", a new Invoice Plan tab will appear +- Click on "=> Create Invoice Plan" link to open invoice planning wizard +- Do plan for number of installment and/or **Deposit on 1st invoice**, start date and interval +- Double check that each installment has correct plan percentage (Deposit's plan percentage must > 0) +- After confirm purchases order, we have new option to "Create Bill by Plan" +- User can create only next bill or create all bills at the same time + +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 +~~~~~~~ + +* Ecosoft + +Contributors +~~~~~~~~~~~~ + +* Kitti Upariphutthiphong + +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. + +.. |maintainer-kittiu| image:: https://github.com/kittiu.png?size=40px + :target: https://github.com/kittiu + :alt: kittiu + +Current `maintainer `__: + +|maintainer-kittiu| + +This module is part of the `OCA/purchase-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/purchase_invoice_plan_deposit/__init__.py b/purchase_invoice_plan_deposit/__init__.py new file mode 100644 index 00000000000..dff17efd48b --- /dev/null +++ b/purchase_invoice_plan_deposit/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from . import models +from . import wizard diff --git a/purchase_invoice_plan_deposit/__manifest__.py b/purchase_invoice_plan_deposit/__manifest__.py new file mode 100644 index 00000000000..dc245273edf --- /dev/null +++ b/purchase_invoice_plan_deposit/__manifest__.py @@ -0,0 +1,21 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +{ + "name": "Purchase Invoice Plan - Deposit on 1st invoice", + "summary": "Add to purchase invoice plan, the deposit invoice", + "version": "14.0.1.0.0", + "author": "Ecosoft,Odoo Community Association (OCA)", + "license": "AGPL-3", + "website": "https://github.com/OCA/purchase-workflow", + "category": "Purchase", + "depends": ["purchase_invoice_plan", "purchase_deposit"], + "data": [ + "wizard/purchase_create_invoice_plan_view.xml", + "views/purchase_view.xml", + ], + "installable": True, + "auto_install": True, + "maintainers": ["kittiu"], + "development_status": "Alpha", +} diff --git a/purchase_invoice_plan_deposit/models/__init__.py b/purchase_invoice_plan_deposit/models/__init__.py new file mode 100644 index 00000000000..a2d31548aee --- /dev/null +++ b/purchase_invoice_plan_deposit/models/__init__.py @@ -0,0 +1,4 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from . import purchase diff --git a/purchase_invoice_plan_deposit/models/purchase.py b/purchase_invoice_plan_deposit/models/purchase.py new file mode 100644 index 00000000000..f76987bcaec --- /dev/null +++ b/purchase_invoice_plan_deposit/models/purchase.py @@ -0,0 +1,98 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from odoo import _, api, fields, models +from odoo.exceptions import UserError + + +class PurchaseOrder(models.Model): + _inherit = "purchase.order" + + need_advance = fields.Boolean( + compute="_compute_need_advance", + help="True if use 1st deposit invoice plan, but no deposit yet", + ) + + @api.constrains("invoice_plan_ids") + def _check_invoice_plan_ids(self): + for rec in self: + for plan in rec.invoice_plan_ids: + if plan.invoice_type == "advance" and plan.installment != 0: + raise UserError(_("Only installment 0 can be of type 'Deposit'")) + + def _compute_ip_invoice_plan(self): + """With case advance in place, do overwrite""" + for rec in self: + has_invoice_plan = rec.use_invoice_plan and rec.invoice_plan_ids + to_invoice = rec.invoice_plan_ids.filtered(lambda l: not l.invoiced) + if rec.state == "purchase" and has_invoice_plan and to_invoice: + if rec.invoice_status == "to invoice" or ( + rec.invoice_status == "no" + and "advance" in to_invoice.mapped("invoice_type") + ): + rec.ip_invoice_plan = True + continue + rec.ip_invoice_plan = False + + def create_invoice_plan( + self, num_installment, installment_date, interval, interval_type + ): + advance = self.env.context.get("advance") + advance_percent = self.env.context.get("advance_percent") + advance_date = installment_date + if advance: # installment_date will be after advance_date + installment_date = self._next_date(advance_date, interval, interval_type) + # Call super to create non-advance installments + res = super().create_invoice_plan( + num_installment, installment_date, interval, interval_type + ) + # Advance + if advance: + vals = { + "installment": 0, + "plan_date": advance_date, + "invoice_type": "advance", + "percent": advance_percent, + } + self.write({"invoice_plan_ids": [(0, 0, vals)]}) + return res + + def _compute_need_advance(self): + for order in self: + advance = order.invoice_plan_ids.filtered_domain( + [("invoice_type", "=", "advance")] + ) + deposit = order.order_line.filtered("is_deposit") + order.need_advance = advance and not deposit + + def action_create_invoice(self): + """If there is deposit installment, and no invoice is_deposit yet. + Give user a warning. + """ + if self.filtered("need_advance"): + raise UserError( + _("Invoice plan requires deposit, please register deposit first.") + ) + return super().action_create_invoice() + + +class PurchaseInvoicePlan(models.Model): + _inherit = "purchase.invoice.plan" + + invoice_type = fields.Selection( + selection_add=[("advance", "Deposit")], + ondelete={"advance": "cascade"}, + ) + + def _update_new_quantity(self, line, percent): + if line.purchase_line_id.is_deposit: # based on 1 unit + line.write({"quantity": -percent / 100}) + return + super()._update_new_quantity(line, percent) + + def _get_amount_invoice(self, invoices): + """Override _get_amount_invoice""" + lines = invoices.mapped("invoice_line_ids").filtered( + lambda l: not l.purchase_line_id.is_deposit + ) + return sum(lines.mapped("price_subtotal")) diff --git a/purchase_invoice_plan_deposit/readme/CONTRIBUTORS.rst b/purchase_invoice_plan_deposit/readme/CONTRIBUTORS.rst new file mode 100644 index 00000000000..033e67f43c1 --- /dev/null +++ b/purchase_invoice_plan_deposit/readme/CONTRIBUTORS.rst @@ -0,0 +1 @@ +* Kitti Upariphutthiphong diff --git a/purchase_invoice_plan_deposit/readme/DESCRIPTION.rst b/purchase_invoice_plan_deposit/readme/DESCRIPTION.rst new file mode 100644 index 00000000000..2535c647abf --- /dev/null +++ b/purchase_invoice_plan_deposit/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module bridge features from purchase_invoice_plan and purchase_deposit. +Now, it posssible create invoice plan with 1st invoice as a deposit invoice. diff --git a/purchase_invoice_plan_deposit/readme/USAGE.rst b/purchase_invoice_plan_deposit/readme/USAGE.rst new file mode 100644 index 00000000000..20a5baa0f2d --- /dev/null +++ b/purchase_invoice_plan_deposit/readme/USAGE.rst @@ -0,0 +1,7 @@ +- Create new purchase quotation as per normal process +- Select option "Use Invoice Plan", a new Invoice Plan tab will appear +- Click on "=> Create Invoice Plan" link to open invoice planning wizard +- Do plan for number of installment and/or **Deposit on 1st invoice**, start date and interval +- Double check that each installment has correct plan percentage (Deposit's plan percentage must > 0) +- After confirm purchases order, we have new option to "Create Bill by Plan" +- User can create only next bill or create all bills at the same time diff --git a/purchase_invoice_plan_deposit/static/description/icon.png b/purchase_invoice_plan_deposit/static/description/icon.png new file mode 100644 index 00000000000..3a0328b516c Binary files /dev/null and b/purchase_invoice_plan_deposit/static/description/icon.png differ diff --git a/purchase_invoice_plan_deposit/static/description/index.html b/purchase_invoice_plan_deposit/static/description/index.html new file mode 100644 index 00000000000..c11832aec5b --- /dev/null +++ b/purchase_invoice_plan_deposit/static/description/index.html @@ -0,0 +1,441 @@ + + + + + + +Purchase Invoice Plan - Deposit on 1st invoice + + + +
+

Purchase Invoice Plan - Deposit on 1st invoice

+ + +

Alpha License: AGPL-3 OCA/purchase-workflow Translate me on Weblate Try me on Runbot

+

This module bridge features from purchase_invoice_plan and purchase_deposit. +Now, it posssible create invoice plan with 1st invoice as a deposit invoice.

+
+

Important

+

This is an alpha version, the data model and design can change at any time without warning. +Only for development or testing purpose, do not use in production. +More details on development status

+
+

Table of contents

+ +
+

Usage

+
    +
  • Create new purchase quotation as per normal process
    • +
  • Select option “Use Invoice Plan”, a new Invoice Plan tab will appear
    • +
  • Click on “=> Create Invoice Plan” link to open invoice planning wizard
    • +
  • Do plan for number of installment and/or Deposit on 1st invoice, start date and interval
    • +
  • Double check that each installment has correct plan percentage (Deposit’s plan percentage must > 0)
    • +
  • After confirm purchases order, we have new option to “Create Bill by Plan”
    • +
  • User can create only next bill or create all bills at the same time
    • +
+
+
+

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

+
    +
  • Ecosoft
    • +
+
+
+

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.

+

Current maintainer:

+

kittiu

+

This module is part of the OCA/purchase-workflow project on GitHub.

+

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

+
+
+
+ + diff --git a/purchase_invoice_plan_deposit/tests/__init__.py b/purchase_invoice_plan_deposit/tests/__init__.py new file mode 100644 index 00000000000..7e33a52fba6 --- /dev/null +++ b/purchase_invoice_plan_deposit/tests/__init__.py @@ -0,0 +1,3 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) +from . import test_purchase_invoice_plan diff --git a/purchase_invoice_plan_deposit/tests/test_purchase_invoice_plan.py b/purchase_invoice_plan_deposit/tests/test_purchase_invoice_plan.py new file mode 100644 index 00000000000..3519b29c723 --- /dev/null +++ b/purchase_invoice_plan_deposit/tests/test_purchase_invoice_plan.py @@ -0,0 +1,76 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from odoo.exceptions import UserError +from odoo.tests.common import Form + +from odoo.addons.purchase_deposit.tests.test_purchase_deposit import TestPurchaseDeposit +from odoo.addons.purchase_invoice_plan.tests.test_purchase_invoice_plan import ( + TestPurchaseInvoicePlan, +) + + +class TestPurchaseInvoicePlanDeposit(TestPurchaseInvoicePlan, TestPurchaseDeposit): + def setUp(self): + super().setUp() + self.deposit_model = self.env["purchase.advance.payment.inv"] + + def test_invoice_plan_with_advance(self): + self.test_service.purchase_method = "purchase" # invoiced by order qty + ctx = { + "active_id": self.test_po_service.id, + "active_ids": [self.test_po_service.id], + "all_remain_invoices": True, + "create_bills": True, + } + # Create purchase plan with advance + num_installment = 5 + with Form(self.PurchaseInvoicePlan) as p: + p.num_installment = num_installment + p.advance = True + purchase_plan = p.save() + purchase_plan.with_context(ctx).purchase_create_invoice_plan() + # Check invoice plan created + self.assertTrue(self.test_po_service.invoice_plan_ids) + with self.assertRaises(UserError): + self.test_po_service.invoice_plan_ids[1].invoice_type = "advance" + self.test_po_service._check_invoice_plan_ids() + # If advance percent is not filled, show error + advance_line = self.test_po_service.invoice_plan_ids.filtered( + lambda l: l.invoice_type == "advance" + ) + self.assertEqual(len(advance_line), 1, "No one advance line") + # Add 10% to advance + advance_line.percent = 10 + # Confirm PO and cereate invoices + self.test_po_service.button_confirm() + self.assertEqual(self.test_po_service.state, "purchase") + self.assertTrue(self.test_po_service.ip_invoice_plan) + # Check there is deposit installment must register deposit first + with self.assertRaises(UserError): + self.test_po_service.action_create_invoice() + purchase_create = self.env["purchase.make.planned.invoice"].create({}) + purchase_create.with_context(ctx).create_invoices_by_plan() + # Valid number of invoices, including advance + invoices = self.test_po_service.invoice_ids + self.assertEqual( + len(invoices), num_installment + 1, "Wrong number of invoice created" + ) + # Validate advance amount, which is 10% of purhcase order + adv_invoice = ( + invoices.mapped("invoice_line_ids") + .filtered(lambda l: l.purchase_line_id.is_deposit and l.quantity == 1) + .mapped("move_id") + ) + self.assertEqual( + adv_invoice.amount_total, + self.test_po_service.amount_total * 0.1, + "Wrong advance amount", + ) + # Valid total quantity of invoices (exclude Advance line), must be equal to 1 + quantity = sum( + invoices.mapped("invoice_line_ids") + .filtered(lambda l: l.product_id == self.test_service) + .mapped("quantity") + ) + self.assertEqual(quantity, 1, "Wrong number of total invoice quantity") diff --git a/purchase_invoice_plan_deposit/views/purchase_view.xml b/purchase_invoice_plan_deposit/views/purchase_view.xml new file mode 100644 index 00000000000..7a5572a2910 --- /dev/null +++ b/purchase_invoice_plan_deposit/views/purchase_view.xml @@ -0,0 +1,40 @@ + + + Invoice Order + ir.actions.act_window + purchase.advance.payment.inv + form + new + + + view.purchase.order.inherit + purchase.order + + + + + + + + + diff --git a/purchase_invoice_plan_deposit/wizard/__init__.py b/purchase_invoice_plan_deposit/wizard/__init__.py new file mode 100644 index 00000000000..7bd8436bdbb --- /dev/null +++ b/purchase_invoice_plan_deposit/wizard/__init__.py @@ -0,0 +1,5 @@ +# Copyright 2019 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) +from . import purchase_create_invoice_plan +from . import purchase_make_invoice_advance +from . import purchase_make_planned_invoice diff --git a/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan.py b/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan.py new file mode 100644 index 00000000000..6c886253435 --- /dev/null +++ b/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan.py @@ -0,0 +1,24 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from odoo import fields, models + + +class PurchaseCreateInvoicePlan(models.TransientModel): + _inherit = "purchase.create.invoice.plan" + + advance = fields.Boolean( + string="Deposit on 1st Invoice", + default=False, + ) + advance_percent = fields.Float( + string="Percent Deposit", + default=1, + required=True, + ) + + def purchase_create_invoice_plan(self): + self = self.with_context( + advance=self.advance, advance_percent=self.advance_percent + ) + return super().purchase_create_invoice_plan() diff --git a/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan_view.xml b/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan_view.xml new file mode 100644 index 00000000000..c5cc4ad35ad --- /dev/null +++ b/purchase_invoice_plan_deposit/wizard/purchase_create_invoice_plan_view.xml @@ -0,0 +1,28 @@ + + + + Create Invoice Plan + purchase.create.invoice.plan + + + + + diff --git a/purchase_invoice_plan_deposit/wizard/purchase_make_invoice_advance.py b/purchase_invoice_plan_deposit/wizard/purchase_make_invoice_advance.py new file mode 100644 index 00000000000..9f0482c6295 --- /dev/null +++ b/purchase_invoice_plan_deposit/wizard/purchase_make_invoice_advance.py @@ -0,0 +1,44 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from odoo import api, models + + +class PurchaseAdvancePaymentInv(models.TransientModel): + _inherit = "purchase.advance.payment.inv" + + def _create_invoice(self, order, po_line, amount): + invoice = super()._create_invoice(order, po_line, amount) + invoice_plan_id = self._context.get("invoice_plan_id") + if invoice_plan_id: + plan = self.env["purchase.invoice.plan"].browse(invoice_plan_id) + plan.invoice_ids += invoice + invoice.write( + { + "date": plan.plan_date, + "invoice_date": plan.plan_date, + } + ) + return invoice + + @api.model + def default_get(self, fields_list): + res = super().default_get(fields_list) + # Default advance amount from installment 0 + order = self.env["purchase.order"].browse(self.env.context.get("active_id")) + if order.use_invoice_plan: + advance = order.invoice_plan_ids.filtered(lambda l: l.installment == 0) + if advance: + res["amount"] = advance[:1].percent + return res + + def create_invoices(self): + order = self.env["purchase.order"].browse(self.env.context.get("active_id")) + if order.use_invoice_plan: + plan_advance = order.invoice_plan_ids.filtered(lambda l: l.installment == 0) + if plan_advance: + return super( + PurchaseAdvancePaymentInv, + self.with_context(invoice_plan_id=plan_advance.id), + ).create_invoices() + return super(PurchaseAdvancePaymentInv, self).create_invoices() diff --git a/purchase_invoice_plan_deposit/wizard/purchase_make_planned_invoice.py b/purchase_invoice_plan_deposit/wizard/purchase_make_planned_invoice.py new file mode 100644 index 00000000000..08733bb3e22 --- /dev/null +++ b/purchase_invoice_plan_deposit/wizard/purchase_make_planned_invoice.py @@ -0,0 +1,28 @@ +# Copyright 2021 Ecosoft Co., Ltd (http://ecosoft.co.th/) +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html) + +from odoo import models + + +class PurchaseAdvancePaymentInv(models.TransientModel): + _inherit = "purchase.make.planned.invoice" + + def create_invoices_by_plan(self): + # Create advance, if any + purchase = self.env["purchase.order"].browse(self._context.get("active_id")) + purchase.ensure_one() + plan_advance = purchase.invoice_plan_ids.filtered( + lambda l: l.to_invoice and l.invoice_type == "advance" + ) + if plan_advance: # Create advance invoice using percentage + MakeInvoice = self.env["purchase.advance.payment.inv"] + makeinv_wizard = { + "advance_payment_method": "percentage", + "amount": plan_advance.percent, + } + makeinvoice = MakeInvoice.create(makeinv_wizard) + makeinvoice.with_context(invoice_plan_id=plan_advance.id).create_invoices() + # Create non-advance invoices + if self._context.get("all_remain_invoices") or not plan_advance: + return super().create_invoices_by_plan() + return {"type": "ir.actions.act_window_close"} diff --git a/setup/purchase_invoice_plan_deposit/odoo/addons/purchase_invoice_plan_deposit b/setup/purchase_invoice_plan_deposit/odoo/addons/purchase_invoice_plan_deposit new file mode 120000 index 00000000000..022decca97d --- /dev/null +++ b/setup/purchase_invoice_plan_deposit/odoo/addons/purchase_invoice_plan_deposit @@ -0,0 +1 @@ +../../../../purchase_invoice_plan_deposit \ No newline at end of file diff --git a/setup/purchase_invoice_plan_deposit/setup.py b/setup/purchase_invoice_plan_deposit/setup.py new file mode 100644 index 00000000000..28c57bb6403 --- /dev/null +++ b/setup/purchase_invoice_plan_deposit/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)