From 42e991443d190ee47223ae916d3fe57129846a71 Mon Sep 17 00:00:00 2001 From: "matteo.tognini" Date: Fri, 1 Dec 2023 16:43:47 +0100 Subject: [PATCH 01/12] [ADD]sale_commission_partial_payment: Commission based on payment amount --- sale_commission_partial_settlement/README.rst | 96 ++++ .../__init__.py | 2 + .../__manifest__.py | 15 + .../models/__init__.py | 4 + .../models/account_move.py | 109 +++++ .../models/account_partial_reconcile.py | 7 + .../models/sale_commission.py | 14 + .../models/settlement.py | 26 + .../readme/CONTRIBUTORS.rst | 11 + .../readme/DESCRIPTION.rst | 1 + .../readme/USAGE.rst | 5 + .../security/ir.model.access.csv | 3 + .../static/description/icon.png | Bin 0 -> 19238 bytes .../static/description/index.html | 452 ++++++++++++++++++ .../tests/__init__.py | 1 + .../tests/test_partial_settlement.py | 266 +++++++++++ .../views/sale_commission_view.xml | 16 + .../wizard/__init__.py | 1 + .../wizard/wizard_settle.py | 100 ++++ 19 files changed, 1129 insertions(+) create mode 100644 sale_commission_partial_settlement/README.rst create mode 100644 sale_commission_partial_settlement/__init__.py create mode 100644 sale_commission_partial_settlement/__manifest__.py create mode 100644 sale_commission_partial_settlement/models/__init__.py create mode 100644 sale_commission_partial_settlement/models/account_move.py create mode 100644 sale_commission_partial_settlement/models/account_partial_reconcile.py create mode 100644 sale_commission_partial_settlement/models/sale_commission.py create mode 100644 sale_commission_partial_settlement/models/settlement.py create mode 100644 sale_commission_partial_settlement/readme/CONTRIBUTORS.rst create mode 100644 sale_commission_partial_settlement/readme/DESCRIPTION.rst create mode 100644 sale_commission_partial_settlement/readme/USAGE.rst create mode 100644 sale_commission_partial_settlement/security/ir.model.access.csv create mode 100644 sale_commission_partial_settlement/static/description/icon.png create mode 100644 sale_commission_partial_settlement/static/description/index.html create mode 100644 sale_commission_partial_settlement/tests/__init__.py create mode 100644 sale_commission_partial_settlement/tests/test_partial_settlement.py create mode 100644 sale_commission_partial_settlement/views/sale_commission_view.xml create mode 100644 sale_commission_partial_settlement/wizard/__init__.py create mode 100644 sale_commission_partial_settlement/wizard/wizard_settle.py diff --git a/sale_commission_partial_settlement/README.rst b/sale_commission_partial_settlement/README.rst new file mode 100644 index 000000000..c6fc54a25 --- /dev/null +++ b/sale_commission_partial_settlement/README.rst @@ -0,0 +1,96 @@ +====================================== +Sales commissions based on paid amount +====================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:2a9857c3cff391b9ed98fd4916c0b50b68872332e34bf4937b6d3705dbf2510d + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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/14.0/sale_commission_partial_settlement + :alt: OCA/commission +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_partial_settlement + :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=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to settle commissions based on paid amount. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Go to Sales > Commissions Management > Commission Types > create or open a record +* Select Invoice Status: Payment Based +* Select Payment Amount Type: Paid Amount + +Behavior for commission settlements will be as per module description. + +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 +~~~~~~~ + +* Nextev Srl +* Ooops + +Contributors +~~~~~~~~~~~~ + +* Nextev : + + * Matteo Tognini + +* PyTech SRL : + + * Alessandro Uffreduzzi + +* Ooops404 : + + * Francesco Foresti + +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/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_partial_settlement/__init__.py b/sale_commission_partial_settlement/__init__.py new file mode 100644 index 000000000..9b4296142 --- /dev/null +++ b/sale_commission_partial_settlement/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizard diff --git a/sale_commission_partial_settlement/__manifest__.py b/sale_commission_partial_settlement/__manifest__.py new file mode 100644 index 000000000..0ba779b5e --- /dev/null +++ b/sale_commission_partial_settlement/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2023 Nextev +{ + "name": "Sales commissions based on paid amount", + "version": "14.0.1.0.0", + "author": "Nextev Srl," "Ooops," "Odoo Community Association (OCA)", + "category": "Sales Management", + "license": "AGPL-3", + "depends": ["sale_commission"], + "website": "https://github.com/OCA/commission", + "data": [ + "security/ir.model.access.csv", + "views/sale_commission_view.xml", + ], + "installable": True, +} diff --git a/sale_commission_partial_settlement/models/__init__.py b/sale_commission_partial_settlement/models/__init__.py new file mode 100644 index 000000000..4e17db438 --- /dev/null +++ b/sale_commission_partial_settlement/models/__init__.py @@ -0,0 +1,4 @@ +from . import sale_commission +from . import account_move +from . import account_partial_reconcile +from . import settlement diff --git a/sale_commission_partial_settlement/models/account_move.py b/sale_commission_partial_settlement/models/account_move.py new file mode 100644 index 000000000..4ba56f54c --- /dev/null +++ b/sale_commission_partial_settlement/models/account_move.py @@ -0,0 +1,109 @@ +# Copyright 2023 Nextev +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class AccountInvoiceLineAgent(models.Model): + _inherit = "account.invoice.line.agent" + + partial_settled = fields.Monetary(string="Partial Commission Amount Settled") + + def _compute_settled(self): + filtered_lines = self.filtered( + lambda x: x.commission_id.payment_amount_type != "paid" + ) + super(AccountInvoiceLineAgent, filtered_lines)._compute_settled() + + def _partial_commissions(self, date_payment_to): + """ + This method iterates through agent invoice lines and calculates + partial commissions based on the payment amount. + If the partial payment amount is greater than the invoice line + amount, it fully settles the corresponding agent line. + Otherwise, it calculates the partial commission proportionally to + the amount paid, invoice amount and total commissions. + """ + partial_lines_to_settle = [] + partial_payment_remaining = {} + lines_to_update = {} + for line in self: + line_total_amount = line.amount + for ( + partial, + amount, + counterpart_line, + ) in line.invoice_id._get_reconciled_invoices_partials(): + if partial.partial_commission_settled: + continue + elif date_payment_to and date_payment_to < counterpart_line.date: + break + if partial.id in partial_payment_remaining: + payment_amount = partial_payment_remaining[partial.id][ + "remaining_amount" + ] + else: + payment_amount = amount + partial_payment_remaining[partial.id] = {"remaining_amount": amount} + if line.object_id.price_total <= payment_amount: + partial_lines_to_settle.append( + { + "invoice_line_agent_id": line.id, + "currency_id": line.currency_id.id, + "amount": line_total_amount, + } + ) + lines_to_update[line.id] = { + "partial_settled": line_total_amount, + "settled": True, + } + partial_payment_remaining[partial.id] = { + "remaining_amount": amount - line.object_id.price_total + } + break + + paid_in_proportion = payment_amount / line.invoice_id.amount_total + partial_commission = ( + line.invoice_id.commission_total * paid_in_proportion + ) + partial_lines_to_settle.append( + { + "invoice_line_agent_id": line.id, + "currency_id": line.currency_id.id, + "amount": partial_commission, + } + ) + if line.id in lines_to_update: + lines_to_update[line.id]["partial_settled"] += partial_commission + else: + lines_to_update[line.id] = {"partial_settled": partial_commission} + + if lines_to_update[line.id]["partial_settled"] >= line_total_amount: + lines_to_update[line.id].update({"settled": True}) + break + partial.partial_commission_settled = True + partial_agent_lines = self.env["account.invoice.line.agent.partial"].create( + partial_lines_to_settle + ) + return partial_agent_lines, lines_to_update + + +class AccountInvoiceLineAgentPartial(models.Model): + _name = "account.invoice.line.agent.partial" + _description = "Partial agent commissions" + + invoice_line_agent_id = fields.Many2one("account.invoice.line.agent", required=True) + agent_line = fields.Many2many( + comodel_name="sale.commission.settlement.line", + relation="settlement_agent_line_partial_rel", + column1="agent_line_partial_id", + column2="settlement_id", + copy=False, + ) + amount = fields.Monetary( + string="Commission Amount", + ) + currency_id = fields.Many2one( + related="invoice_line_agent_id.currency_id", + ) + settled = fields.Boolean() diff --git a/sale_commission_partial_settlement/models/account_partial_reconcile.py b/sale_commission_partial_settlement/models/account_partial_reconcile.py new file mode 100644 index 000000000..7c1714d4d --- /dev/null +++ b/sale_commission_partial_settlement/models/account_partial_reconcile.py @@ -0,0 +1,7 @@ +from odoo import fields, models + + +class AccountPartialReconcile(models.Model): + _inherit = "account.partial.reconcile" + + partial_commission_settled = fields.Boolean() diff --git a/sale_commission_partial_settlement/models/sale_commission.py b/sale_commission_partial_settlement/models/sale_commission.py new file mode 100644 index 000000000..68f03aea9 --- /dev/null +++ b/sale_commission_partial_settlement/models/sale_commission.py @@ -0,0 +1,14 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import fields, models + + +class SaleCommission(models.Model): + _inherit = "sale.commission" + + payment_amount_type = fields.Selection( + [("full", "Full amount"), ("paid", "Paid amount")], + string="Payment amount type", + required=True, + default="full", + ) diff --git a/sale_commission_partial_settlement/models/settlement.py b/sale_commission_partial_settlement/models/settlement.py new file mode 100644 index 000000000..f25ba11e0 --- /dev/null +++ b/sale_commission_partial_settlement/models/settlement.py @@ -0,0 +1,26 @@ +from odoo import api, fields, models + + +class SettlementLine(models.Model): + _inherit = "sale.commission.settlement.line" + + agent_line_partial_ids = fields.Many2many( + comodel_name="account.invoice.line.agent.partial", + relation="settlement_agent_line_partial_rel", + column1="settlement_id", + column2="agent_line_partial_id", + ) + settled_amount = fields.Monetary( + compute="_compute_settled_amount", + related=False, + readonly=True, + store=True, + ) + + @api.depends("commission_id.payment_amount_type") + def _compute_settled_amount(self): + for rec in self: + if rec.commission_id.payment_amount_type == "paid": + rec.settled_amount = rec.agent_line_partial_ids[:1].amount + else: + rec.settled_amount = rec.agent_line[:1].amount diff --git a/sale_commission_partial_settlement/readme/CONTRIBUTORS.rst b/sale_commission_partial_settlement/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..598e7ac77 --- /dev/null +++ b/sale_commission_partial_settlement/readme/CONTRIBUTORS.rst @@ -0,0 +1,11 @@ +* Nextev : + + * Matteo Tognini + +* PyTech SRL : + + * Alessandro Uffreduzzi + +* Ooops404 : + + * Francesco Foresti diff --git a/sale_commission_partial_settlement/readme/DESCRIPTION.rst b/sale_commission_partial_settlement/readme/DESCRIPTION.rst new file mode 100644 index 000000000..b88a8a16c --- /dev/null +++ b/sale_commission_partial_settlement/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to settle commissions based on paid amount. diff --git a/sale_commission_partial_settlement/readme/USAGE.rst b/sale_commission_partial_settlement/readme/USAGE.rst new file mode 100644 index 000000000..bdf194f9f --- /dev/null +++ b/sale_commission_partial_settlement/readme/USAGE.rst @@ -0,0 +1,5 @@ +* Go to Sales > Commissions Management > Commission Types > create or open a record +* Select Invoice Status: Payment Based +* Select Payment Amount Type: Paid Amount + +Behavior for commission settlements will be as per module description. diff --git a/sale_commission_partial_settlement/security/ir.model.access.csv b/sale_commission_partial_settlement/security/ir.model.access.csv new file mode 100644 index 000000000..4c54861bb --- /dev/null +++ b/sale_commission_partial_settlement/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_account_invoice_line_agent_partial,access_account_invoice_line_agent_partial,model_account_invoice_line_agent_partial,sales_team.group_sale_salesman,1,1,1,1 +access_account_invoice_line_agent_partial_user,access_account_invoice_line_agent_partial_user,model_account_invoice_line_agent_partial,base.group_user,1,0,0,0 diff --git a/sale_commission_partial_settlement/static/description/icon.png b/sale_commission_partial_settlement/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0539927894add59cc8db869b17fb5490c765a9b6 GIT binary patch literal 19238 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 lX7tu2x4gIydCwmk`d_A + + + + + +Sales commissions based on paid amount + + + +

+

Sales commissions based on paid amount

+ + +

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

+

This module allows to settle commissions based on paid amount.

+

Table of contents

+ +
+

Usage

+
    +
  • Go to Sales > Commissions Management > Commission Types > create or open a record
    • +
  • Select Invoice Status: Payment Based
    • +
  • Select Payment Amount Type: Paid Amount
    • +
+

Behavior for commission settlements will be as per module description.

+
+
+

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

+
    +
  • Nextev Srl
    • +
  • Ooops
    • +
+
+
+

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/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_partial_settlement/tests/__init__.py b/sale_commission_partial_settlement/tests/__init__.py new file mode 100644 index 000000000..24d61ccf8 --- /dev/null +++ b/sale_commission_partial_settlement/tests/__init__.py @@ -0,0 +1 @@ +from . import test_partial_settlement diff --git a/sale_commission_partial_settlement/tests/test_partial_settlement.py b/sale_commission_partial_settlement/tests/test_partial_settlement.py new file mode 100644 index 000000000..66ba38ea4 --- /dev/null +++ b/sale_commission_partial_settlement/tests/test_partial_settlement.py @@ -0,0 +1,266 @@ +# Copyright 2023 Nextev +# License AGPL-3 - See https://www.gnu.org/licenses/agpl-3.0.html + +from datetime import datetime + +from dateutil.relativedelta import relativedelta + +from odoo import fields +from odoo.tests.common import SavepointCase + + +class TestPartialSettlement(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.commission_model = cls.env["sale.commission"] + cls.partial_commission_net_paid = cls.commission_model.create( + { + "name": "20% fixed commission (Net amount) - Payment Based - Partial", + "fix_qty": 20.0, + "invoice_state": "paid", + "amount_base_type": "net_amount", + "payment_amount_type": "paid", + } + ) + cls.company = cls.env.ref("base.main_company") + cls.res_partner_model = cls.env["res.partner"] + cls.partner = cls.env.ref("base.res_partner_2") + cls.partner.write({"agent": False}) + cls.sale_order_model = cls.env["sale.order"] + cls.advance_inv_model = cls.env["sale.advance.payment.inv"] + cls.settle_model = cls.env["sale.commission.settlement"] + cls.make_settle_model = cls.env["sale.commission.make.settle"] + cls.make_inv_model = cls.env["sale.commission.make.invoice"] + cls.product = cls.env.ref("product.product_product_5") + cls.product.list_price = 5 # for testing specific commission section + cls.commission_product = cls.env["product.product"].create( + {"name": "Commission test product", "type": "service"} + ) + cls.product.write({"invoice_policy": "order"}) + cls.journal = cls.env["account.journal"].search( + [("type", "=", "purchase")], limit=1 + ) + cls.agent_monthly = cls.res_partner_model.create( + { + "name": "Test Agent - Monthly", + "agent": True, + "settlement": "monthly", + "lang": "en_US", + "commission_id": cls.partial_commission_net_paid.id, + } + ) + cls.income_account = cls.env["account.account"].search( + [ + ("company_id", "=", cls.company.id), + ("user_type_id.name", "=", "Income"), + ], + limit=1, + ) + cls.commission_net_invoice = cls.commission_model.create( + { + "name": "10% fixed commission (Net amount) - Invoice Based", + "fix_qty": 10.0, + "amount_base_type": "net_amount", + } + ) + cls.agent_biweekly = cls.res_partner_model.create( + { + "name": "Test Agent - Bi-weekly", + "agent": True, + "settlement": "biweekly", + "lang": "en_US", + "commission_id": cls.commission_net_invoice.id, + } + ) + + def _create_multi_line_sale_order(self, agent, commission): + return self.sale_order_model.create( + { + "partner_id": self.partner.id, + "order_line": [ + ( + 0, + 0, + { + "name": self.product.name, + "product_id": self.product.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": self.product.lst_price, + "agent_ids": [ + ( + 0, + 0, + { + "agent_id": agent.id, + "commission_id": commission.id, + }, + ) + ], + }, + ), + ( + 0, + 0, + { + "name": self.product.name, + "product_id": self.product.id, + "product_uom_qty": 5.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": self.product.lst_price, + "agent_ids": [ + ( + 0, + 0, + { + "agent_id": self.agent_monthly.id, + "commission_id": self.partial_commission_net_paid.id, + }, + ) + ], + }, + ), + ], + } + ) + + def _invoice_sale_order(self, sale_order, date=None): + old_invoices = sale_order.invoice_ids + wizard = self.advance_inv_model.create({"advance_payment_method": "delivered"}) + wizard.with_context( + { + "active_model": "sale.order", + "active_ids": [sale_order.id], + "active_id": sale_order.id, + } + ).create_invoices() + invoice = sale_order.invoice_ids - old_invoices + invoice.flush() + return invoice + + def _settle_agent(self, agent=None, period=None, date=None, date_payment_to=None): + vals = { + "date_to": ( + fields.Datetime.from_string(fields.Datetime.now()) + + relativedelta(months=period) + ) + if period + else date, + "date_payment_to": date_payment_to, + } + if agent: + vals["agent_ids"] = [(4, agent.id)] + wizard = self.make_settle_model.create(vals) + wizard.action_settle() + + def register_payment( + self, + invoice, + payment_date, + amount=None, + payment_difference_handling="reconcile", + ): + payment_model = self.env["account.payment.register"] + invoice.action_post() + if not amount: + amount = invoice.amount_total + ctx = { + "active_model": "account.move", + "active_ids": [invoice.id], + } + return ( + payment_model.with_context(ctx) + .create( + { + "payment_date": payment_date, + "amount": amount, + "journal_id": self.env["account.journal"] + .search([("type", "=", "bank")], limit=1) + .id, + "payment_method_id": self.env.ref( + "account.account_payment_method_manual_out" + ).id, + "payment_difference_handling": payment_difference_handling, + } + ) + .action_create_payments() + ) + + def test_partial_payment_amount_settlement(self): + sale_order = self._create_multi_line_sale_order( + self.agent_monthly, self.partial_commission_net_paid + ) + sale_order.action_confirm() + date = fields.Date.today() + invoice = self._invoice_sale_order(sale_order) + partial_amount = invoice.amount_total / 3 + self.register_payment( + invoice, + date + relativedelta(days=-2), + amount=partial_amount, + payment_difference_handling="open", + ) + self.assertTrue(invoice._get_reconciled_invoices_partials()) + self._settle_agent(self.agent_monthly, 1, date_payment_to=datetime.now()) + settlements = self.env["sale.commission.settlement"].search( + [ + ( + "agent_id", + "=", + self.agent_monthly.id, + ), + ("state", "=", "settled"), + ] + ) + self.assertEqual(1, len(settlements)) + self.assertEqual(2, len(settlements.line_ids)) + self.assertEqual(2, len(invoice.line_ids.agent_ids)) + + def test_skip_partial_future_payment(self): + sale_order = self._create_multi_line_sale_order( + self.agent_monthly, self.partial_commission_net_paid + ) + sale_order.action_confirm() + date = fields.Date.today() + invoice = self._invoice_sale_order(sale_order) + self.register_payment( + invoice, + date + relativedelta(days=2), + ) + self._settle_agent(self.agent_monthly, 1, date_payment_to=datetime.now()) + settlements = self.env["sale.commission.settlement"].search( + [ + ( + "agent_id", + "=", + self.agent_monthly.id, + ), + ("state", "=", "settled"), + ] + ) + self.assertEqual(0, len(settlements)) + + def test_multi_agents_settlement(self): + agent_net = self.agent_biweekly + commission_net = self.commission_net_invoice + agent_partial = self.agent_monthly + commission_partial = self.partial_commission_net_paid + sale_order = self._create_multi_line_sale_order(agent_net, commission_net) + sale_order.action_confirm() + invoice = self._invoice_sale_order(sale_order) + invoice.action_post() + sale_order2 = self._create_multi_line_sale_order( + agent_partial, commission_partial + ) + sale_order2.action_confirm() + invoice2 = self._invoice_sale_order(sale_order2) + self.register_payment( + invoice2, + fields.Date.today() + relativedelta(days=-2), + ) + self._settle_agent(period=1) + settlements = self.settle_model.search( + [("agent_id", "in", [agent_net.id, agent_partial.id])] + ) + self.assertEqual(len(settlements), 2) diff --git a/sale_commission_partial_settlement/views/sale_commission_view.xml b/sale_commission_partial_settlement/views/sale_commission_view.xml new file mode 100644 index 000000000..b82c7b9d1 --- /dev/null +++ b/sale_commission_partial_settlement/views/sale_commission_view.xml @@ -0,0 +1,16 @@ + + + + sale.commission.payment.amount.form + sale.commission + + + + + + + + diff --git a/sale_commission_partial_settlement/wizard/__init__.py b/sale_commission_partial_settlement/wizard/__init__.py new file mode 100644 index 000000000..4cea8c746 --- /dev/null +++ b/sale_commission_partial_settlement/wizard/__init__.py @@ -0,0 +1 @@ +from . import wizard_settle diff --git a/sale_commission_partial_settlement/wizard/wizard_settle.py b/sale_commission_partial_settlement/wizard/wizard_settle.py new file mode 100644 index 000000000..5c271e5e1 --- /dev/null +++ b/sale_commission_partial_settlement/wizard/wizard_settle.py @@ -0,0 +1,100 @@ +# Copyright 2023 Nextev +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). +from datetime import date + +from dateutil.relativedelta import relativedelta + +from odoo import _, models + + +class SaleCommissionMakeSettle(models.TransientModel): + _inherit = "sale.commission.make.settle" + + def action_settle(self): + partial_res = self.action_settle_partial() + res = super().action_settle() + if partial_res and res: + partial_res["domain"][0][2] += res["domain"][0][2] + return partial_res + return res if res else partial_res + + def action_settle_partial(self): + self.ensure_one() + settlement_obj = self.env["sale.commission.settlement"] + settlement_line_obj = self.env["sale.commission.settlement.line"] + settlement_ids = [] + + if self.agent_ids: + agents = self.agent_ids + else: + agents = self.env["res.partner"].search([("agent", "=", True)]) + date_to = self.date_to + for agent in agents: + date_to_agent = self._get_period_start(agent, date_to) + main_agent_line = self.get_partial_agent_lines(agent, date_to_agent) + ( + partial_agent_lines, + agent_lines_to_update, + ) = main_agent_line._partial_commissions(self.date_payment_to) + for line_id in agent_lines_to_update: + self.env["account.invoice.line.agent"].browse(line_id).update( + agent_lines_to_update[line_id] + ) + for company in partial_agent_lines.mapped( + "invoice_line_agent_id.company_id" + ): + agent_lines_company = partial_agent_lines.filtered( + lambda r: r.invoice_line_agent_id.object_id.company_id == company + ) + sett_to = date.min + for line in agent_lines_company: + if line.invoice_line_agent_id.invoice_date > sett_to: + sett_from = self._get_period_start( + agent, line.invoice_line_agent_id.invoice_date + ) + sett_to = self._get_next_period_date( + agent, + sett_from, + ) - relativedelta(days=1) + settlement = self._get_settlement( + agent, company, sett_from, sett_to + ) + if not settlement: + settlement = settlement_obj.create( + self._prepare_settlement_vals( + agent, company, sett_from, sett_to + ) + ) + settlement_ids.append(settlement.id) + settlement_line_obj.create( + { + "settlement_id": settlement.id, + "agent_line_partial_ids": [(6, 0, [line.id])], + "agent_line": [(6, 0, [line.invoice_line_agent_id.id])], + } + ) + if len(settlement_ids): + return { + "name": _("Created Settlements"), + "type": "ir.actions.act_window", + "view_type": "form", + "view_mode": "tree,form", + "res_model": "sale.commission.settlement", + "domain": [["id", "in", settlement_ids]], + } + + def _get_agent_lines(self, agent, date_to_agent): + aila = super()._get_agent_lines(agent, date_to_agent) + return aila.filtered(lambda x: x.commission_id.payment_amount_type != "paid") + + def get_partial_agent_lines(self, agent, date_to_agent): + main_agent_line = self.env["account.invoice.line.agent"].search( + [ + ("invoice_date", "<", date_to_agent), + ("agent_id", "=", agent.id), + ("settled", "=", False), + ("commission_id.payment_amount_type", "=", "paid"), + ], + order="invoice_date", + ) + return main_agent_line From 04722e83df804bb1d4af9b480b4e2c9be064e614 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Wed, 13 Dec 2023 11:26:04 +0000 Subject: [PATCH 02/12] [UPD] Update sale_commission_partial_settlement.pot --- .../sale_commission_partial_settlement.pot | 160 ++++++++++++++++++ 1 file changed, 160 insertions(+) create mode 100644 sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot diff --git a/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot b/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot new file mode 100644 index 000000000..f0c1cd2ab --- /dev/null +++ b/sale_commission_partial_settlement/i18n/sale_commission_partial_settlement.pot @@ -0,0 +1,160 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_partial_settlement +# +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_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line +msgid "Agent Line" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids +msgid "Agent Line Partial" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount +msgid "Commission Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission +msgid "Commission in sales" +msgstr "" + +#. module: sale_commission_partial_settlement +#: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 +#, python-format +msgid "Created Settlements" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_uid +msgid "Created by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_date +msgid "Created on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__currency_id +msgid "Currency" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full +msgid "Full amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id +msgid "Invoice Line Agent" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_date +msgid "Last Updated on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line +msgid "Line of a commission settlement" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid +msgid "Paid amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__partial_settled +msgid "Partial Commission Amount Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__partial_commission_settled +msgid "Partial Commission Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile +msgid "Partial Reconcile" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial +msgid "Partial agent commissions" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type +msgid "Payment amount type" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__settled +msgid "Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount +msgid "Settled Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle +msgid "Wizard for settling commissions in invoices" +msgstr "" From 1688f609a3d24c16f5e8f55331bf263989a7621c Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Wed, 13 Dec 2023 12:34:35 +0000 Subject: [PATCH 03/12] Added translation using Weblate (Spanish) --- sale_commission_partial_settlement/i18n/es.po | 161 ++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 sale_commission_partial_settlement/i18n/es.po diff --git a/sale_commission_partial_settlement/i18n/es.po b/sale_commission_partial_settlement/i18n/es.po new file mode 100644 index 000000000..0c6f0b389 --- /dev/null +++ b/sale_commission_partial_settlement/i18n/es.po @@ -0,0 +1,161 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_partial_settlement +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es\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" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line +msgid "Agent Line" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids +msgid "Agent Line Partial" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount +msgid "Commission Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission +msgid "Commission in sales" +msgstr "" + +#. module: sale_commission_partial_settlement +#: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 +#, python-format +msgid "Created Settlements" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_uid +msgid "Created by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_date +msgid "Created on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__currency_id +msgid "Currency" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full +msgid "Full amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id +msgid "Invoice Line Agent" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_date +msgid "Last Updated on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line +msgid "Line of a commission settlement" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid +msgid "Paid amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__partial_settled +msgid "Partial Commission Amount Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__partial_commission_settled +msgid "Partial Commission Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile +msgid "Partial Reconcile" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial +msgid "Partial agent commissions" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type +msgid "Payment amount type" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__settled +msgid "Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount +msgid "Settled Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle +msgid "Wizard for settling commissions in invoices" +msgstr "" From 5eed4cbf76ed3d525a8198cd482f879d01258228 Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Wed, 13 Dec 2023 12:34:54 +0000 Subject: [PATCH 04/12] Translated using Weblate (Spanish) Currently translated at 11.5% (3 of 26 strings) Translation: commission-14.0/commission-14.0-sale_commission_partial_settlement Translate-URL: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_partial_settlement/es/ --- sale_commission_partial_settlement/i18n/es.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sale_commission_partial_settlement/i18n/es.po b/sale_commission_partial_settlement/i18n/es.po index 0c6f0b389..43b5dc5c2 100644 --- a/sale_commission_partial_settlement/i18n/es.po +++ b/sale_commission_partial_settlement/i18n/es.po @@ -6,28 +6,30 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-12-13 12:35+0000\n" +"Last-Translator: Ivorra78 \n" "Language-Team: none\n" "Language: es\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_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line msgid "Agent Line" -msgstr "" +msgstr "Línea de Agente" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids msgid "Agent Line Partial" -msgstr "" +msgstr "Agente Línea Parcial" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent msgid "Agent detail of commission line in invoice lines" -msgstr "" +msgstr "Detalle de agente de línea de comisión en líneas de pedido" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount From 686fddce688023064f3c629db477aa481b4aaaee Mon Sep 17 00:00:00 2001 From: Ivorra78 Date: Wed, 13 Dec 2023 12:35:48 +0000 Subject: [PATCH 05/12] Translated using Weblate (Spanish) Currently translated at 100.0% (26 of 26 strings) Translation: commission-14.0/commission-14.0-sale_commission_partial_settlement Translate-URL: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_partial_settlement/es/ --- sale_commission_partial_settlement/i18n/es.po | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sale_commission_partial_settlement/i18n/es.po b/sale_commission_partial_settlement/i18n/es.po index 43b5dc5c2..d260ab6af 100644 --- a/sale_commission_partial_settlement/i18n/es.po +++ b/sale_commission_partial_settlement/i18n/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-12-13 12:35+0000\n" +"PO-Revision-Date: 2023-12-13 15:35+0000\n" "Last-Translator: Ivorra78 \n" "Language-Team: none\n" "Language: es\n" @@ -34,33 +34,33 @@ msgstr "Detalle de agente de línea de comisión en líneas de pedido" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount msgid "Commission Amount" -msgstr "" +msgstr "Importe de la Comisión" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission msgid "Commission in sales" -msgstr "" +msgstr "Comisión en ventas" #. module: sale_commission_partial_settlement #: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 #, python-format msgid "Created Settlements" -msgstr "" +msgstr "Liquidaciones Creadas" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_uid msgid "Created by" -msgstr "" +msgstr "Creado por" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_date msgid "Created on" -msgstr "" +msgstr "Creado el" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__currency_id msgid "Currency" -msgstr "" +msgstr "Divisa" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name @@ -70,12 +70,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name msgid "Display Name" -msgstr "" +msgstr "Nombre a Mostrar" #. module: sale_commission_partial_settlement #: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full msgid "Full amount" -msgstr "" +msgstr "Importe total" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id @@ -85,12 +85,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id msgid "Invoice Line Agent" -msgstr "" +msgstr "Agente de Línea de Facturación" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update @@ -100,64 +100,64 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update msgid "Last Modified on" -msgstr "" +msgstr "Última Modificación el" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Última Actualización por" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_date msgid "Last Updated on" -msgstr "" +msgstr "Última Actualización el" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line msgid "Line of a commission settlement" -msgstr "" +msgstr "Línea de liquidación de comisión" #. module: sale_commission_partial_settlement #: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid msgid "Paid amount" -msgstr "" +msgstr "Importe pagado" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__partial_settled msgid "Partial Commission Amount Settled" -msgstr "" +msgstr "Comisión Parcial Importe liquidado" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__partial_commission_settled msgid "Partial Commission Settled" -msgstr "" +msgstr "Comisión Parcial Liquidada" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile msgid "Partial Reconcile" -msgstr "" +msgstr "Conciliación Parcial" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial msgid "Partial agent commissions" -msgstr "" +msgstr "Comisiones parciales de agente" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type msgid "Payment amount type" -msgstr "" +msgstr "Tipo de importe del pago" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__settled msgid "Settled" -msgstr "" +msgstr "Liquidado" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount msgid "Settled Amount" -msgstr "" +msgstr "Importe Liquidado" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle msgid "Wizard for settling commissions in invoices" -msgstr "" +msgstr "Asistente para liquidar comisiones en facturas" From 6991d40a82a6cc34bddca18f541063f315247470 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 14 Dec 2023 09:08:09 +0000 Subject: [PATCH 06/12] Added translation using Weblate (Italian) --- sale_commission_partial_settlement/i18n/it.po | 161 ++++++++++++++++++ 1 file changed, 161 insertions(+) create mode 100644 sale_commission_partial_settlement/i18n/it.po diff --git a/sale_commission_partial_settlement/i18n/it.po b/sale_commission_partial_settlement/i18n/it.po new file mode 100644 index 000000000..6709db463 --- /dev/null +++ b/sale_commission_partial_settlement/i18n/it.po @@ -0,0 +1,161 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_partial_settlement +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\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" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line +msgid "Agent Line" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids +msgid "Agent Line Partial" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount +msgid "Commission Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission +msgid "Commission in sales" +msgstr "" + +#. module: sale_commission_partial_settlement +#: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 +#, python-format +msgid "Created Settlements" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_uid +msgid "Created by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_date +msgid "Created on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__currency_id +msgid "Currency" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full +msgid "Full amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id +msgid "Invoice Line Agent" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_uid +msgid "Last Updated by" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_date +msgid "Last Updated on" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line +msgid "Line of a commission settlement" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid +msgid "Paid amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__partial_settled +msgid "Partial Commission Amount Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__partial_commission_settled +msgid "Partial Commission Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile +msgid "Partial Reconcile" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial +msgid "Partial agent commissions" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type +msgid "Payment amount type" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__settled +msgid "Settled" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount +msgid "Settled Amount" +msgstr "" + +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle +msgid "Wizard for settling commissions in invoices" +msgstr "" From 08e15d448182e393f7740892cf9a91c707c4bb08 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 14 Dec 2023 09:08:31 +0000 Subject: [PATCH 07/12] Translated using Weblate (Italian) Currently translated at 100.0% (26 of 26 strings) Translation: commission-14.0/commission-14.0-sale_commission_partial_settlement Translate-URL: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_partial_settlement/it/ --- sale_commission_partial_settlement/i18n/it.po | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/sale_commission_partial_settlement/i18n/it.po b/sale_commission_partial_settlement/i18n/it.po index 6709db463..0e2641540 100644 --- a/sale_commission_partial_settlement/i18n/it.po +++ b/sale_commission_partial_settlement/i18n/it.po @@ -6,59 +6,61 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-12-14 11:35+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.17\n" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line msgid "Agent Line" -msgstr "" +msgstr "Riga agente" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids msgid "Agent Line Partial" -msgstr "" +msgstr "Riga agente parziale" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent msgid "Agent detail of commission line in invoice lines" -msgstr "" +msgstr "Dettaglio riga provvigione agente nelle righe fattura" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount msgid "Commission Amount" -msgstr "" +msgstr "Importo provvigione" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission msgid "Commission in sales" -msgstr "" +msgstr "Provvigione nelle vendite" #. module: sale_commission_partial_settlement #: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 #, python-format msgid "Created Settlements" -msgstr "" +msgstr "Regolazioni create" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_uid msgid "Created by" -msgstr "" +msgstr "Creato da" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__create_date msgid "Created on" -msgstr "" +msgstr "Creato il" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__currency_id msgid "Currency" -msgstr "" +msgstr "Valuta" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name @@ -68,12 +70,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: sale_commission_partial_settlement #: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full msgid "Full amount" -msgstr "" +msgstr "Importo totale" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id @@ -83,12 +85,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id msgid "Invoice Line Agent" -msgstr "" +msgstr "Riga fattura agente" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update @@ -98,64 +100,64 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_uid msgid "Last Updated by" -msgstr "" +msgstr "Ultimo aggiornamento di" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__write_date msgid "Last Updated on" -msgstr "" +msgstr "Ultimo aggiornamento il" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line msgid "Line of a commission settlement" -msgstr "" +msgstr "Riga di regolazione provvigione" #. module: sale_commission_partial_settlement #: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid msgid "Paid amount" -msgstr "" +msgstr "Importo pagato" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__partial_settled msgid "Partial Commission Amount Settled" -msgstr "" +msgstr "Importo parziale provvigione regolata" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__partial_commission_settled msgid "Partial Commission Settled" -msgstr "" +msgstr "Provvigione parziale regolata" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile msgid "Partial Reconcile" -msgstr "" +msgstr "Riconciliazione parziale" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial msgid "Partial agent commissions" -msgstr "" +msgstr "Provvigioni parziali agente" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type msgid "Payment amount type" -msgstr "" +msgstr "Tipo importo pagamento" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__settled msgid "Settled" -msgstr "" +msgstr "Regolata" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount msgid "Settled Amount" -msgstr "" +msgstr "Importo regolato" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle msgid "Wizard for settling commissions in invoices" -msgstr "" +msgstr "Procedura per regolare le provvigioni nelle fatture" From 3ab51e81d9a2ae0d0f1ad6f0cc93e2fb0c6ba104 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Thu, 25 Jul 2024 14:35:59 +0200 Subject: [PATCH 08/12] [FIX] sale_commission_partial_settlement: reset agent partial If the invoice line agent does not have any settlement --- .../migrations/14.0.1.0.1/post-migrate.py | 11 +++++++++++ .../models/account_move.py | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py diff --git a/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py b/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py new file mode 100644 index 000000000..626eae3f9 --- /dev/null +++ b/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py @@ -0,0 +1,11 @@ +from openupgradelib import openupgrade + + +@openupgrade.migrate() +def migrate(env, version): + env["account.invoice.line.agent"].search( + [ + ("settled", "=", True), + ("commission_id.payment_amount_type", "=", "paid"), + ] + )._compute_settled() diff --git a/sale_commission_partial_settlement/models/account_move.py b/sale_commission_partial_settlement/models/account_move.py index 4ba56f54c..a402c5ed3 100644 --- a/sale_commission_partial_settlement/models/account_move.py +++ b/sale_commission_partial_settlement/models/account_move.py @@ -13,6 +13,10 @@ def _compute_settled(self): filtered_lines = self.filtered( lambda x: x.commission_id.payment_amount_type != "paid" ) + for line in self - filtered_lines: + if not line.mapped("agent_line.settlement_id"): + line.settled = False + super(AccountInvoiceLineAgent, filtered_lines)._compute_settled() def _partial_commissions(self, date_payment_to): From b2551df09c45045fbb00e8f4af2d9116eb962cc7 Mon Sep 17 00:00:00 2001 From: Alessio Renda Date: Fri, 26 Jul 2024 08:52:51 +0200 Subject: [PATCH 09/12] [IMP] sale_commission_partial_settlement: add maintainers --- sale_commission_partial_settlement/README.rst | 14 ++++++++++++++ sale_commission_partial_settlement/__manifest__.py | 3 ++- .../static/description/index.html | 14 +++++++++----- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/sale_commission_partial_settlement/README.rst b/sale_commission_partial_settlement/README.rst index c6fc54a25..0602d5cf2 100644 --- a/sale_commission_partial_settlement/README.rst +++ b/sale_commission_partial_settlement/README.rst @@ -91,6 +91,20 @@ 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-aleuffre| image:: https://github.com/aleuffre.png?size=40px + :target: https://github.com/aleuffre + :alt: aleuffre +.. |maintainer-renda-dev| image:: https://github.com/renda-dev.png?size=40px + :target: https://github.com/renda-dev + :alt: renda-dev +.. |maintainer-PicchiSeba| image:: https://github.com/PicchiSeba.png?size=40px + :target: https://github.com/PicchiSeba + :alt: PicchiSeba + +Current `maintainers `__: + +|maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba| + 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_partial_settlement/__manifest__.py b/sale_commission_partial_settlement/__manifest__.py index 0ba779b5e..1b98f3e68 100644 --- a/sale_commission_partial_settlement/__manifest__.py +++ b/sale_commission_partial_settlement/__manifest__.py @@ -1,8 +1,9 @@ # Copyright 2023 Nextev { "name": "Sales commissions based on paid amount", - "version": "14.0.1.0.0", + "version": "14.0.1.0.1", "author": "Nextev Srl," "Ooops," "Odoo Community Association (OCA)", + "maintainers": ["aleuffre", "renda-dev", "PicchiSeba"], "category": "Sales Management", "license": "AGPL-3", "depends": ["sale_commission"], diff --git a/sale_commission_partial_settlement/static/description/index.html b/sale_commission_partial_settlement/static/description/index.html index 7f9acbee0..46a622486 100644 --- a/sale_commission_partial_settlement/static/description/index.html +++ b/sale_commission_partial_settlement/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -439,10 +439,14 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +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 maintainers:

+

aleuffre renda-dev PicchiSeba

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.

From b4d87c8950a0f02cf55103c226980d83c56a38f9 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Mon, 29 Jul 2024 09:21:56 +0000 Subject: [PATCH 10/12] [BOT] post-merge updates --- sale_commission_partial_settlement/README.rst | 2 +- .../static/description/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sale_commission_partial_settlement/README.rst b/sale_commission_partial_settlement/README.rst index 0602d5cf2..984415fd0 100644 --- a/sale_commission_partial_settlement/README.rst +++ b/sale_commission_partial_settlement/README.rst @@ -7,7 +7,7 @@ Sales commissions based on paid amount !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - !! source digest: sha256:2a9857c3cff391b9ed98fd4916c0b50b68872332e34bf4937b6d3705dbf2510d + !! source digest: sha256:72b8b9ff4225524c4105f059588ec2038649d39259909c6d43d8e7c4b62b06a2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png diff --git a/sale_commission_partial_settlement/static/description/index.html b/sale_commission_partial_settlement/static/description/index.html index 46a622486..6bf4cbe3b 100644 --- a/sale_commission_partial_settlement/static/description/index.html +++ b/sale_commission_partial_settlement/static/description/index.html @@ -367,7 +367,7 @@

Sales commissions based on paid amount

!! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! source digest: sha256:2a9857c3cff391b9ed98fd4916c0b50b68872332e34bf4937b6d3705dbf2510d +!! source digest: sha256:72b8b9ff4225524c4105f059588ec2038649d39259909c6d43d8e7c4b62b06a2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->

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

This module allows to settle commissions based on paid amount.

From 0bb7f3ed63d7477ae465ca027b8f3a19c5ffe4b1 Mon Sep 17 00:00:00 2001 From: David Alonso Date: Wed, 11 Sep 2024 15:27:54 +0200 Subject: [PATCH 11/12] [IMP] sale_commission_partial_settlement: pre-commit stuff --- .../odoo/addons/sale_commission_partial_settlement | 1 + setup/sale_commission_partial_settlement/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/sale_commission_partial_settlement/odoo/addons/sale_commission_partial_settlement create mode 100644 setup/sale_commission_partial_settlement/setup.py diff --git a/setup/sale_commission_partial_settlement/odoo/addons/sale_commission_partial_settlement b/setup/sale_commission_partial_settlement/odoo/addons/sale_commission_partial_settlement new file mode 120000 index 000000000..952293879 --- /dev/null +++ b/setup/sale_commission_partial_settlement/odoo/addons/sale_commission_partial_settlement @@ -0,0 +1 @@ +../../../../sale_commission_partial_settlement \ No newline at end of file diff --git a/setup/sale_commission_partial_settlement/setup.py b/setup/sale_commission_partial_settlement/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_commission_partial_settlement/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 3ae386148653fc4f60615a2e413691d556ef3afc Mon Sep 17 00:00:00 2001 From: David Alonso Date: Wed, 11 Sep 2024 20:01:21 +0200 Subject: [PATCH 12/12] [MIG] sale_commission_partial_settlement: Migration to 16.0 --- sale_commission_partial_settlement/README.rst | 10 +- .../__manifest__.py | 4 +- sale_commission_partial_settlement/i18n/es.po | 69 +++--- .../migrations/14.0.1.0.1/post-migrate.py | 11 - .../models/__init__.py | 7 +- ..._move.py => account_invoice_line_agent.py} | 45 +--- .../account_invoice_line_agent_partial.py | 22 ++ .../{sale_commission.py => commission.py} | 4 +- ...ement.py => commission_settlement_line.py} | 6 +- .../static/description/index.html | 17 +- .../tests/common.py | 183 +++++++++++++++ .../tests/test_partial_settlement.py | 208 +----------------- ...ommission_view.xml => commission_view.xml} | 8 +- .../wizard/__init__.py | 2 +- ...rd_settle.py => commission_make_settle.py} | 29 ++- .../models/sale.py | 2 +- 16 files changed, 294 insertions(+), 333 deletions(-) delete mode 100644 sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py rename sale_commission_partial_settlement/models/{account_move.py => account_invoice_line_agent.py} (71%) create mode 100644 sale_commission_partial_settlement/models/account_invoice_line_agent_partial.py rename sale_commission_partial_settlement/models/{sale_commission.py => commission.py} (81%) rename sale_commission_partial_settlement/models/{settlement.py => commission_settlement_line.py} (81%) create mode 100644 sale_commission_partial_settlement/tests/common.py rename sale_commission_partial_settlement/views/{sale_commission_view.xml => commission_view.xml} (56%) rename sale_commission_partial_settlement/wizard/{wizard_settle.py => commission_make_settle.py} (79%) diff --git a/sale_commission_partial_settlement/README.rst b/sale_commission_partial_settlement/README.rst index 984415fd0..4cd76a036 100644 --- a/sale_commission_partial_settlement/README.rst +++ b/sale_commission_partial_settlement/README.rst @@ -17,13 +17,13 @@ Sales commissions based on paid amount :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/14.0/sale_commission_partial_settlement + :target: https://github.com/OCA/commission/tree/16.0/sale_commission_partial_settlement :alt: OCA/commission .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_partial_settlement + :target: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-sale_commission_partial_settlement :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=14.0 + :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=16.0 :alt: Try me on Runboat |badge1| |badge2| |badge3| |badge4| |badge5| @@ -50,7 +50,7 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. If you spotted it first, help us to smash it by providing a detailed and welcomed -`feedback `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -105,6 +105,6 @@ Current `maintainers `__: |maintainer-aleuffre| |maintainer-renda-dev| |maintainer-PicchiSeba| -This module is part of the `OCA/commission `_ project on GitHub. +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_partial_settlement/__manifest__.py b/sale_commission_partial_settlement/__manifest__.py index 1b98f3e68..019f8ea1e 100644 --- a/sale_commission_partial_settlement/__manifest__.py +++ b/sale_commission_partial_settlement/__manifest__.py @@ -1,7 +1,7 @@ # Copyright 2023 Nextev { "name": "Sales commissions based on paid amount", - "version": "14.0.1.0.1", + "version": "16.0.1.0.0", "author": "Nextev Srl," "Ooops," "Odoo Community Association (OCA)", "maintainers": ["aleuffre", "renda-dev", "PicchiSeba"], "category": "Sales Management", @@ -10,7 +10,7 @@ "website": "https://github.com/OCA/commission", "data": [ "security/ir.model.access.csv", - "views/sale_commission_view.xml", + "views/commission_view.xml", ], "installable": True, } diff --git a/sale_commission_partial_settlement/i18n/es.po b/sale_commission_partial_settlement/i18n/es.po index d260ab6af..f97d4bd96 100644 --- a/sale_commission_partial_settlement/i18n/es.po +++ b/sale_commission_partial_settlement/i18n/es.po @@ -4,17 +4,16 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 14.0\n" +"Project-Id-Version: Odoo Server 16.0\n" "Report-Msgid-Bugs-To: \n" -"PO-Revision-Date: 2023-12-13 15:35+0000\n" -"Last-Translator: Ivorra78 \n" -"Language-Team: none\n" -"Language: es\n" +"POT-Creation-Date: 2024-09-13 07:50+0000\n" +"PO-Revision-Date: 2024-09-13 07:50+0000\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: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.17\n" +"Plural-Forms: \n" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__agent_line @@ -22,27 +21,28 @@ msgid "Agent Line" msgstr "Línea de Agente" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__agent_line_partial_ids +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_commission_settlement_line__agent_line_partial_ids msgid "Agent Line Partial" -msgstr "Agente Línea Parcial" +msgstr "Línea de Agente Parcial" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent msgid "Agent detail of commission line in invoice lines" msgstr "Detalle de agente de línea de comisión en líneas de pedido" +#. module: sale_commission_partial_settlement +#: model:ir.model,name:sale_commission_partial_settlement.model_commission +msgid "Commission" +msgstr "Comisión" + #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__amount msgid "Commission Amount" msgstr "Importe de la Comisión" #. module: sale_commission_partial_settlement -#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission -msgid "Commission in sales" -msgstr "Comisión en ventas" - -#. module: sale_commission_partial_settlement -#: code:addons/sale_commission_partial_settlement/wizard/wizard_settle.py:0 +#. odoo-python +#: code:addons/sale_commission_partial_settlement/wizard/commission_make_settle.py:0 #, python-format msgid "Created Settlements" msgstr "Liquidaciones Creadas" @@ -63,29 +63,19 @@ msgid "Currency" msgstr "Divisa" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__display_name #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__display_name -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__display_name -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__display_name -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__display_name -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__display_name msgid "Display Name" msgstr "Nombre a Mostrar" #. module: sale_commission_partial_settlement -#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__full +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__commission__payment_amount_type__full msgid "Full amount" msgstr "Importe total" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent__id #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__id -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile__id -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__id -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle__id -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__id msgid "ID" -msgstr "ID" +msgstr "" #. module: sale_commission_partial_settlement #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial__invoice_line_agent_id @@ -93,12 +83,7 @@ msgid "Invoice Line Agent" msgstr "Agente de Línea de Facturación" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent____last_update #: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_invoice_line_agent_partial____last_update -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_account_partial_reconcile____last_update -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission____last_update -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_make_settle____last_update -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line____last_update msgid "Last Modified on" msgstr "Última Modificación el" @@ -113,12 +98,12 @@ msgid "Last Updated on" msgstr "Última Actualización el" #. module: sale_commission_partial_settlement -#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_settlement_line +#: model:ir.model,name:sale_commission_partial_settlement.model_commission_settlement_line msgid "Line of a commission settlement" -msgstr "Línea de liquidación de comisión" +msgstr "Línea de liquidación de una comisión" #. module: sale_commission_partial_settlement -#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__sale_commission__payment_amount_type__paid +#: model:ir.model.fields.selection,name:sale_commission_partial_settlement.selection__commission__payment_amount_type__paid msgid "Paid amount" msgstr "Importe pagado" @@ -135,7 +120,7 @@ msgstr "Comisión Parcial Liquidada" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_partial_reconcile msgid "Partial Reconcile" -msgstr "Conciliación Parcial" +msgstr "Conciliación parcial" #. module: sale_commission_partial_settlement #: model:ir.model,name:sale_commission_partial_settlement.model_account_invoice_line_agent_partial @@ -143,7 +128,7 @@ msgid "Partial agent commissions" msgstr "Comisiones parciales de agente" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission__payment_amount_type +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_commission__payment_amount_type msgid "Payment amount type" msgstr "Tipo de importe del pago" @@ -153,11 +138,11 @@ msgid "Settled" msgstr "Liquidado" #. module: sale_commission_partial_settlement -#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_sale_commission_settlement_line__settled_amount +#: model:ir.model.fields,field_description:sale_commission_partial_settlement.field_commission_settlement_line__settled_amount msgid "Settled Amount" -msgstr "Importe Liquidado" +msgstr "Cantidad Liquidada" #. module: sale_commission_partial_settlement -#: model:ir.model,name:sale_commission_partial_settlement.model_sale_commission_make_settle -msgid "Wizard for settling commissions in invoices" -msgstr "Asistente para liquidar comisiones en facturas" +#: model:ir.model,name:sale_commission_partial_settlement.model_commission_make_settle +msgid "Wizard for settling commissions" +msgstr "Asistente para liquidación de comisiones" \ No newline at end of file diff --git a/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py b/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py deleted file mode 100644 index 626eae3f9..000000000 --- a/sale_commission_partial_settlement/migrations/14.0.1.0.1/post-migrate.py +++ /dev/null @@ -1,11 +0,0 @@ -from openupgradelib import openupgrade - - -@openupgrade.migrate() -def migrate(env, version): - env["account.invoice.line.agent"].search( - [ - ("settled", "=", True), - ("commission_id.payment_amount_type", "=", "paid"), - ] - )._compute_settled() diff --git a/sale_commission_partial_settlement/models/__init__.py b/sale_commission_partial_settlement/models/__init__.py index 4e17db438..d98e158fb 100644 --- a/sale_commission_partial_settlement/models/__init__.py +++ b/sale_commission_partial_settlement/models/__init__.py @@ -1,4 +1,5 @@ -from . import sale_commission -from . import account_move +from . import commission +from . import account_invoice_line_agent +from . import account_invoice_line_agent_partial from . import account_partial_reconcile -from . import settlement +from . import commission_settlement_line diff --git a/sale_commission_partial_settlement/models/account_move.py b/sale_commission_partial_settlement/models/account_invoice_line_agent.py similarity index 71% rename from sale_commission_partial_settlement/models/account_move.py rename to sale_commission_partial_settlement/models/account_invoice_line_agent.py index a402c5ed3..6f1562eb7 100644 --- a/sale_commission_partial_settlement/models/account_move.py +++ b/sale_commission_partial_settlement/models/account_invoice_line_agent.py @@ -14,10 +14,10 @@ def _compute_settled(self): lambda x: x.commission_id.payment_amount_type != "paid" ) for line in self - filtered_lines: - if not line.mapped("agent_line.settlement_id"): + if not line.settlement_line_ids: line.settled = False - super(AccountInvoiceLineAgent, filtered_lines)._compute_settled() + return super(AccountInvoiceLineAgent, filtered_lines)._compute_settled() def _partial_commissions(self, date_payment_to): """ @@ -33,11 +33,12 @@ def _partial_commissions(self, date_payment_to): lines_to_update = {} for line in self: line_total_amount = line.amount + reconciled_partials, _ = line.invoice_id._get_reconciled_invoices_partials() for ( partial, amount, counterpart_line, - ) in line.invoice_id._get_reconciled_invoices_partials(): + ) in reconciled_partials: if partial.partial_commission_settled: continue elif date_payment_to and date_payment_to < counterpart_line.date: @@ -51,11 +52,7 @@ def _partial_commissions(self, date_payment_to): partial_payment_remaining[partial.id] = {"remaining_amount": amount} if line.object_id.price_total <= payment_amount: partial_lines_to_settle.append( - { - "invoice_line_agent_id": line.id, - "currency_id": line.currency_id.id, - "amount": line_total_amount, - } + self._partial_agent_line_values(line, line_total_amount) ) lines_to_update[line.id] = { "partial_settled": line_total_amount, @@ -71,11 +68,7 @@ def _partial_commissions(self, date_payment_to): line.invoice_id.commission_total * paid_in_proportion ) partial_lines_to_settle.append( - { - "invoice_line_agent_id": line.id, - "currency_id": line.currency_id.id, - "amount": partial_commission, - } + self._partial_agent_line_values(line, partial_commission) ) if line.id in lines_to_update: lines_to_update[line.id]["partial_settled"] += partial_commission @@ -91,23 +84,9 @@ def _partial_commissions(self, date_payment_to): ) return partial_agent_lines, lines_to_update - -class AccountInvoiceLineAgentPartial(models.Model): - _name = "account.invoice.line.agent.partial" - _description = "Partial agent commissions" - - invoice_line_agent_id = fields.Many2one("account.invoice.line.agent", required=True) - agent_line = fields.Many2many( - comodel_name="sale.commission.settlement.line", - relation="settlement_agent_line_partial_rel", - column1="agent_line_partial_id", - column2="settlement_id", - copy=False, - ) - amount = fields.Monetary( - string="Commission Amount", - ) - currency_id = fields.Many2one( - related="invoice_line_agent_id.currency_id", - ) - settled = fields.Boolean() + def _partial_agent_line_values(self, line, amount): + return { + "invoice_line_agent_id": line.id, + "currency_id": line.currency_id.id, + "amount": amount, + } diff --git a/sale_commission_partial_settlement/models/account_invoice_line_agent_partial.py b/sale_commission_partial_settlement/models/account_invoice_line_agent_partial.py new file mode 100644 index 000000000..f6f608dea --- /dev/null +++ b/sale_commission_partial_settlement/models/account_invoice_line_agent_partial.py @@ -0,0 +1,22 @@ +from odoo import fields, models + + +class AccountInvoiceLineAgentPartial(models.Model): + _name = "account.invoice.line.agent.partial" + _description = "Partial agent commissions" + + invoice_line_agent_id = fields.Many2one("account.invoice.line.agent", required=True) + agent_line = fields.Many2many( + comodel_name="commission.settlement.line", + relation="settlement_agent_line_partial_rel", + column1="agent_line_partial_id", + column2="settlement_id", + copy=False, + ) + amount = fields.Monetary( + string="Commission Amount", + ) + currency_id = fields.Many2one( + related="invoice_line_agent_id.currency_id", + ) + settled = fields.Boolean() diff --git a/sale_commission_partial_settlement/models/sale_commission.py b/sale_commission_partial_settlement/models/commission.py similarity index 81% rename from sale_commission_partial_settlement/models/sale_commission.py rename to sale_commission_partial_settlement/models/commission.py index 68f03aea9..dcb090762 100644 --- a/sale_commission_partial_settlement/models/sale_commission.py +++ b/sale_commission_partial_settlement/models/commission.py @@ -3,8 +3,8 @@ from odoo import fields, models -class SaleCommission(models.Model): - _inherit = "sale.commission" +class Commission(models.Model): + _inherit = "commission" payment_amount_type = fields.Selection( [("full", "Full amount"), ("paid", "Paid amount")], diff --git a/sale_commission_partial_settlement/models/settlement.py b/sale_commission_partial_settlement/models/commission_settlement_line.py similarity index 81% rename from sale_commission_partial_settlement/models/settlement.py rename to sale_commission_partial_settlement/models/commission_settlement_line.py index f25ba11e0..63dba3971 100644 --- a/sale_commission_partial_settlement/models/settlement.py +++ b/sale_commission_partial_settlement/models/commission_settlement_line.py @@ -1,8 +1,8 @@ from odoo import api, fields, models -class SettlementLine(models.Model): - _inherit = "sale.commission.settlement.line" +class CommissionSettlementLine(models.Model): + _inherit = "commission.settlement.line" agent_line_partial_ids = fields.Many2many( comodel_name="account.invoice.line.agent.partial", @@ -23,4 +23,4 @@ def _compute_settled_amount(self): if rec.commission_id.payment_amount_type == "paid": rec.settled_amount = rec.agent_line_partial_ids[:1].amount else: - rec.settled_amount = rec.agent_line[:1].amount + rec.settled_amount = rec.invoice_agent_line_id[:1].amount diff --git a/sale_commission_partial_settlement/static/description/index.html b/sale_commission_partial_settlement/static/description/index.html index 6bf4cbe3b..74000c070 100644 --- a/sale_commission_partial_settlement/static/description/index.html +++ b/sale_commission_partial_settlement/static/description/index.html @@ -8,11 +8,10 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ +:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. -Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +274,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: gray; } /* line numbers */ +pre.code .ln { color: grey; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +300,7 @@ span.pre { white-space: pre } -span.problematic, pre.problematic { +span.problematic { color: red } span.section-subtitle { @@ -369,7 +368,7 @@

Sales commissions based on paid amount

!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! source digest: sha256:72b8b9ff4225524c4105f059588ec2038649d39259909c6d43d8e7c4b62b06a2 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

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

+

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

This module allows to settle commissions based on paid amount.

Table of contents

@@ -398,7 +397,7 @@

Bug Tracker

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

+feedback.

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

@@ -439,15 +438,13 @@

Contributors

Maintainers

This module is maintained by the OCA.

- -Odoo Community Association - +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 maintainers:

aleuffre renda-dev PicchiSeba

-

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

+

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_partial_settlement/tests/common.py b/sale_commission_partial_settlement/tests/common.py new file mode 100644 index 000000000..374984a01 --- /dev/null +++ b/sale_commission_partial_settlement/tests/common.py @@ -0,0 +1,183 @@ +from dateutil.relativedelta import relativedelta + +from odoo import fields +from odoo.tests.common import TransactionCase + + +class TestPartialSettlementCommon(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.commission_model = cls.env["commission"] + cls.partial_commission_net_paid = cls.commission_model.create( + { + "name": "20% fixed commission (Net amount) - Payment Based - Partial", + "fix_qty": 20.0, + "invoice_state": "paid", + "amount_base_type": "net_amount", + "payment_amount_type": "paid", + } + ) + cls.company = cls.env.ref("base.main_company") + cls.res_partner_model = cls.env["res.partner"] + cls.partner = cls.env.ref("base.res_partner_2") + cls.partner.write({"agent": False}) + cls.sale_order_model = cls.env["sale.order"] + cls.advance_inv_model = cls.env["sale.advance.payment.inv"] + cls.settle_model = cls.env["commission.settlement"] + cls.make_settle_model = cls.env["commission.make.settle"] + cls.make_inv_model = cls.env["commission.make.invoice"] + cls.product = cls.env.ref("product.product_product_5") + cls.product.list_price = 5 # for testing specific commission section + cls.commission_product = cls.env["product.product"].create( + {"name": "Commission test product", "type": "service"} + ) + cls.product.write({"invoice_policy": "order"}) + cls.journal = cls.env["account.journal"].search( + [("type", "=", "purchase")], limit=1 + ) + cls.agent_monthly = cls.res_partner_model.create( + { + "name": "Test Agent - Monthly", + "agent": True, + "settlement": "monthly", + "lang": "en_US", + "commission_id": cls.partial_commission_net_paid.id, + } + ) + cls.income_account = cls.env["account.account"].search( + [ + ("company_id", "=", cls.company.id), + ("account_type", "=", "income"), + ], + limit=1, + ) + cls.commission_net_invoice = cls.commission_model.create( + { + "name": "10% fixed commission (Net amount) - Invoice Based", + "fix_qty": 10.0, + "amount_base_type": "net_amount", + } + ) + cls.agent_biweekly = cls.res_partner_model.create( + { + "name": "Test Agent - Bi-weekly", + "agent": True, + "settlement": "biweekly", + "lang": "en_US", + "commission_id": cls.commission_net_invoice.id, + } + ) + + def _create_multi_line_sale_order(self, agent, commission): + return self.sale_order_model.create( + { + "partner_id": self.partner.id, + "order_line": [ + ( + 0, + 0, + { + "name": self.product.name, + "product_id": self.product.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": self.product.lst_price, + "agent_ids": [ + ( + 0, + 0, + { + "agent_id": agent.id, + "commission_id": commission.id, + }, + ) + ], + }, + ), + ( + 0, + 0, + { + "name": self.product.name, + "product_id": self.product.id, + "product_uom_qty": 5.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": self.product.lst_price, + "agent_ids": [ + ( + 0, + 0, + { + "agent_id": self.agent_monthly.id, + "commission_id": self.partial_commission_net_paid.id, + }, + ) + ], + }, + ), + ], + } + ) + + def _invoice_sale_order(self, sale_order): + old_invoices = sale_order.invoice_ids + wizard = self.advance_inv_model.create( + {"advance_payment_method": "delivered", "sale_order_ids": [sale_order.id]} + ) + wizard.with_context( + **{ + "active_model": "sale.order", + "active_ids": [sale_order.id], + "active_id": sale_order.id, + } + ).create_invoices() + invoice = sale_order.invoice_ids - old_invoices + return invoice + + def _settle_agent(self, agent=None, period=None, date=None): + vals = { + "date_to": ( + ( + fields.Datetime.from_string(fields.Datetime.now()) + + relativedelta(months=period) + ) + if period + else date + ), + "settlement_type": "sale_invoice", + } + if agent: + vals["agent_ids"] = [(4, agent.id)] + wizard = self.make_settle_model.create(vals) + wizard.action_settle() + + def register_payment( + self, + invoice, + payment_date, + amount=None, + payment_difference_handling="reconcile", + ): + payment_model = self.env["account.payment.register"] + invoice.action_post() + if not amount: + amount = invoice.amount_total + ctx = { + "active_model": "account.move", + "active_ids": [invoice.id], + } + return ( + payment_model.with_context(**ctx) + .create( + { + "payment_date": payment_date, + "amount": amount, + "journal_id": self.env["account.journal"] + .search([("type", "=", "bank")], limit=1) + .id, + "payment_difference_handling": payment_difference_handling, + } + ) + .action_create_payments() + ) diff --git a/sale_commission_partial_settlement/tests/test_partial_settlement.py b/sale_commission_partial_settlement/tests/test_partial_settlement.py index 66ba38ea4..54fa1448b 100644 --- a/sale_commission_partial_settlement/tests/test_partial_settlement.py +++ b/sale_commission_partial_settlement/tests/test_partial_settlement.py @@ -6,187 +6,11 @@ from dateutil.relativedelta import relativedelta from odoo import fields -from odoo.tests.common import SavepointCase +from .common import TestPartialSettlementCommon -class TestPartialSettlement(SavepointCase): - @classmethod - def setUpClass(cls): - super().setUpClass() - cls.commission_model = cls.env["sale.commission"] - cls.partial_commission_net_paid = cls.commission_model.create( - { - "name": "20% fixed commission (Net amount) - Payment Based - Partial", - "fix_qty": 20.0, - "invoice_state": "paid", - "amount_base_type": "net_amount", - "payment_amount_type": "paid", - } - ) - cls.company = cls.env.ref("base.main_company") - cls.res_partner_model = cls.env["res.partner"] - cls.partner = cls.env.ref("base.res_partner_2") - cls.partner.write({"agent": False}) - cls.sale_order_model = cls.env["sale.order"] - cls.advance_inv_model = cls.env["sale.advance.payment.inv"] - cls.settle_model = cls.env["sale.commission.settlement"] - cls.make_settle_model = cls.env["sale.commission.make.settle"] - cls.make_inv_model = cls.env["sale.commission.make.invoice"] - cls.product = cls.env.ref("product.product_product_5") - cls.product.list_price = 5 # for testing specific commission section - cls.commission_product = cls.env["product.product"].create( - {"name": "Commission test product", "type": "service"} - ) - cls.product.write({"invoice_policy": "order"}) - cls.journal = cls.env["account.journal"].search( - [("type", "=", "purchase")], limit=1 - ) - cls.agent_monthly = cls.res_partner_model.create( - { - "name": "Test Agent - Monthly", - "agent": True, - "settlement": "monthly", - "lang": "en_US", - "commission_id": cls.partial_commission_net_paid.id, - } - ) - cls.income_account = cls.env["account.account"].search( - [ - ("company_id", "=", cls.company.id), - ("user_type_id.name", "=", "Income"), - ], - limit=1, - ) - cls.commission_net_invoice = cls.commission_model.create( - { - "name": "10% fixed commission (Net amount) - Invoice Based", - "fix_qty": 10.0, - "amount_base_type": "net_amount", - } - ) - cls.agent_biweekly = cls.res_partner_model.create( - { - "name": "Test Agent - Bi-weekly", - "agent": True, - "settlement": "biweekly", - "lang": "en_US", - "commission_id": cls.commission_net_invoice.id, - } - ) - - def _create_multi_line_sale_order(self, agent, commission): - return self.sale_order_model.create( - { - "partner_id": self.partner.id, - "order_line": [ - ( - 0, - 0, - { - "name": self.product.name, - "product_id": self.product.id, - "product_uom_qty": 1.0, - "product_uom": self.ref("uom.product_uom_unit"), - "price_unit": self.product.lst_price, - "agent_ids": [ - ( - 0, - 0, - { - "agent_id": agent.id, - "commission_id": commission.id, - }, - ) - ], - }, - ), - ( - 0, - 0, - { - "name": self.product.name, - "product_id": self.product.id, - "product_uom_qty": 5.0, - "product_uom": self.ref("uom.product_uom_unit"), - "price_unit": self.product.lst_price, - "agent_ids": [ - ( - 0, - 0, - { - "agent_id": self.agent_monthly.id, - "commission_id": self.partial_commission_net_paid.id, - }, - ) - ], - }, - ), - ], - } - ) - - def _invoice_sale_order(self, sale_order, date=None): - old_invoices = sale_order.invoice_ids - wizard = self.advance_inv_model.create({"advance_payment_method": "delivered"}) - wizard.with_context( - { - "active_model": "sale.order", - "active_ids": [sale_order.id], - "active_id": sale_order.id, - } - ).create_invoices() - invoice = sale_order.invoice_ids - old_invoices - invoice.flush() - return invoice - - def _settle_agent(self, agent=None, period=None, date=None, date_payment_to=None): - vals = { - "date_to": ( - fields.Datetime.from_string(fields.Datetime.now()) - + relativedelta(months=period) - ) - if period - else date, - "date_payment_to": date_payment_to, - } - if agent: - vals["agent_ids"] = [(4, agent.id)] - wizard = self.make_settle_model.create(vals) - wizard.action_settle() - - def register_payment( - self, - invoice, - payment_date, - amount=None, - payment_difference_handling="reconcile", - ): - payment_model = self.env["account.payment.register"] - invoice.action_post() - if not amount: - amount = invoice.amount_total - ctx = { - "active_model": "account.move", - "active_ids": [invoice.id], - } - return ( - payment_model.with_context(ctx) - .create( - { - "payment_date": payment_date, - "amount": amount, - "journal_id": self.env["account.journal"] - .search([("type", "=", "bank")], limit=1) - .id, - "payment_method_id": self.env.ref( - "account.account_payment_method_manual_out" - ).id, - "payment_difference_handling": payment_difference_handling, - } - ) - .action_create_payments() - ) +class TestPartialSettlement(TestPartialSettlementCommon): def test_partial_payment_amount_settlement(self): sale_order = self._create_multi_line_sale_order( self.agent_monthly, self.partial_commission_net_paid @@ -202,8 +26,8 @@ def test_partial_payment_amount_settlement(self): payment_difference_handling="open", ) self.assertTrue(invoice._get_reconciled_invoices_partials()) - self._settle_agent(self.agent_monthly, 1, date_payment_to=datetime.now()) - settlements = self.env["sale.commission.settlement"].search( + self._settle_agent(self.agent_monthly, 1, datetime.now()) + settlements = self.env["commission.settlement"].search( [ ( "agent_id", @@ -217,30 +41,6 @@ def test_partial_payment_amount_settlement(self): self.assertEqual(2, len(settlements.line_ids)) self.assertEqual(2, len(invoice.line_ids.agent_ids)) - def test_skip_partial_future_payment(self): - sale_order = self._create_multi_line_sale_order( - self.agent_monthly, self.partial_commission_net_paid - ) - sale_order.action_confirm() - date = fields.Date.today() - invoice = self._invoice_sale_order(sale_order) - self.register_payment( - invoice, - date + relativedelta(days=2), - ) - self._settle_agent(self.agent_monthly, 1, date_payment_to=datetime.now()) - settlements = self.env["sale.commission.settlement"].search( - [ - ( - "agent_id", - "=", - self.agent_monthly.id, - ), - ("state", "=", "settled"), - ] - ) - self.assertEqual(0, len(settlements)) - def test_multi_agents_settlement(self): agent_net = self.agent_biweekly commission_net = self.commission_net_invoice diff --git a/sale_commission_partial_settlement/views/sale_commission_view.xml b/sale_commission_partial_settlement/views/commission_view.xml similarity index 56% rename from sale_commission_partial_settlement/views/sale_commission_view.xml rename to sale_commission_partial_settlement/views/commission_view.xml index b82c7b9d1..9dc52314f 100644 --- a/sale_commission_partial_settlement/views/sale_commission_view.xml +++ b/sale_commission_partial_settlement/views/commission_view.xml @@ -1,9 +1,9 @@ - - sale.commission.payment.amount.form - sale.commission - + + commission.partial.settlement.form.view + commission +