From 8de8f37df662106d0f0edb75b45d4200d940241c Mon Sep 17 00:00:00 2001 From: Ilyas Date: Mon, 21 Nov 2022 14:09:41 +0500 Subject: [PATCH 01/14] [ADD] sale_commission_advance: down payment invoice agents commission calculation --- sale_commission_advance/README.rst | 0 sale_commission_advance/__init__.py | 1 + sale_commission_advance/__manifest__.py | 12 ++ sale_commission_advance/models/__init__.py | 2 + .../models/account_move.py | 129 +++++++++++++++ sale_commission_advance/models/sale_order.py | 44 ++++++ .../readme/CONTRIBUTORS.rst | 3 + .../readme/DESCRIPTION.rst | 2 + sale_commission_advance/readme/USAGE.rst | 4 + sale_commission_advance/tests/__init__.py | 1 + .../tests/test_sale_commission_advance.py | 149 ++++++++++++++++++ 11 files changed, 347 insertions(+) create mode 100644 sale_commission_advance/README.rst create mode 100644 sale_commission_advance/__init__.py create mode 100644 sale_commission_advance/__manifest__.py create mode 100644 sale_commission_advance/models/__init__.py create mode 100644 sale_commission_advance/models/account_move.py create mode 100644 sale_commission_advance/models/sale_order.py create mode 100644 sale_commission_advance/readme/CONTRIBUTORS.rst create mode 100644 sale_commission_advance/readme/DESCRIPTION.rst create mode 100644 sale_commission_advance/readme/USAGE.rst create mode 100644 sale_commission_advance/tests/__init__.py create mode 100644 sale_commission_advance/tests/test_sale_commission_advance.py diff --git a/sale_commission_advance/README.rst b/sale_commission_advance/README.rst new file mode 100644 index 000000000..e69de29bb diff --git a/sale_commission_advance/__init__.py b/sale_commission_advance/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/sale_commission_advance/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_commission_advance/__manifest__.py b/sale_commission_advance/__manifest__.py new file mode 100644 index 000000000..6d849b87a --- /dev/null +++ b/sale_commission_advance/__manifest__.py @@ -0,0 +1,12 @@ +{ + "name": "Sales Commissions Advance", + "summary": "Down payment invoice commission", + "version": "14.0.1.0.0", + "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", + "category": "Sales Management", + "license": "AGPL-3", + "depends": ["sale_commission"], + "website": "https://github.com/OCA/commission", + "maintainers": ["ilyasprogrammer"], + "installable": True, +} diff --git a/sale_commission_advance/models/__init__.py b/sale_commission_advance/models/__init__.py new file mode 100644 index 000000000..df48fd830 --- /dev/null +++ b/sale_commission_advance/models/__init__.py @@ -0,0 +1,2 @@ +from . import account_move +from . import sale_order diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py new file mode 100644 index 000000000..215077397 --- /dev/null +++ b/sale_commission_advance/models/account_move.py @@ -0,0 +1,129 @@ +from odoo import api, fields, models + + +class AccountMove(models.Model): + _inherit = "account.move" + + @api.model + def create(self, vals): + rec = super().create(vals) + if rec.has_related_sale_with_down_payment(): + # to get correct commission amount + rec.recompute_lines_agents() + return rec + + def has_related_sale_with_down_payment(self): + return any( + self.invoice_line_ids.mapped( + lambda x: x.sale_line_ids and x.sale_line_ids.is_downpayment + ) + ) + + +class AccountMoveLine(models.Model): + _inherit = "account.move.line" + + @api.depends("move_id.partner_id") + def _compute_agent_ids(self): + self.agent_ids = False # for resetting previous agents + down_payment_items = self.filtered( + lambda x: x.move_id.partner_id + and x.move_id.move_type[:3] == "out" + and x.sale_line_ids.is_downpayment + ) + for record in down_payment_items: + agent_ids = record._prepare_agents_vals_down_payment() + record.update({"agent_ids": agent_ids}) + regular_items = self.filtered( + lambda x: x.move_id.partner_id + and x.move_id.move_type[:3] == "out" + and not x.sale_line_ids.is_downpayment + ) + if regular_items: + super(AccountMoveLine, regular_items)._compute_agent_ids() + + def _prepare_agents_vals_partner(self, partner): + if not self.move_id.has_related_sale_with_down_payment(): + return super()._prepare_agents_vals_partner(partner) + sol_agents = self.sale_line_ids.mapped("agent_ids").filtered( + lambda x: x.amount > 0 + ) + agent_ids = sol_agents.mapped("agent_id") + res = [] + for agent_id in agent_ids: + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "commission_id": agent_id.commission_id.id, + }, + ) + ) + return res + + def _prepare_agents_vals_down_payment(self): + # Add agent lines with amount > 0 and with total commission amount + self.sale_line_ids.ensure_one() + sale_order_id = self.sale_line_ids.order_id + agent_sol_ids = sale_order_id.order_line.filtered( + lambda x: x.is_downpayment is False and x.product_id and x.agent_ids + ) + sol_agents = agent_sol_ids.mapped("agent_ids").filtered(lambda x: x.amount > 0) + agent_ids = sol_agents.mapped("agent_id") + res = [] + for agent_id in agent_ids: + total = sum( + sol_agents.filtered(lambda x: x.agent_id == agent_id).mapped("amount") + ) + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "downpayment_base_amount": total, + }, + ) + ) + return res + + +class AccountInvoiceLineAgent(models.Model): + _inherit = "account.invoice.line.agent" + + commission_id = fields.Many2one( + comodel_name="sale.commission", + ondelete="restrict", + required=False, + compute="_compute_commission_id", + store=True, + readonly=False, + copy=True, + ) + downpayment_base_amount = fields.Monetary( + copy=False, help="Total agent commission based on Sale Order" + ) + + @api.depends("agent_id") + def _compute_commission_id(self): + for record in self: + if not record.object_id.sale_line_ids or ( + record.object_id.sale_line_ids + and not record.object_id.sale_line_ids.is_downpayment + ): + record.commission_id = record.agent_id.commission_id + + def _get_commission_amount(self, commission, subtotal, product, quantity): + self.ensure_one() + if self.object_id.sale_line_ids and self.object_id.sale_line_ids.is_downpayment: + sale_order_id = self.object_id.sale_line_ids.order_id + ratio = self.object_id.price_total / sale_order_id.amount_total + return self.downpayment_base_amount * ratio + else: + return super(AccountInvoiceLineAgent, self)._get_commission_amount( + commission, subtotal, product, quantity + ) diff --git a/sale_commission_advance/models/sale_order.py b/sale_commission_advance/models/sale_order.py new file mode 100644 index 000000000..903b26901 --- /dev/null +++ b/sale_commission_advance/models/sale_order.py @@ -0,0 +1,44 @@ +from odoo import api, models + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + @api.depends("order_id.partner_id") + def _compute_agent_ids(self): + self.agent_ids = False # for resetting previous agents + for record in self.filtered(lambda x: x.order_id.partner_id): + if record.is_downpayment: + # Down payment SOL + agent_ids = record._prepare_agents_vals_partner_down_payment( + record.order_id.partner_id + ) + record.update({"agent_ids": agent_ids}) + else: + # Regular SOL + if not record.commission_free and record.product_id: + record.agent_ids = record._prepare_agents_vals_partner( + record.order_id.partner_id + ) + + def _prepare_agents_vals_partner_down_payment(self, partner): + res = [] + if self.invoice_lines: + for agent_id in partner.agent_ids: + for line in self.invoice_lines: + if ( + line.agent_ids + and agent_id.id in line.agent_ids.mapped("agent_id").ids + ): + res.append( + ( + 0, + 0, + { + "agent_id": agent_id.id, + "amount": 0, + "commission_id": agent_id.commission_id.id, + }, + ) + ) + return res diff --git a/sale_commission_advance/readme/CONTRIBUTORS.rst b/sale_commission_advance/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..c29a9c72e --- /dev/null +++ b/sale_commission_advance/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Ooops404 `__: + + * Ilyas diff --git a/sale_commission_advance/readme/DESCRIPTION.rst b/sale_commission_advance/readme/DESCRIPTION.rst new file mode 100644 index 000000000..98ffee0fb --- /dev/null +++ b/sale_commission_advance/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +Module used to apply agents commission to down payment invoices proportionally to +sale order agents commission. diff --git a/sale_commission_advance/readme/USAGE.rst b/sale_commission_advance/readme/USAGE.rst new file mode 100644 index 000000000..e8200470c --- /dev/null +++ b/sale_commission_advance/readme/USAGE.rst @@ -0,0 +1,4 @@ +* Create Sale order with agents commissions. +* Create down payment invoice. Make sure down payment product is not commission free. +* Open created invoice. You will see proportional agents commissions calculated. +* When creating regular invoice with deducted down payment, also agents commissions from down payment will be deducted. diff --git a/sale_commission_advance/tests/__init__.py b/sale_commission_advance/tests/__init__.py new file mode 100644 index 000000000..7b1366573 --- /dev/null +++ b/sale_commission_advance/tests/__init__.py @@ -0,0 +1 @@ +from . import test_sale_commission_advance diff --git a/sale_commission_advance/tests/test_sale_commission_advance.py b/sale_commission_advance/tests/test_sale_commission_advance.py new file mode 100644 index 000000000..caec71254 --- /dev/null +++ b/sale_commission_advance/tests/test_sale_commission_advance.py @@ -0,0 +1,149 @@ +from odoo.tests.common import SavepointCase + + +class TestSaleCommission(SavepointCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.commission_model = cls.env["sale.commission"] + cls.res_partner_model = cls.env["res.partner"] + cls.sale_order_model = cls.env["sale.order"] + cls.advance_inv_model = cls.env["sale.advance.payment.inv"] + cls.commission_1 = cls.commission_model.create( + { + "name": "10% fixed commission", + "fix_qty": 10.0, + "commission_type": "fixed", + "amount_base_type": "gross_amount", + } + ) + cls.product_1 = cls.env.ref("product.product_product_5") + cls.product_2 = cls.env.ref("product.product_product_6") + cls.product_1.write({"invoice_policy": "order"}) + cls.product_2.write({"invoice_policy": "order"}) + cls.agent_1 = cls.res_partner_model.create( + { + "name": "Test Agent 1", + "agent": True, + "lang": "en_US", + "settlement": "monthly", + "commission_id": cls.commission_1.id, + } + ) + cls.agent_2 = cls.res_partner_model.create( + { + "name": "Test Agent 2", + "agent": True, + "lang": "en_US", + "settlement": "monthly", + "commission_id": cls.commission_1.id, + } + ) + cls.partner = cls.env.ref("base.res_partner_2") + cls.partner.agent_ids = [(6, 0, (cls.agent_1 + cls.agent_2).ids)] + cls.default_account_revenue = cls.env["account.account"].search( + [ + ("company_id", "=", cls.env.user.company_ids[0].id), + ( + "user_type_id", + "=", + cls.env.ref("account.data_account_type_revenue").id, + ), + ], + limit=1, + ) + + def _create_sale_order(self): + return self.sale_order_model.create( + { + "partner_id": self.partner.id, + "order_line": [ + ( + 0, + 0, + { + "name": self.product_1.name, + "product_id": self.product_1.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": 500, + }, + ), + ( + 0, + 0, + { + "name": self.product_2.name, + "product_id": self.product_2.id, + "product_uom_qty": 1.0, + "product_uom": self.ref("uom.product_uom_unit"), + "price_unit": 500, + }, + ), + ], + } + ) + + def _invoice_sale_order(self, sale_order, date=None, method="percentage"): + old_invoices = sale_order.invoice_ids + if method == "delivered": + wizard = self.advance_inv_model.create( + { + "advance_payment_method": method, + } + ) + else: + wizard = self.advance_inv_model.create( + { + "advance_payment_method": method, + "amount": 10, + "deposit_account_id": self.default_account_revenue.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 + if date: + invoice.invoice_date = date + invoice.date = date + # We need to use flush() in order to execute commission_amount + invoice.flush() + return invoice + + def test_down_payment_flow(self): + # Sale order + order_id = self._create_sale_order() + order_id._compute_commission_total() + self.assertEqual(order_id.commission_total, 200) + self.assertEqual(len(order_id.order_line.agent_ids), 4) + order_id.order_line[0].agent_ids[1].unlink() + order_id.order_line[1].agent_ids[1].unlink() + self.assertEqual(order_id.commission_total, 100) + self.assertEqual(len(order_id.order_line.agent_ids), 2) + order_id.action_confirm() + # Down Payment Invoice + dp_invoice_id = self._invoice_sale_order(order_id) + self.assertEqual(dp_invoice_id.commission_total, 10) + self.assertEqual(len(dp_invoice_id.invoice_line_ids.agent_ids), 1) + # Regular Invoice + invoice_id = self._invoice_sale_order(order_id, method="delivered") + self.assertEqual(invoice_id.commission_total, 90) + dp_sol_id = order_id.order_line[-1] + self.assertEqual(len(dp_sol_id.agent_ids), 1) + + def test_regular_flow(self): + # Sale order + order_id = self._create_sale_order() + order_id._compute_commission_total() + self.assertEqual(order_id.commission_total, 200) + self.assertEqual(len(order_id.order_line.agent_ids), 4) + order_id.action_confirm() + # Regular Invoice + invoice_id = self._invoice_sale_order(order_id, method="delivered") + self.assertEqual(invoice_id.commission_total, 200) + self.assertEqual(len(invoice_id.invoice_line_ids.agent_ids), 4) From de17f79212adaaaebe103bae35f9536e5da8f2b1 Mon Sep 17 00:00:00 2001 From: Ilyas Date: Wed, 30 Nov 2022 22:20:06 +0500 Subject: [PATCH 02/14] [UPD] purchase_sale_inter_company: code improvement --- .../models/account_move.py | 31 +++++-------------- sale_commission_advance/models/sale_order.py | 24 +++++++------- 2 files changed, 18 insertions(+), 37 deletions(-) diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py index 215077397..3e867ed1a 100644 --- a/sale_commission_advance/models/account_move.py +++ b/sale_commission_advance/models/account_move.py @@ -6,9 +6,13 @@ class AccountMove(models.Model): @api.model def create(self, vals): + """ + _prepare_agents_vals_down_payment is called after _get_commission_amount on + account.invoice.line.agent. Need to call _get_commission_amount again to apply + custom amount calculation on down payment line. Otherwise, amount will be 0. + """ rec = super().create(vals) if rec.has_related_sale_with_down_payment(): - # to get correct commission amount rec.recompute_lines_agents() return rec @@ -34,11 +38,7 @@ def _compute_agent_ids(self): for record in down_payment_items: agent_ids = record._prepare_agents_vals_down_payment() record.update({"agent_ids": agent_ids}) - regular_items = self.filtered( - lambda x: x.move_id.partner_id - and x.move_id.move_type[:3] == "out" - and not x.sale_line_ids.is_downpayment - ) + regular_items = self - down_payment_items if regular_items: super(AccountMoveLine, regular_items)._compute_agent_ids() @@ -86,6 +86,7 @@ def _prepare_agents_vals_down_payment(self): "agent_id": agent_id.id, "amount": 0, "downpayment_base_amount": total, + "commission_id": agent_id.commission_id.id, }, ) ) @@ -95,28 +96,10 @@ def _prepare_agents_vals_down_payment(self): class AccountInvoiceLineAgent(models.Model): _inherit = "account.invoice.line.agent" - commission_id = fields.Many2one( - comodel_name="sale.commission", - ondelete="restrict", - required=False, - compute="_compute_commission_id", - store=True, - readonly=False, - copy=True, - ) downpayment_base_amount = fields.Monetary( copy=False, help="Total agent commission based on Sale Order" ) - @api.depends("agent_id") - def _compute_commission_id(self): - for record in self: - if not record.object_id.sale_line_ids or ( - record.object_id.sale_line_ids - and not record.object_id.sale_line_ids.is_downpayment - ): - record.commission_id = record.agent_id.commission_id - def _get_commission_amount(self, commission, subtotal, product, quantity): self.ensure_one() if self.object_id.sale_line_ids and self.object_id.sale_line_ids.is_downpayment: diff --git a/sale_commission_advance/models/sale_order.py b/sale_commission_advance/models/sale_order.py index 903b26901..5d8a3d7dc 100644 --- a/sale_commission_advance/models/sale_order.py +++ b/sale_commission_advance/models/sale_order.py @@ -7,19 +7,17 @@ class SaleOrderLine(models.Model): @api.depends("order_id.partner_id") def _compute_agent_ids(self): self.agent_ids = False # for resetting previous agents - for record in self.filtered(lambda x: x.order_id.partner_id): - if record.is_downpayment: - # Down payment SOL - agent_ids = record._prepare_agents_vals_partner_down_payment( - record.order_id.partner_id - ) - record.update({"agent_ids": agent_ids}) - else: - # Regular SOL - if not record.commission_free and record.product_id: - record.agent_ids = record._prepare_agents_vals_partner( - record.order_id.partner_id - ) + down_payment_items = self.filtered( + lambda x: x.order_id.partner_id and x.is_downpayment + ) + for record in down_payment_items: + agent_ids = record._prepare_agents_vals_partner_down_payment( + record.order_id.partner_id + ) + record.update({"agent_ids": agent_ids}) + regular_items = self - down_payment_items + if regular_items: + super(SaleOrderLine, regular_items)._compute_agent_ids() def _prepare_agents_vals_partner_down_payment(self, partner): res = [] From 4e94007ce1333f2344e33ffaf15c6c370b4046fd Mon Sep 17 00:00:00 2001 From: Ilyas Date: Thu, 1 Dec 2022 11:11:30 +0500 Subject: [PATCH 03/14] [UPD] purchase_sale_inter_company: ref --- sale_commission_advance/models/account_move.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py index 3e867ed1a..1ab830b99 100644 --- a/sale_commission_advance/models/account_move.py +++ b/sale_commission_advance/models/account_move.py @@ -17,11 +17,8 @@ def create(self, vals): return rec def has_related_sale_with_down_payment(self): - return any( - self.invoice_line_ids.mapped( - lambda x: x.sale_line_ids and x.sale_line_ids.is_downpayment - ) - ) + dp_list = self.invoice_line_ids.sale_line_ids.is_downpayment + return dp_list and any(dp_list) class AccountMoveLine(models.Model): From 0e48c2548a917876fd6e22b66c4098b35d248529 Mon Sep 17 00:00:00 2001 From: Ilyas Date: Thu, 1 Dec 2022 11:16:46 +0500 Subject: [PATCH 04/14] [FIX] purchase_sale_inter_company: has_related_sale_with_down_payment --- sale_commission_advance/models/account_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py index 1ab830b99..be9cfcc93 100644 --- a/sale_commission_advance/models/account_move.py +++ b/sale_commission_advance/models/account_move.py @@ -17,7 +17,7 @@ def create(self, vals): return rec def has_related_sale_with_down_payment(self): - dp_list = self.invoice_line_ids.sale_line_ids.is_downpayment + dp_list = self.invoice_line_ids.sale_line_ids.mapped('is_downpayment') return dp_list and any(dp_list) From f89fbde3440764e4e8d8ae04edef0f833f04ed2f Mon Sep 17 00:00:00 2001 From: Ilyas Date: Thu, 1 Dec 2022 11:18:13 +0500 Subject: [PATCH 05/14] [UPD] purchase_sale_inter_company: ref --- sale_commission_advance/models/account_move.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py index be9cfcc93..3f3e6b3d5 100644 --- a/sale_commission_advance/models/account_move.py +++ b/sale_commission_advance/models/account_move.py @@ -17,7 +17,7 @@ def create(self, vals): return rec def has_related_sale_with_down_payment(self): - dp_list = self.invoice_line_ids.sale_line_ids.mapped('is_downpayment') + dp_list = self.invoice_line_ids.sale_line_ids.mapped("is_downpayment") return dp_list and any(dp_list) From bf888a113f2143084a18406dff54edf923d3cba1 Mon Sep 17 00:00:00 2001 From: oca-ci Date: Thu, 1 Dec 2022 07:28:15 +0000 Subject: [PATCH 06/14] [UPD] Update sale_commission_advance.pot --- .../i18n/sale_commission_advance.pot | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 sale_commission_advance/i18n/sale_commission_advance.pot diff --git a/sale_commission_advance/i18n/sale_commission_advance.pot b/sale_commission_advance/i18n/sale_commission_advance.pot new file mode 100644 index 000000000..452548d2e --- /dev/null +++ b/sale_commission_advance/i18n/sale_commission_advance.pot @@ -0,0 +1,68 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "" From 051d6be69c84c2633ee11f379532a96b0ac2eaef Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 1 Dec 2022 07:32:34 +0000 Subject: [PATCH 07/14] [UPD] README.rst --- sale_commission_advance/README.rst | 93 ++++ .../static/description/index.html | 436 ++++++++++++++++++ 2 files changed, 529 insertions(+) create mode 100644 sale_commission_advance/static/description/index.html diff --git a/sale_commission_advance/README.rst b/sale_commission_advance/README.rst index e69de29bb..90da728db 100644 --- a/sale_commission_advance/README.rst +++ b/sale_commission_advance/README.rst @@ -0,0 +1,93 @@ +========================= +Sales Commissions Advance +========================= + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github + :target: https://github.com/OCA/commission/tree/14.0/sale_commission_advance + :alt: OCA/commission +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_advance + :alt: Translate me on Weblate +.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png + :target: https://runbot.odoo-community.org/runbot/165/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Module used to apply agents commission to down payment invoices proportionally to +sale order agents commission. + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +* Create Sale order with agents commissions. +* Create down payment invoice. Make sure down payment product is not commission free. +* Open created invoice. You will see proportional agents commissions calculated. +* When creating regular invoice with deducted down payment, also agents commissions from down payment will be deducted. + +Bug Tracker +=========== + +Bugs are tracked on `GitHub Issues `_. +In case of trouble, please check there if your issue has already been reported. +If you spotted it first, help us smashing it by providing a detailed and welcomed +`feedback `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Ilyas +* Ooops404 + +Contributors +~~~~~~~~~~~~ + +* `Ooops404 `__: + + * Ilyas + +Maintainers +~~~~~~~~~~~ + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use. + +.. |maintainer-ilyasprogrammer| image:: https://github.com/ilyasprogrammer.png?size=40px + :target: https://github.com/ilyasprogrammer + :alt: ilyasprogrammer + +Current `maintainer `__: + +|maintainer-ilyasprogrammer| + +This module is part of the `OCA/commission `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_commission_advance/static/description/index.html b/sale_commission_advance/static/description/index.html new file mode 100644 index 000000000..d9b969786 --- /dev/null +++ b/sale_commission_advance/static/description/index.html @@ -0,0 +1,436 @@ + + + + + + +Sales Commissions Advance + + + +
+

Sales Commissions Advance

+ + +

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

+

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

+

Table of contents

+ +
+

Usage

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

Bug Tracker

+

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

+

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

+
+
+

Credits

+
+

Authors

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

Maintainers

+

This module is maintained by the OCA.

+Odoo Community Association +

OCA, or the Odoo Community Association, is a nonprofit organization whose +mission is to support the collaborative development of Odoo features and +promote its widespread use.

+

Current maintainer:

+

ilyasprogrammer

+

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

+

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

+
+
+
+ + From bd40c3bd38256e627ffc8bc510683125bf1c25d0 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Thu, 1 Dec 2022 07:32:34 +0000 Subject: [PATCH 08/14] [ADD] icon.png --- .../static/description/icon.png | Bin 0 -> 9455 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sale_commission_advance/static/description/icon.png diff --git a/sale_commission_advance/static/description/icon.png b/sale_commission_advance/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 From 88d18cbfbe928f2d3bcb4bf8e527a6219da3bd5d Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 1 Dec 2022 14:13:11 +0000 Subject: [PATCH 09/14] Added translation using Weblate (Italian) --- sale_commission_advance/i18n/it.po | 69 ++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 sale_commission_advance/i18n/it.po diff --git a/sale_commission_advance/i18n/it.po b/sale_commission_advance/i18n/it.po new file mode 100644 index 000000000..a5725e348 --- /dev/null +++ b/sale_commission_advance/i18n/it.po @@ -0,0 +1,69 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: 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_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "" From 4eadca4e2da3a9cb452fedf7bb1decaebcb1a105 Mon Sep 17 00:00:00 2001 From: Francesco Foresti Date: Thu, 1 Dec 2022 14:13:19 +0000 Subject: [PATCH 10/14] Translated using Weblate (Italian) Currently translated at 100.0% (9 of 9 strings) Translation: commission-14.0/commission-14.0-sale_commission_advance Translate-URL: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_advance/it/ --- sale_commission_advance/i18n/it.po | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sale_commission_advance/i18n/it.po b/sale_commission_advance/i18n/it.po index a5725e348..e70612fce 100644 --- a/sale_commission_advance/i18n/it.po +++ b/sale_commission_advance/i18n/it.po @@ -6,18 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2022-12-01 16:45+0000\n" +"Last-Translator: Francesco Foresti \n" "Language-Team: none\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.14.1\n" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent msgid "Agent detail of commission line in invoice lines" -msgstr "" +msgstr "Dettaglio riga provvigione agente nelle righe fattura" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name @@ -25,12 +27,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name msgid "Display Name" -msgstr "" +msgstr "Nome visualizzato" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount msgid "Downpayment Base Amount" -msgstr "" +msgstr "Importo base acconto" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id @@ -38,17 +40,17 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_move msgid "Journal Entry" -msgstr "" +msgstr "Registrazione contabile" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_move_line msgid "Journal Item" -msgstr "" +msgstr "Movimento contabile" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update @@ -56,14 +58,14 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update msgid "Last Modified on" -msgstr "" +msgstr "Ultima modifica il" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Riga ordine di vendita" #. module: sale_commission_advance #: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount msgid "Total agent commission based on Sale Order" -msgstr "" +msgstr "Provvigione totale agente basata su Ordine di vendita" From 35aa0971f3f4f1e291edfd7c3493fb660bcf006b Mon Sep 17 00:00:00 2001 From: Adriano Prado Date: Sat, 10 Jun 2023 18:44:09 +0000 Subject: [PATCH 11/14] Added translation using Weblate (Portuguese (Brazil)) --- sale_commission_advance/i18n/pt_BR.po | 69 +++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 sale_commission_advance/i18n/pt_BR.po diff --git a/sale_commission_advance/i18n/pt_BR.po b/sale_commission_advance/i18n/pt_BR.po new file mode 100644 index 000000000..0d3ec172f --- /dev/null +++ b/sale_commission_advance/i18n/pt_BR.po @@ -0,0 +1,69 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * sale_commission_advance +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 14.0\n" +"Report-Msgid-Bugs-To: \n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: nplurals=2; plural=n > 1;\n" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent +msgid "Agent detail of commission line in invoice lines" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name +msgid "Display Name" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Downpayment Base Amount" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id +msgid "ID" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move +msgid "Journal Entry" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_account_move_line +msgid "Journal Item" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update +#: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update +msgid "Last Modified on" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model,name:sale_commission_advance.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: sale_commission_advance +#: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount +msgid "Total agent commission based on Sale Order" +msgstr "" From f6d211b44ad67bcf9277e6ecde28fd5260c71068 Mon Sep 17 00:00:00 2001 From: Adriano Prado Date: Sat, 10 Jun 2023 18:44:31 +0000 Subject: [PATCH 12/14] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (9 of 9 strings) Translation: commission-14.0/commission-14.0-sale_commission_advance Translate-URL: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_advance/pt_BR/ --- sale_commission_advance/i18n/pt_BR.po | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sale_commission_advance/i18n/pt_BR.po b/sale_commission_advance/i18n/pt_BR.po index 0d3ec172f..c7560fe39 100644 --- a/sale_commission_advance/i18n/pt_BR.po +++ b/sale_commission_advance/i18n/pt_BR.po @@ -6,18 +6,20 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2023-06-10 21:09+0000\n" +"Last-Translator: Adriano Prado \n" "Language-Team: none\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: \n" "Plural-Forms: nplurals=2; plural=n > 1;\n" +"X-Generator: Weblate 4.17\n" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_invoice_line_agent msgid "Agent detail of commission line in invoice lines" -msgstr "" +msgstr "Detalhe do agente da linha de comissão nas linhas da fatura" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__display_name @@ -25,12 +27,12 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__display_name #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__display_name msgid "Display Name" -msgstr "" +msgstr "Nome para Exibição" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount msgid "Downpayment Base Amount" -msgstr "" +msgstr "Valor base do adiantamento" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent__id @@ -38,17 +40,17 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line__id #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line__id msgid "ID" -msgstr "" +msgstr "ID" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_move msgid "Journal Entry" -msgstr "" +msgstr "Lançamento Diário" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_account_move_line msgid "Journal Item" -msgstr "" +msgstr "Item Diário" #. module: sale_commission_advance #: model:ir.model.fields,field_description:sale_commission_advance.field_account_invoice_line_agent____last_update @@ -56,14 +58,14 @@ msgstr "" #: model:ir.model.fields,field_description:sale_commission_advance.field_account_move_line____last_update #: model:ir.model.fields,field_description:sale_commission_advance.field_sale_order_line____last_update msgid "Last Modified on" -msgstr "" +msgstr "Última Modificação em" #. module: sale_commission_advance #: model:ir.model,name:sale_commission_advance.model_sale_order_line msgid "Sales Order Line" -msgstr "" +msgstr "Linha de Pedidos de Venda" #. module: sale_commission_advance #: model:ir.model.fields,help:sale_commission_advance.field_account_invoice_line_agent__downpayment_base_amount msgid "Total agent commission based on Sale Order" -msgstr "" +msgstr "Comissão total do representante com base no pedido de venda" From 4c837408808b3049cb4180b6902501f34b0432c0 Mon Sep 17 00:00:00 2001 From: Adasat Date: Tue, 1 Aug 2023 10:28:53 +0000 Subject: [PATCH 13/14] [IMP]sale_commission_advance : pre-commit stuff --- .../odoo/addons/sale_commission_advance | 1 + setup/sale_commission_advance/setup.py | 6 ++++++ 2 files changed, 7 insertions(+) create mode 120000 setup/sale_commission_advance/odoo/addons/sale_commission_advance create mode 100644 setup/sale_commission_advance/setup.py diff --git a/setup/sale_commission_advance/odoo/addons/sale_commission_advance b/setup/sale_commission_advance/odoo/addons/sale_commission_advance new file mode 120000 index 000000000..736bb049e --- /dev/null +++ b/setup/sale_commission_advance/odoo/addons/sale_commission_advance @@ -0,0 +1 @@ +../../../../sale_commission_advance \ No newline at end of file diff --git a/setup/sale_commission_advance/setup.py b/setup/sale_commission_advance/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/sale_commission_advance/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 48d9729b8a0d01641af33c2d3e35b4d051212530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adasat=20Torres=20de=20Le=C3=B3n?= Date: Fri, 31 May 2024 14:20:47 +0100 Subject: [PATCH 14/14] [MIG]sale_commission_advance : Migration to 16.0 --- sale_commission_advance/README.rst | 27 ++++++++++------ sale_commission_advance/__manifest__.py | 4 +-- .../models/account_move.py | 7 ++-- sale_commission_advance/models/sale_order.py | 2 +- .../readme/CONTRIBUTORS.rst | 4 +++ .../static/description/index.html | 16 +++++++--- .../tests/test_sale_commission_advance.py | 32 ++++++++----------- 7 files changed, 52 insertions(+), 40 deletions(-) diff --git a/sale_commission_advance/README.rst b/sale_commission_advance/README.rst index 90da728db..a5db5ca1b 100644 --- a/sale_commission_advance/README.rst +++ b/sale_commission_advance/README.rst @@ -2,10 +2,13 @@ Sales Commissions Advance ========================= -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:63e77b3e1b815ab2cc656a5980aca0917f6597dd0c00c624ba205ec299f61cfb + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,16 +17,16 @@ Sales Commissions Advance :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_advance + :target: https://github.com/OCA/commission/tree/16.0/sale_commission_advance :alt: OCA/commission .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/commission-14-0/commission-14-0-sale_commission_advance + :target: https://translation.odoo-community.org/projects/commission-16-0/commission-16-0-sale_commission_advance :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/165/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/commission&target_branch=16.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| Module used to apply agents commission to down payment invoices proportionally to sale order agents commission. @@ -46,8 +49,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +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. @@ -67,6 +70,10 @@ Contributors * Ilyas +* `Binhex `__: + + * Adasat Torres + Maintainers ~~~~~~~~~~~ @@ -88,6 +95,6 @@ Current `maintainer `__: |maintainer-ilyasprogrammer| -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_advance/__manifest__.py b/sale_commission_advance/__manifest__.py index 6d849b87a..53c8e22ee 100644 --- a/sale_commission_advance/__manifest__.py +++ b/sale_commission_advance/__manifest__.py @@ -1,11 +1,11 @@ { "name": "Sales Commissions Advance", "summary": "Down payment invoice commission", - "version": "14.0.1.0.0", + "version": "16.0.1.0.0", "author": "Ilyas, Ooops404, Odoo Community Association (OCA)", "category": "Sales Management", "license": "AGPL-3", - "depends": ["sale_commission"], + "depends": ["account_commission", "sale_commission", "commission"], "website": "https://github.com/OCA/commission", "maintainers": ["ilyasprogrammer"], "installable": True, diff --git a/sale_commission_advance/models/account_move.py b/sale_commission_advance/models/account_move.py index 3f3e6b3d5..17f7272e5 100644 --- a/sale_commission_advance/models/account_move.py +++ b/sale_commission_advance/models/account_move.py @@ -4,7 +4,6 @@ class AccountMove(models.Model): _inherit = "account.move" - @api.model def create(self, vals): """ _prepare_agents_vals_down_payment is called after _get_commission_amount on @@ -37,11 +36,11 @@ def _compute_agent_ids(self): record.update({"agent_ids": agent_ids}) regular_items = self - down_payment_items if regular_items: - super(AccountMoveLine, regular_items)._compute_agent_ids() + return super(AccountMoveLine, regular_items)._compute_agent_ids() - def _prepare_agents_vals_partner(self, partner): + def _prepare_agents_vals_partner(self, partner, settlement_type=None): if not self.move_id.has_related_sale_with_down_payment(): - return super()._prepare_agents_vals_partner(partner) + return super()._prepare_agents_vals_partner(partner, settlement_type) sol_agents = self.sale_line_ids.mapped("agent_ids").filtered( lambda x: x.amount > 0 ) diff --git a/sale_commission_advance/models/sale_order.py b/sale_commission_advance/models/sale_order.py index 5d8a3d7dc..0181983f1 100644 --- a/sale_commission_advance/models/sale_order.py +++ b/sale_commission_advance/models/sale_order.py @@ -17,7 +17,7 @@ def _compute_agent_ids(self): record.update({"agent_ids": agent_ids}) regular_items = self - down_payment_items if regular_items: - super(SaleOrderLine, regular_items)._compute_agent_ids() + return super(SaleOrderLine, regular_items)._compute_agent_ids() def _prepare_agents_vals_partner_down_payment(self, partner): res = [] diff --git a/sale_commission_advance/readme/CONTRIBUTORS.rst b/sale_commission_advance/readme/CONTRIBUTORS.rst index c29a9c72e..fb3811ecf 100644 --- a/sale_commission_advance/readme/CONTRIBUTORS.rst +++ b/sale_commission_advance/readme/CONTRIBUTORS.rst @@ -1,3 +1,7 @@ * `Ooops404 `__: * Ilyas + +* `Binhex `__: + + * Adasat Torres diff --git a/sale_commission_advance/static/description/index.html b/sale_commission_advance/static/description/index.html index d9b969786..940603a7e 100644 --- a/sale_commission_advance/static/description/index.html +++ b/sale_commission_advance/static/description/index.html @@ -3,7 +3,7 @@ - + Sales Commissions Advance