odoo-addon-account-commission 15.0.3.2.0__py3-none-any.whl → 15.0.3.2.1.1__py3-none-any.whl

odoo/addons/account_commission/README.rst

@@ -7,7 +7,7 @@ Account commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:68f1a6945b770a30a14a0891c944d8d205676022c1fe5ff33968ab47fa9a2b22
+   !! source digest: sha256:2d1fc36a01e43ea64154a3aa40ad9f4284ad401f2e3ee88114020157480a49e7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -47,7 +47,9 @@ For selecting invoice status in commissions:
 #. Edit or create a new record to select the invoice status for settling the commissions.
 
    * **Invoice Based**: Commissions are settled when the invoice is issued.
-   * **Payment Based**: Commissions are settled when the invoice is paid.
+   * **Payment Based**: Commissions are settled when the invoice is paid or refunded.
+     Note that when refunding an invoice, the corresponding reversed commission will
+     be settled as well, resulting in a 0 net commission between both operations.
 
 Usage
 =====

odoo/addons/account_commission/__manifest__.py

@@ -3,7 +3,7 @@
 # Copyright 2014-2022 Tecnativa - Pedro M. Baeza
 {
     "name": "Account commissions",
-    "version": "15.0.3.2.0",
+    "version": "15.0.3.2.1",
     "author": "Tecnativa, Odoo Community Association (OCA)",
     "category": "Sales Management",
     "license": "AGPL-3",

odoo/addons/account_commission/i18n/account_commission.pot

@@ -424,7 +424,7 @@ msgstr ""
 msgid ""
 "Select the invoice status for settling the commissions:\n"
 "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-"* 'Payment Based': Commissions are settled when the invoice is paid."
+"* 'Payment Based': Commissions are settled when the invoice is paid (or refunded)."
 msgstr ""
 
 #. module: account_commission

odoo/addons/account_commission/i18n/es.po

@@ -428,7 +428,8 @@ msgstr "Facturas de Venta"
 msgid ""
 "Select the invoice status for settling the commissions:\n"
 "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-"* 'Payment Based': Commissions are settled when the invoice is paid."
+"* 'Payment Based': Commissions are settled when the invoice is paid (or "
+"refunded)."
 msgstr ""
 
 #. module: account_commission

odoo/addons/account_commission/i18n/ja.po

@@ -62,6 +62,7 @@ msgstr "請求書明細に関連するエージェント/コミッション。"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_invoice_commission_analysis_report__amount
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Amount"
 msgstr "金額"
 
@@ -168,6 +169,7 @@ msgid "Currency"
 msgstr "通貨"
 
 #. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_search
 msgid "Customer"
 msgstr "顧客"
@@ -177,6 +179,11 @@ msgstr "顧客"
 msgid "Date"
 msgstr "日付"
 
+#. module: account_commission
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
+msgid "Description"
+msgstr ""
+
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__display_name
 #: model:ir.model.fields,field_description:account_commission.field_commission_make_invoice__display_name
@@ -228,6 +235,7 @@ msgstr "ID"
 
 #. module: account_commission
 #: model:ir.model.fields,field_description:account_commission.field_account_invoice_line_agent__invoice_id
+#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
 msgid "Invoice"
 msgstr "請求書"
 
@@ -277,11 +285,6 @@ msgstr "請求日"
 msgid "Invoice exception"
 msgstr "請求書例外"
 
-#. module: account_commission
-#: model_terms:ir.ui.view,arch_db:account_commission.report_settlement_document
-msgid "Invoice line"
-msgstr "請求書明細"
-
 #. module: account_commission
 #: model:ir.model.fields.selection,name:account_commission.selection__commission_settlement__state__invoiced
 #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_search
@@ -424,7 +427,8 @@ msgstr "販売請求書"
 msgid ""
 "Select the invoice status for settling the commissions:\n"
 "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-"* 'Payment Based': Commissions are settled when the invoice is paid."
+"* 'Payment Based': Commissions are settled when the invoice is paid (or "
+"refunded)."
 msgstr ""
 
 #. module: account_commission
@@ -577,3 +581,6 @@ msgstr "コミッション請求分析"
 #: model_terms:ir.ui.view,arch_db:account_commission.view_invoice_commission_analysis_search
 msgid "invoices Commission Analysis"
 msgstr "コミッション請求分析"
+
+#~ msgid "Invoice line"
+#~ msgstr "請求書明細"

odoo/addons/account_commission/models/account_move.py

@@ -255,5 +255,5 @@ class AccountInvoiceLineAgent(models.Model):
         self.ensure_one()
         return (
             self.commission_id.invoice_state == "paid"
-            and self.invoice_id.payment_state not in ["in_payment", "paid"]
+            and self.invoice_id.payment_state not in ["in_payment", "paid", "reversed"]
         ) or self.invoice_id.state != "posted"

odoo/addons/account_commission/models/commission.py

@@ -12,5 +12,5 @@ class Commission(models.Model):
         default="open",
         help="Select the invoice status for settling the commissions:\n"
         "* 'Invoice Based': Commissions are settled when the invoice is issued.\n"
-        "* 'Payment Based': Commissions are settled when the invoice is paid.",
+        "* 'Payment Based': Commissions are settled when the invoice is paid (or refunded).",
     )

odoo/addons/account_commission/readme/CONFIGURE.rst

@@ -3,4 +3,6 @@ For selecting invoice status in commissions:
 #. Edit or create a new record to select the invoice status for settling the commissions.
 
    * **Invoice Based**: Commissions are settled when the invoice is issued.
-   * **Payment Based**: Commissions are settled when the invoice is paid.
+   * **Payment Based**: Commissions are settled when the invoice is paid or refunded.
+     Note that when refunding an invoice, the corresponding reversed commission will
+     be settled as well, resulting in a 0 net commission between both operations.

odoo/addons/account_commission/static/description/index.html

@@ -366,7 +366,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:68f1a6945b770a30a14a0891c944d8d205676022c1fe5ff33968ab47fa9a2b22
+!! source digest: sha256:2d1fc36a01e43ea64154a3aa40ad9f4284ad401f2e3ee88114020157480a49e7
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/commission/tree/15.0/account_commission"><img alt="OCA/commission" src="https://img.shields.io/badge/github-OCA%2Fcommission-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/commission-15-0/commission-15-0-account_commission"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/commission&amp;target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module adds the function to calculate commissions in invoices (account moves).</p>
@@ -392,7 +392,9 @@ ul.auto-toc {
 <ol class="arabic simple">
 <li>Edit or create a new record to select the invoice status for settling the commissions.<ul>
 <li><strong>Invoice Based</strong>: Commissions are settled when the invoice is issued.</li>
-<li><strong>Payment Based</strong>: Commissions are settled when the invoice is paid.</li>
+<li><strong>Payment Based</strong>: Commissions are settled when the invoice is paid or refunded.
+Note that when refunding an invoice, the corresponding reversed commission will
+be settled as well, resulting in a 0 net commission between both operations.</li>
 </ul>
 </li>
 </ol>

odoo/addons/account_commission/tests/test_account_commission.py

@@ -497,3 +497,146 @@ class TestAccountCommission(TestCommissionBase):
             ]
         )
         self.assertEqual(2, len(settlements))
+
+    def test_invoice_parcial_refund(self):
+        commission = self.commission_net_paid
+        agent = self.agent_monthly
+        today = fields.Date.today()
+        # Create an invoice
+        invoice = self._create_invoice(agent, commission, today, currency=None)
+        invoice.action_post()
+        # Register payment for invoice
+        payment_journal = self.env["account.journal"].search(
+            [("type", "=", "cash"), ("company_id", "=", invoice.company_id.id)],
+            limit=1,
+        )
+        register_payments = (
+            self.env["account.payment.register"]
+            .with_context(active_ids=invoice.id, active_model="account.move")
+            .create({"journal_id": payment_journal.id})
+        )
+        register_payments.action_create_payments()
+        # Make a parcial refund for the invoice
+        move_reversal = (
+            self.env["account.move.reversal"]
+            .with_context(active_model="account.move", active_ids=invoice.id)
+            .create(
+                {
+                    "reason": "no reason",
+                    "refund_method": "refund",
+                    "journal_id": invoice.journal_id.id,
+                }
+            )
+        )
+        refund = self.env["account.move"].browse(
+            move_reversal.reverse_moves()["res_id"]
+        )
+        refund.write(
+            {
+                "invoice_line_ids": [
+                    (
+                        1,
+                        refund.invoice_line_ids[:1].id,
+                        {"price_unit": refund.invoice_line_ids[:1].price_unit - 2},
+                    )
+                ]
+            }
+        )
+        refund.action_post()
+        # Register payment for the refund
+        register_payments = (
+            self.env["account.payment.register"]
+            .with_context(active_ids=refund.id, active_model="account.move")
+            .create({"journal_id": payment_journal.id})
+        )
+        register_payments.action_create_payments()
+        # check settlement creation. The commission must be (5 - 3) * 0.1 = 0.4
+        self._settle_agent_invoice(agent, 1)
+        settlements = self.settle_model.search([("agent_id", "=", agent.id)])
+        self.assertEqual(2, len(settlements.line_ids))
+        self.assertEqual(0.4, sum(settlements.mapped("total")))
+
+    def test_invoice_full_refund(self):
+        commission = self.commission_net_paid
+        agent = self.agent_monthly
+        today = fields.Date.today()
+        # Create an invoice and refund it
+        invoice = self._create_invoice(agent, commission, today, currency=None)
+        invoice.action_post()
+        move_reversal = (
+            self.env["account.move.reversal"]
+            .with_context(active_model="account.move", active_ids=invoice.id)
+            .create(
+                {
+                    "reason": "no reason",
+                    "refund_method": "cancel",
+                    "journal_id": invoice.journal_id.id,
+                }
+            )
+        )
+        move_reversal.reverse_moves()
+        # check settlement creation. The commission must be: (5 - 5) * 0.1 = 0
+        self._settle_agent_invoice(agent, 1)
+        settlements = self.settle_model.search(
+            [
+                ("agent_id", "=", agent.id),
+            ]
+        )
+        self.assertEqual(2, len(settlements.line_ids))
+        self.assertEqual(0, sum(settlements.mapped("total")))
+
+    def test_invoice_modify_refund(self):
+        commission = self.commission_net_paid
+        agent = self.agent_monthly
+        today = fields.Date.today()
+        # Create an invoice
+        invoice = self._create_invoice(agent, commission, today, currency=None)
+        invoice.action_post()
+        # Create a full refund and a new invoice
+        move_reversal = (
+            self.env["account.move.reversal"]
+            .with_context(active_model="account.move", active_ids=invoice.id)
+            .create(
+                {
+                    "reason": "no reason",
+                    "refund_method": "modify",
+                    "journal_id": invoice.journal_id.id,
+                }
+            )
+        )
+        invoice2 = self.env["account.move"].browse(
+            move_reversal.reverse_moves()["res_id"]
+        )
+        invoice2.write(
+            {
+                "invoice_line_ids": [
+                    (
+                        1,
+                        invoice2.invoice_line_ids[:1].id,
+                        {"price_unit": invoice2.invoice_line_ids[:1].price_unit - 2},
+                    )
+                ]
+            }
+        )
+        invoice2.action_post()
+        # Register payment for the new invoice
+        payment_journal = self.env["account.journal"].search(
+            [("type", "=", "cash"), ("company_id", "=", invoice.company_id.id)],
+            limit=1,
+        )
+        register_payments = (
+            self.env["account.payment.register"]
+            .with_context(active_ids=invoice2.id, active_model="account.move")
+            .create({"journal_id": payment_journal.id})
+        )
+        register_payments.action_create_payments()
+
+        # check settlement creation. The commission must be (5 - 5 + 3) * 0.1 = 0.6
+        self._settle_agent_invoice(agent, 1)
+        settlements = self.settle_model.search(
+            [
+                ("agent_id", "=", agent.id),
+            ]
+        )
+        self.assertEqual(3, len(settlements.line_ids))
+        self.assertEqual(0.6, sum(settlements.mapped("total")))

{odoo_addon_account_commission-15.0.3.2.0.dist-info → odoo_addon_account_commission-15.0.3.2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account-commission
-Version: 15.0.3.2.0
+Version: 15.0.3.2.1.1
 Summary: Account commissions
 Home-page: https://github.com/OCA/commission
 Author: Tecnativa, Odoo Community Association (OCA)
@@ -24,7 +24,7 @@ Account commissions
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:68f1a6945b770a30a14a0891c944d8d205676022c1fe5ff33968ab47fa9a2b22
+   !! source digest: sha256:2d1fc36a01e43ea64154a3aa40ad9f4284ad401f2e3ee88114020157480a49e7
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
@@ -64,7 +64,9 @@ For selecting invoice status in commissions:
 #. Edit or create a new record to select the invoice status for settling the commissions.
 
    * **Invoice Based**: Commissions are settled when the invoice is issued.
-   * **Payment Based**: Commissions are settled when the invoice is paid.
+   * **Payment Based**: Commissions are settled when the invoice is paid or refunded.
+     Note that when refunding an invoice, the corresponding reversed commission will
+     be settled as well, resulting in a 0 net commission between both operations.
 
 Usage
 =====

{odoo_addon_account_commission-15.0.3.2.0.dist-info → odoo_addon_account_commission-15.0.3.2.1.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-odoo/addons/account_commission/README.rst,sha256=6Z4YAfyENCZC8jRk1anJsQiSAXtFYOcFwMqaM6OqRhc,5902
+odoo/addons/account_commission/README.rst,sha256=uTXjA782HiJ6PqU7FDQY48aC8JKDRzxauKykcj-jcvg,6081
 odoo/addons/account_commission/__init__.py,sha256=8JG3SPnwMlgXTppOwkp3YTgDDQGo7U7veMEMpG1bL_c,64
-odoo/addons/account_commission/__manifest__.py,sha256=R9iSzBpSCmTLZKxgSdiUNoFQ_qXRDSISlobjcSagW9k,893
+odoo/addons/account_commission/__manifest__.py,sha256=KbgMkLiUKOQy2p2zM4KqnYDl8DKklU7Iw6lw-SMZ-wA,893
 odoo/addons/account_commission/data/menuitem_data.xml,sha256=OX8KpilSn3zWf9cMNiJLDO7aV_vtaH6GTIyMZWDxYqM,361
-odoo/addons/account_commission/i18n/account_commission.pot,sha256=EY8cxq4HtjIa3NtZd-G5fmsaRq2edBLV3nOGSUtoQBo,21879
-odoo/addons/account_commission/i18n/es.po,sha256=FUt7_BWl0TehYsmtcb--9QCLuADOfWri2OcJWIydfkI,24476
-odoo/addons/account_commission/i18n/ja.po,sha256=AEcc0_EcZpIOd1UE9kwZsGK-W9JumP1z5uFTbqwlBMY,24245
+odoo/addons/account_commission/i18n/account_commission.pot,sha256=xIGxWuQUMHF44VsPgaMyCpwxI3b4t97uK5bcPkoMITs,21893
+odoo/addons/account_commission/i18n/es.po,sha256=QYUlVjymZG8dhzbWfihRCwKptY3memesikv2xrJkOV8,24493
+odoo/addons/account_commission/i18n/ja.po,sha256=ry3KLF4mKnN8qZBXL4Spty6vBs9NF8oc1m6u8YRwh7I,24539
 odoo/addons/account_commission/models/__init__.py,sha256=NAnZVtdmEwISK51Ipnoin5jHE3_bVPLsNghvuFcM3NI,88
-odoo/addons/account_commission/models/account_move.py,sha256=ShfU2bGpPtpPGZw173vYTO8WXA6YdL2_hBOi-zk1ymk,9314
-odoo/addons/account_commission/models/commission.py,sha256=AIEMAKgRh8JegGp1aMKOpUzsIKzy9PEUl3O63ixX04A,562
+odoo/addons/account_commission/models/account_move.py,sha256=wPUjxq86pW93ILQdf5UR4IuwIQanUjvv9Ks-TFCSz4E,9326
+odoo/addons/account_commission/models/commission.py,sha256=OHzmB5iH-h4oQf5JQGV4EFpNOkAHxC1_0-j0g-8nDXE,576
 odoo/addons/account_commission/models/commission_settlement.py,sha256=tQJvLUhuBuKf3mf5yZ0GL4O9ORRiwomIJwYN47WS1mY,7022
-odoo/addons/account_commission/readme/CONFIGURE.rst,sha256=6pepxEYibatNUsjms0bHoR7YlpT7FvSrqFLrje565T4,287
+odoo/addons/account_commission/readme/CONFIGURE.rst,sha256=vUEhtDTSXiZc88gXBuQZIcSkM3CbkmzQQwdVgJfnbSA,466
 odoo/addons/account_commission/readme/CONTRIBUTORS.rst,sha256=edkIHruglREEhXtRp3s9Y5RRMcv-MvgbB99y1M7TXck,605
 odoo/addons/account_commission/readme/DESCRIPTION.rst,sha256=dLMZSNYGysvHiOC7Untw2leoCloADPLcrkIoE8FDEVI,208
 odoo/addons/account_commission/readme/USAGE.rst,sha256=kyhxu0d4eBImmEfJ4f-blVNPNByzArlsT9SIvLpQFqI,1798
@@ -20,9 +20,9 @@ odoo/addons/account_commission/security/account_commission_security.xml,sha256=p
 odoo/addons/account_commission/security/ir.model.access.csv,sha256=c0k8cFhVg1A4XCaUQ-mzJdLIotKKt1ltIYznK8ELhYE,883
 odoo/addons/account_commission/static/description/icon.png,sha256=ydxSIUuHSeE4CfMVsEzLjKKVdX4RicuPj8VGM2rBpBg,8219
 odoo/addons/account_commission/static/description/icon.svg,sha256=96b_cQ-F1XuDU6S5mDi9ioe0d22Vwn30uBDQ_3ZSi5w,17220
-odoo/addons/account_commission/static/description/index.html,sha256=Q1wL5cpZPXMkpHB8mFkST9WsQ4Tuv5rpHsPX8mTe0qg,16780
+odoo/addons/account_commission/static/description/index.html,sha256=0ULamicEa9O12gerXmK4Wcf12gbh_et9XrT6O8ppYtI,16949
 odoo/addons/account_commission/tests/__init__.py,sha256=bxd564RH-TWEpEJWbbc558dPFEJZCsH9JM8JF3-PMUM,38
-odoo/addons/account_commission/tests/test_account_commission.py,sha256=T1Lmptddkxu-z8MlZ5aIv0wfe7QQuJKPAzM6yLsP710,21137
+odoo/addons/account_commission/tests/test_account_commission.py,sha256=HGh1VPeA5WvK-FWimr3i6FlcMY2jN23jjcf_NMZbdCQ,26631
 odoo/addons/account_commission/views/account_move_views.xml,sha256=4oYr0ErkcbGrYtGLDj0ip3ozC9NCjp4jBJLB9YxC9Sc,6634
 odoo/addons/account_commission/views/commission_settlement_views.xml,sha256=jLyChFXOLPE5wqtbRuq6Nh7CxFh5MoTOFDWklE1ZRjc,3523
 odoo/addons/account_commission/views/commission_views.xml,sha256=oY2-WJ-lEn3gCoFMqStKObGT3LRkBxMmANm2MRhYuRE,614
@@ -31,7 +31,7 @@ odoo/addons/account_commission/wizards/__init__.py,sha256=ddwjnl0fpZTw56iNQmRcDJ
 odoo/addons/account_commission/wizards/commission_make_settle.py,sha256=Me1_y1AtiUU4KnxAHFsyBmZW_5XqCc6cH6Xr08lx8ik,1543
 odoo/addons/account_commission/wizards/wizard_invoice.py,sha256=Aga0kHWTtd5F7GehmRrqfwDaFkMlPXVIzEA0jlWTDiE,3259
 odoo/addons/account_commission/wizards/wizard_invoice.xml,sha256=QDGpFCICqhAu6uO7ksQihj0UPGxuQL7MeE3mNx4Xy_A,2161
-odoo_addon_account_commission-15.0.3.2.0.dist-info/METADATA,sha256=r4MJEB5riMil6lSlfcDiQLidTlnHor9mZ8k7KLJk6JQ,6487
-odoo_addon_account_commission-15.0.3.2.0.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-odoo_addon_account_commission-15.0.3.2.0.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
-odoo_addon_account_commission-15.0.3.2.0.dist-info/RECORD,,
+odoo_addon_account_commission-15.0.3.2.1.1.dist-info/METADATA,sha256=jI8lcsQMV2MUN7cWN3Q1yDGEefFxE9kKJmWNWOCY9j4,6668
+odoo_addon_account_commission-15.0.3.2.1.1.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+odoo_addon_account_commission-15.0.3.2.1.1.dist-info/top_level.txt,sha256=qBj40grFkGOfDZ2WDSw3y1RnDlgG0u8rP8pvGNdbz4w,5
+odoo_addon_account_commission-15.0.3.2.1.1.dist-info/RECORD,,