diff --git a/sale_commission_advance/README.rst b/sale_commission_advance/README.rst new file mode 100644 index 000000000..a5db5ca1b --- /dev/null +++ b/sale_commission_advance/README.rst @@ -0,0 +1,100 @@ +========================= +Sales Commissions Advance +========================= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:63e77b3e1b815ab2cc656a5980aca0917f6597dd0c00c624ba205ec299f61cfb + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fcommission-lightgray.png?logo=github + :target: https://github.com/OCA/commission/tree/16.0/sale_commission_advance + :alt: OCA/commission +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-sale_commission_advance + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Module used to apply agents commission to down payment invoices proportionally to +sale order agents commission. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Create Sale order with agents commissions. +* Create down payment invoice. Make sure down payment product is not commission free. +* Open created invoice. You will see proportional agents commissions calculated. +* When creating regular invoice with deducted down payment, also agents commissions from down payment will be deducted. + +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 to smash it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Ilyas +* Ooops404 + +Contributors +~~~~~~~~~~~~ + +* `Ooops404 `__: + + * Ilyas + +* `Binhex `__: + + * Adasat Torres + +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-ilyasprogrammer| image:: https://github.com/ilyasprogrammer.png?size=40px + :target: https://github.com/ilyasprogrammer + :alt: ilyasprogrammer + +Current `maintainer `__: + +|maintainer-ilyasprogrammer| + +This module is part of the `OCA/commission `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_commission_advance/__init__.py b/sale_commission_advance/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sale_commission_advance/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_commission_advance/__manifest__.py b/sale_commission_advance/__manifest__.py new file mode 100644 index 000000000..53c8e22ee --- /dev/null +++ b/sale_commission_advance/__manifest__.py @@ -0,0 +1,12 @@ +{ + "name": "Sales Commissions Advance", + "summary": "Down payment invoice commission", + "version": "16.0.1.0.0", + "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", + "category": "Sales Management", + "license": "AGPL-3", + "depends": ["account_commission", "sale_commission", "commission"], + "website": "https://github.com/OCA/commission", + "maintainers": ["ilyasprogrammer"], + "installable": True, +} diff --git a/sale_commission_advance/i18n/it.po b/sale_commission_advance/i18n/it.po new file mode 100644 index 000000000..e70612fce --- /dev/null +++ b/sale_commission_advance/i18n/it.po @@ -0,0 +1,71 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2022-12-01 16:45+0000\n" +"Last-Translator: Francesco Foresti \n" +"Language-Team: none\n" +"Language: it\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.14.1\n" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "Dettaglio riga provvigione agente nelle righe fattura" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "Nome visualizzato" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "Importo base acconto" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "ID" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "Registrazione contabile" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "Movimento contabile" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "Ultima modifica il" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "Riga ordine di vendita" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "Provvigione totale agente basata su Ordine di vendita" diff --git a/sale_commission_advance/i18n/pt_BR.po b/sale_commission_advance/i18n/pt_BR.po new file mode 100644 index 000000000..c7560fe39 --- /dev/null +++ b/sale_commission_advance/i18n/pt_BR.po @@ -0,0 +1,71 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"PO-Revision-Date: 2023-06-10 21:09+0000\n" +"Last-Translator: Adriano Prado \n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.17\n" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "Detalhe do agente da linha de comissão nas linhas da fatura" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "Nome para Exibição" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "Valor base do adiantamento" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "ID" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "Lançamento Diário" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "Item Diário" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "Última Modificação em" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "Linha de Pedidos de Venda" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "Comissão total do representante com base no pedido de venda" diff --git a/sale_commission_advance/i18n/sale_commission_advance.pot b/sale_commission_advance/i18n/sale_commission_advance.pot new file mode 100644 index 000000000..452548d2e --- /dev/null +++ b/sale_commission_advance/i18n/sale_commission_advance.pot @@ -0,0 +1,68 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.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: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "" diff --git a/sale_commission_advance/models/__init__.py b/sale_commission_advance/models/__init__.py new file mode 100644 index 000000000..df48fd830 --- /dev/null +++ b/sale_commission_advance/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_move +from . import sale_order diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py new file mode 100644 index 000000000..17f7272e5 --- /dev/null +++ b/sale_commission_advance/models/account_move.py @@ -0,0 +1,108 @@ +from odoo import api, fields, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + def create(self, vals): + """ + _prepare_agents_vals_down_payment is called after _get_commission_amount on + account.invoice.line.agent. Need to call _get_commission_amount again to apply + custom amount calculation on down payment line. Otherwise, amount will be 0. + """ + rec = super().create(vals) + if rec.has_related_sale_with_down_payment(): + rec.recompute_lines_agents() + return rec + + def has_related_sale_with_down_payment(self): + dp_list = self.invoice_line_ids.sale_line_ids.mapped("is_downpayment") + return dp_list and any(dp_list) + + +class AccountMoveLine(models.Model): + _inherit = "account.move.line" + + @api.depends("move_id.partner_id") + def _compute_agent_ids(self): + self.agent_ids = False # for resetting previous agents + down_payment_items = self.filtered( + lambda x: x.move_id.partner_id + and x.move_id.move_type[:3] == "out" + and x.sale_line_ids.is_downpayment + ) + for record in down_payment_items: + agent_ids = record._prepare_agents_vals_down_payment() + record.update({"agent_ids": agent_ids}) + regular_items = self - down_payment_items + if regular_items: + return super(AccountMoveLine, regular_items)._compute_agent_ids() + + def _prepare_agents_vals_partner(self, partner, settlement_type=None): + if not self.move_id.has_related_sale_with_down_payment(): + return super()._prepare_agents_vals_partner(partner, settlement_type) + sol_agents = self.sale_line_ids.mapped("agent_ids").filtered( + lambda x: x.amount > 0 + ) + agent_ids = sol_agents.mapped("agent_id") + res = [] + for agent_id in agent_ids: + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "commission_id": agent_id.commission_id.id, + }, + ) + ) + return res + + def _prepare_agents_vals_down_payment(self): + # Add agent lines with amount > 0 and with total commission amount + self.sale_line_ids.ensure_one() + sale_order_id = self.sale_line_ids.order_id + agent_sol_ids = sale_order_id.order_line.filtered( + lambda x: x.is_downpayment is False and x.product_id and x.agent_ids + ) + sol_agents = agent_sol_ids.mapped("agent_ids").filtered(lambda x: x.amount > 0) + agent_ids = sol_agents.mapped("agent_id") + res = [] + for agent_id in agent_ids: + total = sum( + sol_agents.filtered(lambda x: x.agent_id == agent_id).mapped("amount") + ) + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "downpayment_base_amount": total, + "commission_id": agent_id.commission_id.id, + }, + ) + ) + return res + + +class AccountInvoiceLineAgent(models.Model): + _inherit = "account.invoice.line.agent" + + downpayment_base_amount = fields.Monetary( + copy=False, help="Total agent commission based on Sale Order" + ) + + def _get_commission_amount(self, commission, subtotal, product, quantity): + self.ensure_one() + if self.object_id.sale_line_ids and self.object_id.sale_line_ids.is_downpayment: + sale_order_id = self.object_id.sale_line_ids.order_id + ratio = self.object_id.price_total / sale_order_id.amount_total + return self.downpayment_base_amount * ratio + else: + return super(AccountInvoiceLineAgent, self)._get_commission_amount( + commission, subtotal, product, quantity + ) diff --git a/sale_commission_advance/models/sale_order.py b/sale_commission_advance/models/sale_order.py new file mode 100644 index 000000000..0181983f1 --- /dev/null +++ b/sale_commission_advance/models/sale_order.py @@ -0,0 +1,42 @@ +from odoo import api, models + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + @api.depends("order_id.partner_id") + def _compute_agent_ids(self): + self.agent_ids = False # for resetting previous agents + down_payment_items = self.filtered( + lambda x: x.order_id.partner_id and x.is_downpayment + ) + for record in down_payment_items: + agent_ids = record._prepare_agents_vals_partner_down_payment( + record.order_id.partner_id + ) + record.update({"agent_ids": agent_ids}) + regular_items = self - down_payment_items + if regular_items: + return super(SaleOrderLine, regular_items)._compute_agent_ids() + + def _prepare_agents_vals_partner_down_payment(self, partner): + res = [] + if self.invoice_lines: + for agent_id in partner.agent_ids: + for line in self.invoice_lines: + if ( + line.agent_ids + and agent_id.id in line.agent_ids.mapped("agent_id").ids + ): + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "commission_id": agent_id.commission_id.id, + }, + ) + ) + return res diff --git a/sale_commission_advance/readme/CONTRIBUTORS.rst b/sale_commission_advance/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..fb3811ecf --- /dev/null +++ b/sale_commission_advance/readme/CONTRIBUTORS.rst @@ -0,0 +1,7 @@ +* `Ooops404 `__: + + * Ilyas + +* `Binhex `__: + + * Adasat Torres diff --git a/sale_commission_advance/readme/DESCRIPTION.rst b/sale_commission_advance/readme/DESCRIPTION.rst new file mode 100644 index 000000000..98ffee0fb --- /dev/null +++ b/sale_commission_advance/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Module used to apply agents commission to down payment invoices proportionally to +sale order agents commission. diff --git a/sale_commission_advance/readme/USAGE.rst b/sale_commission_advance/readme/USAGE.rst new file mode 100644 index 000000000..e8200470c --- /dev/null +++ b/sale_commission_advance/readme/USAGE.rst @@ -0,0 +1,4 @@ +* Create Sale order with agents commissions. +* Create down payment invoice. Make sure down payment product is not commission free. +* Open created invoice. You will see proportional agents commissions calculated. +* When creating regular invoice with deducted down payment, also agents commissions from down payment will be deducted. diff --git a/sale_commission_advance/static/description/icon.png b/sale_commission_advance/static/description/icon.png new file mode 100644 index 000000000..3a0328b51 Binary files /dev/null and b/sale_commission_advance/static/description/icon.png differ diff --git a/sale_commission_advance/static/description/index.html b/sale_commission_advance/static/description/index.html new file mode 100644 index 000000000..940603a7e --- /dev/null +++ b/sale_commission_advance/static/description/index.html @@ -0,0 +1,442 @@ + + + + + + +Sales Commissions Advance + + + +
+

Sales Commissions Advance

+ + +

Beta License: AGPL-3 OCA/commission Translate me on Weblate Try me on Runboat

+

Module used to apply agents commission to down payment invoices proportionally to +sale order agents commission.

+

Table of contents

+ +
+

Usage

+
    +
  • Create Sale order with agents commissions.
    • +
  • Create down payment invoice. Make sure down payment product is not commission free.
    • +
  • Open created invoice. You will see proportional agents commissions calculated.
    • +
  • When creating regular invoice with deducted down payment, also agents commissions from down payment will be deducted.
    • +
+
+
+

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 to smash it by providing a detailed and welcomed +feedback.

+

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

+
+
+

Credits

+
+

Authors

+
    +
  • Ilyas
    • +
  • Ooops404
    • +
+
+
+

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:

+

ilyasprogrammer

+

This module is part of the OCA/commission project on GitHub.

+

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

+
+
+
+ + diff --git a/sale_commission_advance/tests/__init__.py b/sale_commission_advance/tests/__init__.py new file mode 100644 index 000000000..7b1366573 --- /dev/null +++ b/sale_commission_advance/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_commission_advance diff --git a/sale_commission_advance/tests/test_sale_commission_advance.py b/sale_commission_advance/tests/test_sale_commission_advance.py new file mode 100644 index 000000000..73769dc9c --- /dev/null +++ b/sale_commission_advance/tests/test_sale_commission_advance.py @@ -0,0 +1,145 @@ +import logging + +from odoo.tests.common import TransactionCase + +_logger = logging.getLogger(__name__) + + +class TestSaleCommission(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.commission_model = cls.env["commission"] + cls.res_partner_model = cls.env["res.partner"] + cls.sale_order_model = cls.env["sale.order"] + cls.advance_inv_model = cls.env["sale.advance.payment.inv"] + cls.commission_1 = cls.commission_model.create( + { + "name": "10% fixed commission", + "fix_qty": 10.0, + "commission_type": "fixed", + "amount_base_type": "gross_amount", + } + ) + cls.product_1 = cls.env.ref("product.product_product_5") + cls.product_2 = cls.env.ref("product.product_product_6") + cls.product_1.write({"invoice_policy": "order"}) + cls.product_2.write({"invoice_policy": "order"}) + cls.agent_1 = cls.res_partner_model.create( + { + "name": "Test Agent 1", + "agent": True, + "lang": "en_US", + "settlement": "monthly", + "commission_id": cls.commission_1.id, + } + ) + cls.agent_2 = cls.res_partner_model.create( + { + "name": "Test Agent 2", + "agent": True, + "lang": "en_US", + "settlement": "monthly", + "commission_id": cls.commission_1.id, + } + ) + cls.partner = cls.env.ref("base.res_partner_2") + cls.partner.agent_ids = [(6, 0, (cls.agent_1 + cls.agent_2).ids)] + cls.default_account_revenue = cls.env["account.account"].search( + [ + ("company_id", "=", cls.env.company[0].id), + ("account_type", "=", "income"), + ], + limit=1, + ) + + def _create_sale_order(self): + return self.sale_order_model.create( + { + "partner_id": self.partner.id, + "order_line": [ + ( + 0, + 0, + { + "name": self.product_1.name, + "product_id": self.product_1.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": 500, + }, + ), + ( + 0, + 0, + { + "name": self.product_2.name, + "product_id": self.product_2.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": 500, + }, + ), + ], + } + ) + + def _invoice_sale_order(self, sale_order, date=None, method="percentage"): + old_invoices = sale_order.invoice_ids + if method == "delivered": + wizard = self.advance_inv_model.create( + { + "advance_payment_method": method, + "sale_order_ids": sale_order.ids, + } + ) + else: + wizard = self.advance_inv_model.create( + { + "advance_payment_method": method, + "amount": 10, + "deposit_account_id": self.default_account_revenue.id, + "sale_order_ids": sale_order.ids, + } + ) + wizard.create_invoices() + invoice = sale_order.invoice_ids - old_invoices + if date: + invoice.invoice_date = date + invoice.date = date + # We need to use flush() in order to execute commission_amount + invoice.flush_recordset() + return invoice + + def test_down_payment_flow(self): + # Sale order + order_id = self._create_sale_order() + order_id._compute_commission_total() + self.assertEqual(order_id.commission_total, 200) + self.assertEqual(len(order_id.order_line.agent_ids), 4) + order_id.order_line[0].agent_ids[1].unlink() + order_id.order_line[1].agent_ids[1].unlink() + self.assertEqual(order_id.commission_total, 100) + self.assertEqual(len(order_id.order_line.agent_ids), 2) + order_id.action_confirm() + # Down Payment Invoice + dp_invoice_id = self._invoice_sale_order(order_id) + self.assertEqual(dp_invoice_id.commission_total, 10) + self.assertEqual(len(dp_invoice_id.invoice_line_ids.agent_ids), 1) + # Regular Invoice + invoice_id = self._invoice_sale_order(order_id, method="delivered") + self.assertEqual(invoice_id.commission_total, 90) + dp_sol_id = order_id.order_line[0] + self.assertEqual(len(dp_sol_id.agent_ids), 1) + + def test_regular_flow(self): + # Sale order + order_id = self._create_sale_order() + order_id._compute_commission_total() + self.assertEqual(order_id.commission_total, 200) + self.assertEqual(len(order_id.order_line.agent_ids), 4) + order_id.action_confirm() + # Regular Invoice + invoice_id = self._invoice_sale_order(order_id, method="delivered") + self.assertEqual(invoice_id.commission_total, 200) + self.assertEqual(len(invoice_id.invoice_line_ids.agent_ids), 4) diff --git a/setup/sale_commission_advance/odoo/addons/sale_commission_advance b/setup/sale_commission_advance/odoo/addons/sale_commission_advance new file mode 120000 index 000000000..736bb049e --- /dev/null +++ b/setup/sale_commission_advance/odoo/addons/sale_commission_advance @@ -0,0 +1 @@ +../../../../sale_commission_advance \ No newline at end of file diff --git a/setup/sale_commission_advance/setup.py b/setup/sale_commission_advance/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_commission_advance/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)