odoo-addon-account-commission 16.0.2.4.2__py3-none-any.whl → 17.0.1.0.1__py3-none-any.whl

odoo/addons/account_commission/tests/test_account_commission.py

@@ -7,7 +7,7 @@ from dateutil.relativedelta import relativedelta
 
 from odoo import fields
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, tagged
+from odoo.tests import tagged
 
 from odoo.addons.commission.tests.test_commission import TestCommissionBase
 
@@ -533,164 +533,81 @@ class TestAccountCommission(TestCommissionBase):
         )
         self.assertEqual(2, len(settlements))
 
-    def test_invoice_partial_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_form = Form(
-            self.env["account.move"].browse(move_reversal.reverse_moves()["res_id"])
-        )
-        with refund_form.invoice_line_ids.edit(0) as line:
-            line.price_unit -= 2
-        refund = refund_form.save()
-        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.2 = 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.2 = 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_form = Form(
-            self.env["account.move"].browse(move_reversal.reverse_moves()["res_id"])
-        )
-        with invoice2_form.invoice_line_ids.edit(0) as line:
-            line.price_unit -= 2
-        invoice2 = invoice2_form.save()
-        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,
+    def test_grouped_report_lines_sale_invoice(self):
+        """Test grouped report lines for settlements coming from sale invoices."""
+        invoice = self.env["account.move"].create(
+            {
+                "move_type": "out_invoice",
+                "partner_id": self.partner.id,
+                "invoice_date": fields.Date.today(),
+                "invoice_line_ids": [
+                    (0, 0, {"name": "Line 1", "price_unit": 100.0, "quantity": 1.0}),
+                    (0, 0, {"name": "Line 2", "price_unit": 50.0, "quantity": 1.0}),
+                ],
+            }
         )
-        register_payments = (
-            self.env["account.payment.register"]
-            .with_context(active_ids=invoice2.id, active_model="account.move")
-            .create({"journal_id": payment_journal.id})
+        agent_line1 = self.env["account.invoice.line.agent"].create(
+            {
+                "object_id": invoice.invoice_line_ids[0].id,
+                "commission_id": self.commission_net_paid.id,
+                "amount": 20.0,
+                "agent_id": self.agent_monthly.id,
+                "invoice_date": fields.Date.today(),
+                "company_id": self.company.id,
+            }
         )
-        register_payments.action_create_payments()
-
-        # check settlement creation. The commission must be (5 - 5 + 3) * 0.2 = 0.6
-        self._settle_agent_invoice(agent, 1)
-        settlements = self.settle_model.search(
-            [
-                ("agent_id", "=", agent.id),
-            ]
+        agent_line2 = self.env["account.invoice.line.agent"].create(
+            {
+                "object_id": invoice.invoice_line_ids[1].id,
+                "commission_id": self.commission_net_paid.id,
+                "amount": 10.0,
+                "agent_id": self.agent_monthly.id,
+                "invoice_date": fields.Date.today(),
+                "company_id": self.company.id,
+            }
         )
-        self.assertEqual(3, len(settlements.line_ids))
-        self.assertAlmostEqual(0.6, sum(settlements.mapped("total")), 2)
-
-    def _register_payment(self, invoice):
-        payment_journal = self.env["account.journal"].search(
-            [("type", "=", "cash"), ("company_id", "=", self.env.company.id)],
-            limit=1,
+        settlement = self.settle_model.create(
+            {
+                "agent_id": self.agent_monthly.id,
+                "date_from": fields.Date.today(),
+                "date_to": fields.Date.today(),
+                "settlement_type": "sale_invoice",
+                "company_id": self.company.id,
+                "line_ids": [
+                    (
+                        0,
+                        0,
+                        {
+                            "date": fields.Date.today(),
+                            "agent_id": self.agent_monthly.id,
+                            "commission_id": self.commission_net_paid.id,
+                            "settled_amount": 20.0,
+                            "invoice_agent_line_id": agent_line1.id,
+                            "currency_id": self.company.currency_id.id,
+                        },
+                    ),
+                    (
+                        0,
+                        0,
+                        {
+                            "date": fields.Date.today(),
+                            "agent_id": self.agent_monthly.id,
+                            "commission_id": self.commission_net_paid.id,
+                            "settled_amount": 10.0,
+                            "invoice_agent_line_id": agent_line2.id,
+                            "currency_id": self.company.currency_id.id,
+                        },
+                    ),
+                ],
+            }
         )
-        register_payments = (
-            self.env["account.payment.register"]
-            .with_context(active_ids=invoice.id, active_model="account.move")
-            .create({"journal_id": payment_journal.id})
+        grouped_lines = settlement.grouped_report_lines()
+        self.assertEqual(
+            len(grouped_lines), 1, "Lines from same invoice should be grouped together"
         )
-        register_payments.action_create_payments()
 
-    def test_invoice_pending_settlement(self):
-        """Make in one settlement all pending invoices to wizard date"""
-        fields.Date.today()
-        self.commission_net_paid.invoice_state = "paid"
-        invoice1 = self._create_invoice(
-            self.agent_pending, self.commission_net_paid, "2024-02-15", currency=None
-        )
-        # Register payment for the new invoice
-        invoice2 = self._create_invoice(
-            self.agent_pending, self.commission_net_paid, "2024-03-15", currency=None
+        gl = grouped_lines[0]
+        self.assertEqual(
+            gl["settled_amount"], 30.0, "Grouped settled amount should be summed"
         )
-        invoice3 = self._create_invoice(
-            self.agent_pending, self.commission_net_paid, "2024-04-15", currency=None
-        )
-        # invoice1.invoice_line_ids.agent_ids._compute_amount()
-        (invoice1 + invoice2 + invoice3).action_post()
-        self._register_payment(invoice1)
-        self._register_payment(invoice2)
-        self._register_payment(invoice3)
-        self._settle_agent_invoice(self.agent_pending, 1)
-        settlements = self.settle_model.search([("state", "=", "settled")])
-        self.assertEqual(len(settlements.line_ids), 3)
+        self.assertEqual(gl["invoice"], invoice.name)

odoo/addons/account_commission/views/account_move_views.xml

@@ -15,7 +15,7 @@
                     widget="monetary"
                     options="{'currency_field': 'currency_id'}"
                 />
-                <field name="currency_id" invisible="1" />
+                <field name="currency_id" column_invisible="1" />
             </tree>
         </field>
     </record>
@@ -28,15 +28,12 @@
                 <group
                     string="Commissions"
                     name="group_commission"
-                    attrs="{'invisible': [('agent_ids', '=', [])], 'readonly': [('any_settled', '=', True)]}"
+                    invisible="not agent_ids"
+                    readonly="any_settled"
                 >
                     <field name="any_settled" invisible="1" />
                     <field name="commission_free" force_save="1" />
-                    <field
-                        name="agent_ids"
-                        attrs="{'readonly': [('commission_free', '=', True)]}"
-                        force_save="1"
-                    />
+                    <field name="agent_ids" readonly="commission_free" force_save="1" />
                 </group>
             </xpath>
         </field>
@@ -52,7 +49,7 @@
                     type="object"
                     class="oe_stat_button"
                     icon="fa-pencil-square-o"
-                    attrs="{'invisible': [('settlement_count', '=', 0)]}"
+                    invisible="(settlement_count == 0)"
                 >
                     <field
                         name="settlement_count"
@@ -65,28 +62,20 @@
                 expr="//field[@name='invoice_line_ids']/tree//field[@name='price_subtotal']"
                 position="after"
             >
-                <field name="settlement_id" invisible="1" />
-                <field name="commission_free" invisible="1" />
-                <field name="any_settled" invisible="1" />
+                <field name="settlement_id" column_invisible="1" />
+                <field name="commission_free" column_invisible="1" />
+                <field name="any_settled" column_invisible="1" />
                 <button
                     name="button_edit_agents"
                     title="Edit agents"
                     icon="fa-users"
-                    attrs="{'invisible': [
-                        '|',
-                        ('commission_free', '=', True),
-                        ('any_settled', '=', True),
-                    ],
-                    'column_invisible': [
-                        ('parent.move_type', 'not in', ['out_invoice', 'out_refund'])
-                    ]}"
+                    invisible="commission_free or any_settled"
+                    column_invisible="(parent.move_type not in ('out_invoice', 'out_refund'))"
                     type="object"
                 />
                 <field
                     name="commission_status"
-                    attrs="{'column_invisible': [
-                        ('parent.move_type', 'not in', ['out_invoice', 'out_refund'])
-                    ]}"
+                    column_invisible="(parent.move_type not in ('out_invoice', 'out_refund'))"
                 />
             </xpath>
             <xpath expr="//field[@name='invoice_line_ids']" position="after">
@@ -94,28 +83,22 @@
                     name="recompute_lines_agents"
                     type="object"
                     string="Regenerate agents"
-                    attrs="{'invisible': [
-                        '|',
-                        ('move_type', 'not in', ['out_invoice', 'out_refund']),
-                        ('state', '!=', 'draft')
-                    ]}"
+                    invisible="(move_type not in ['out_invoice', 'out_refund']) or (state != 'draft')"
                 />
             </xpath>
             <!-- Needed for fields in invoice lines to be saved -->
             <xpath expr="//field[@name='line_ids']/tree" position="inside">
-                <field name="settlement_id" invisible="1" />
-                <field name="commission_free" invisible="1" />
-                <field name="any_settled" invisible="1" />
-                <field name="commission_status" invisible="1" />
+                <field name="settlement_id" column_invisible="1" />
+                <field name="commission_free" column_invisible="1" />
+                <field name="any_settled" column_invisible="1" />
+                <field name="commission_status" column_invisible="1" />
             </xpath>
             <field name="tax_totals" position="after">
                 <field
                     name="commission_total"
                     widget="monetary"
                     options="{'currency_field': 'currency_id'}"
-                    attrs="{'invisible': [
-                        ('move_type', 'not in', ['out_invoice', 'out_refund'])
-                    ]}"
+                    invisible="(move_type not in ('out_invoice', 'out_refund'))"
                 />
             </field>
         </field>
@@ -132,9 +115,9 @@
                     class="oe_stat_button"
                     icon="fa-pencil-square-o"
                     string="Settlements"
-                    attrs="{'invisible': [('settlement_count', '=', 0)]}"
+                    invisible="(settlement_count == 0)"
                 />
-                <field name="settlement_count" invisible="1" />
+                <field name="settlement_count" column_invisible="1" />
             </field>
         </field>
     </record>

odoo/addons/account_commission/views/commission_settlement_views.xml

@@ -21,7 +21,7 @@
             <button name="action_cancel" position="before">
                 <button
                     string="Make invoice"
-                    attrs="{'invisible': ['|', ('state', '!=', 'settled'), ('agent_type', '!=', 'agent')]}"
+                    invisible="(state != 'settled') or (agent_type != 'agent')"
                     class="oe_highlight"
                     type="object"
                     name="action_invoice"
@@ -29,7 +29,7 @@
                 />
                 <button
                     string="Reset to draft"
-                    attrs="{'invisible': [('state', '!=', 'except_invoice')]}"
+                    invisible="(state != 'except_invoice')"
                     type="object"
                     name="action_draft"
                     groups="account.group_account_invoice"
@@ -38,7 +38,7 @@
             <field name="settlement_type" position="after">
                 <field
                     name="invoice_id"
-                    attrs="{'invisible': [('state', '!=', 'invoiced')]}"
+                    invisible="(state != 'invoiced')"
                     groups="account.group_account_invoice"
                 />
             </field>
@@ -48,7 +48,7 @@
             >
                 <field
                     name="invoice_line_id"
-                    attrs="{'column_invisible': [('parent.settlement_type', '!=', 'sale_invoice')]}"
+                    column_invisible="(parent.settlement_type != 'sale_invoice')"
                     groups="account.group_account_invoice"
                 />
             </xpath>

odoo/addons/account_commission/views/commission_views.xml

@@ -8,7 +8,7 @@
             <xpath expr="//group[@name='commision_params']" position="inside">
                 <field
                     name="invoice_state"
-                    attrs="{'required': [('settlement_type', '=', 'sale_invoice')]}"
+                    required="(settlement_type == 'sale_invoice')"
                 />
             </xpath>
         </field>

odoo/addons/account_commission/views/grouped_report_settlement_templates.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template
+        id="grouped_report_settlement_document"
+        inherit_id="commission.grouped_report_settlement_document"
+    >
+        <xpath expr="//th[@name='th_commission']" position="attributes">
+            <attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
+        </xpath>
+        <xpath expr="//td[@name='td_commission']" position="attributes">
+            <attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
+        </xpath>
+        <xpath expr="//th[@name='th_date']" position="after">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <th class="text-start">Invoice</th>
+                <th class="text-start">Partner</th>
+                <th class="text-start">Subtotal</th>
+            </t>
+        </xpath>
+        <xpath expr="//td[@name='td_date']" position="after">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <td><span t-out="l.get('invoice')" /></td>
+                <td><span t-out="l.get('partner')" /></td>
+                <td><span t-out="round(l.get('base_commission', 0.0), 2)" /></td>
+            </t>
+        </xpath>
+        <xpath expr="//tr[td[@name='td_total']]" position="after">
+            <tr t-if="o.settlement_type == 'sale_invoice'">
+                <td />
+                <td />
+                <td />
+                <td class="text-end"><strong>Total</strong></td>
+                <td class="text-end">
+                    <span
+                        t-field="o.total"
+                        t-options="{'widget': 'monetary', 'display_currency': o.currency_id}"
+                    />
+                </td>
+            </tr>
+        </xpath>
+        <xpath expr="//tr[td[@name='td_total']]" position="attributes">
+            <attribute name="t-if">o.settlement_type != 'sale_invoice'</attribute>
+        </xpath>
+    </template>
+</odoo>

odoo/addons/account_commission/views/report_settlement_templates.xml

@@ -12,30 +12,24 @@
         </xpath>
         <xpath expr="//th" position="after">
             <t t-if="o.settlement_type == 'sale_invoice'">
-                <th class="text-start">Invoice</th>
-                <th class="text-start">Customer</th>
-                <th class="text-start">Description</th>
+                <th class="text-start">Invoice line</th>
                 <th class="text-start">Quantity</th>
-                <th class="text-start">Amount</th>
             </t>
         </xpath>
         <xpath expr="//table/tbody/tr/td" position="after">
             <t t-if="o.settlement_type == 'sale_invoice'">
                 <td>
-                    <span t-field="l.invoice_line_id.move_id.name" />
-                </td>
-                <td>
-                    <span t-field="l.invoice_line_id.move_id.partner_id" />
-                </td>
-                <td>
-                    <span t-field="l.invoice_line_id.name" />
+                    <span t-field="l.invoice_line_id" />
                 </td>
                 <td>
                     <span t-field="l.invoice_line_id.quantity" />
                 </td>
-                <td>
-                    <span t-field="l.invoice_line_id.price_subtotal" />
-                </td>
+            </t>
+        </xpath>
+        <xpath expr="//table/tfoot/tr/td" position="before">
+            <t t-if="o.settlement_type == 'sale_invoice'">
+                <td />
+                <td />
             </t>
         </xpath>
     </template>

odoo/addons/account_commission/wizards/wizard_invoice.xml

@@ -11,10 +11,7 @@
                     <field name="product_id" />
                     <field name="date" />
                 </group>
-                <group
-                    string="Settlements"
-                    attrs="{'invisible': [('from_settlement', '=', True)]}"
-                >
+                <group string="Settlements" invisible="from_settlement">
                     <p
                         colspan="4"
                     >(keep empty for invoicing all the pending settlements)</p>