odoo-addon-account-credit-control 17.0.2.1.0__py3-none-any.whl → 17.0.2.2.0__py3-none-any.whl

odoo/addons/account_credit_control/i18n/ro.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/ru.po

@@ -516,6 +516,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sk.po

@@ -514,6 +514,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sk_SK.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sl.po

@@ -519,6 +519,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sr.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sr@latin.po

@@ -516,6 +516,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/sv.po

@@ -514,6 +514,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/th.po

@@ -514,6 +514,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/tr.po

@@ -514,6 +514,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/tr_TR.po

@@ -516,6 +516,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/uk.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/vi.po

@@ -514,6 +514,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/vi_VN.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/zh_CN.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/i18n/zh_TW.po

@@ -515,6 +515,7 @@ msgid "Credit Tolerance Limit"
 msgstr ""
 
 #. module: account_credit_control
+#: model:mail.message.subtype,name:account_credit_control.mt_credit_control_new
 #: model:mail.message.subtype,name:account_credit_control.mt_request
 msgid "Credit control"
 msgstr ""

odoo/addons/account_credit_control/models/credit_control_line.py

@@ -289,27 +289,3 @@ class CreditControlLine(models.Model):
         if "manual_followup" in values:
             self.partner_id.write({"manual_followup": values.get("manual_followup")})
         return res
-
-    def button_schedule_activity(self):
-        ctx = self.env.context.copy()
-        ctx.update({"default_res_id": self.ids[0], "default_res_model": self._name})
-        return {
-            "type": "ir.actions.act_window",
-            "name": _("Schedule activity"),
-            "res_model": "mail.activity",
-            "binding_view_types": "form",
-            "view_mode": "form",
-            "res_id": self.activity_ids and self.activity_ids.ids[0] or False,
-            "views": [[False, "form"]],
-            "context": ctx,
-            "target": "new",
-        }
-
-    def button_credit_control_line_form(self):
-        self.ensure_one()
-        action = self.env.ref("account_credit_control.credit_control_line_action")
-        form = self.env.ref("account_credit_control.credit_control_line_form")
-        action = action.read()[0]
-        action["views"] = [(form.id, "form")]
-        action["res_id"] = self.id
-        return action

odoo/addons/account_credit_control/models/credit_control_policy.py

@@ -2,6 +2,8 @@
 # Copyright 2017 Okia SPRL (https://okia.be)
 # Copyright 2020 Manuel Calero - Tecnativa
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+from collections import defaultdict
+
 from odoo import _, api, fields, models
 from odoo.exceptions import UserError, ValidationError
 
@@ -19,6 +21,7 @@ class CreditControlPolicy(models.Model):
         comodel_name="credit.control.policy.level",
         inverse_name="policy_id",
         string="Policy Levels",
+        copy=True,
     )
     do_nothing = fields.Boolean(
         help="For policies which should not generate lines or are obsolete"
@@ -32,6 +35,11 @@ class CreditControlPolicy(models.Model):
         help="This policy will be active only for the selected accounts",
     )
     active = fields.Boolean(default=True)
+    apply_max_policy_level = fields.Boolean(
+        string="Apply max policy level",
+        help="Apply max policy lavel for one partner in a credit control run execution "
+        "to have all credit control lines on same communication level",
+    )
 
     def _move_lines_domain(self, credit_control_run):
         """Build the default domain for searching move lines"""
@@ -185,7 +193,6 @@ class CreditControlPolicy(models.Model):
 
     def _generate_credit_lines(self, credit_control_run, default_lines_vals=None):
         self.ensure_one()
-        controlling_date = credit_control_run.date
         credit_line_model = self.env["credit.control.line"]
         lines = self._get_move_lines_to_process(credit_control_run)
         manual_lines = self._lines_different_policy(lines)
@@ -195,15 +202,28 @@ class CreditControlPolicy(models.Model):
             # policy levels are sorted by level
             # so iteration is in the correct order
             create = policy_lines_generated.create_or_update_from_mv_lines
+            partner_level_dic = {}
             for level in reversed(self.level_ids):
-                level_lines = level.get_level_lines(controlling_date, lines)
-                policy_lines_generated += create(
-                    level_lines,
-                    level,
-                    controlling_date,
-                    credit_control_run.company_id,
-                    default_lines_vals=default_lines_vals,
-                )
+                level_lines = level.get_level_lines(credit_control_run.date, lines)
+                if self.apply_max_policy_level:
+                    policy_lines_generated += (
+                        self._generate_policy_lines_with_max_level(
+                            credit_control_run,
+                            policy_lines_generated,
+                            partner_level_dic,
+                            level_lines,
+                            level,
+                            default_lines_vals,
+                        )
+                    )
+                else:
+                    policy_lines_generated += create(
+                        level_lines,
+                        level,
+                        credit_control_run.date,
+                        credit_control_run.company_id,
+                        default_lines_vals=default_lines_vals,
+                    )
         if policy_lines_generated:
             report = _(
                 'Policy "<b>%(name)s</b>" has generated <b>'
@@ -223,6 +243,32 @@ class CreditControlPolicy(models.Model):
             )
         return (manual_lines, policy_lines_generated, report)
 
+    def _generate_policy_lines_with_max_level(
+        self,
+        credit_control_run,
+        policy_lines_generated,
+        partner_level_dic,
+        level_lines,
+        level,
+        default_lines_vals,
+    ):
+        AccountMoveLine = self.env["account.move.line"]
+        create = policy_lines_generated.create_or_update_from_mv_lines
+        level_dic = defaultdict(list)
+        for level_line in level_lines:
+            if level_line.partner_id.id not in partner_level_dic:
+                partner_level_dic[level_line.partner_id.id] = level
+            level_dic[partner_level_dic[level_line.partner_id.id]].append(level_line.id)
+        for level, line_ids in level_dic.items():
+            policy_lines_generated += create(
+                AccountMoveLine.browse(line_ids),
+                level,
+                credit_control_run.date,
+                credit_control_run.company_id,
+                default_lines_vals=default_lines_vals,
+            )
+        return policy_lines_generated
+
     @api.model
     def _name_search(self, name, domain=None, operator="ilike", limit=None, order=None):
         """Alternative implementation for domain on account, equivalent to

odoo/addons/account_credit_control/models/res_config_settings.py

@@ -22,3 +22,9 @@ class ResConfigSettings(models.TransientModel):
         "This setting can be overridden"
         " on partners or invoices.",
     )
+    default_apply_max_policy_level = fields.Boolean(
+        string="Apply max policy level",
+        default_model="credit.control.policy",
+        help="Apply max policy lavel for one partner in a credit control run execution "
+        "to have all credit control lines on same communication level",
+    )

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

@@ -367,7 +367,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2635413f841e91a777bf205d12ca8a06898ae17261db40ee6851e056f69764c3
+!! source digest: sha256:8d227f945da4773a09a1870bf1a39d6b943f789c4e1dc9cd3c396f12b481d985
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/credit-control/tree/17.0/account_credit_control"><img alt="OCA/credit-control" src="https://img.shields.io/badge/github-OCA%2Fcredit--control-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/credit-control-17-0/credit-control-17-0-account_credit_control"><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/credit-control&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>Account Credit Control module is a part of Financial Tools used in

odoo/addons/account_credit_control/tests/test_credit_control_run.py

@@ -136,6 +136,41 @@ class TestCreditControlRun(AccountTestInvoicingCommon):
         regex_result = re.match(report_regex, control_run.report)
         self.assertIsNotNone(regex_result)
 
+    def test_generate_credit_lines_with_max_level(self):
+        """
+        Test the method generate_credit_lines with max level group.
+        For more than one invoice with date different due we need various credit control
+        runs.
+        """
+        self.policy.apply_max_policy_level = True
+
+        invoice1 = self.invoice.copy()
+        invoice1.invoice_date = "2024-12-01"
+        invoice1.invoice_date_due = "2024-12-01"
+        invoice1.action_post()
+
+        invoice2 = self.invoice.copy()
+        invoice2.invoice_date = "2025-01-01"
+        invoice2.invoice_date_due = "2025-01-01"
+        invoice2.action_post()
+
+        control_run = self.env["credit.control.run"].create(
+            {"date": "2024-12-30", "policy_ids": [(6, 0, [self.policy.id])]}
+        )
+        control_run.with_context(lang="en_US").generate_credit_lines()
+        control_run.set_to_ready_lines()
+        # This module uses SQL queries to search records so we have to
+        # store previous control lines
+        self.env.cr.flush()
+
+        control_run = self.env["credit.control.run"].create(
+            {"date": "2025-01-30", "policy_ids": [(6, 0, [self.policy.id])]}
+        )
+        control_run.with_context(lang="en_US").generate_credit_lines()
+        self.assertEqual(len(control_run.line_ids.mapped("level")), 3)
+        # All control lines have the level 2
+        self.assertEqual(set(control_run.line_ids.mapped("level")), {2})
+
     def test_multi_credit_control_run(self):
         """
         Generate several control run

odoo/addons/account_credit_control/views/credit_control_line.xml

@@ -210,23 +210,16 @@
                 decoration-danger="state in ('error', 'email_error')"
                 decoration-muted="state == 'ignored'"
                 decoration-success="state == 'sent'"
+                open_form_view="True"
             >
-                <button
-                    name="button_credit_control_line_form"
-                    aria-label="Control Credit Line Form"
-                    title="Control Credit Line Form"
-                    type="object"
-                    icon="fa-external-link"
-                    class="oe_stat_button"
-                />
-                <field name="date" />
-                <field name="date_due" />
+                <field name="date" readonly="state != 'draft'" />
+                <field name="date_due" readonly="state != 'draft'" />
                 <field name="level" />
-                <field name="manually_overridden" />
+                <field name="manually_overridden" readonly="state != 'draft'" />
                 <field name="state" />
-                <field name="channel" />
+                <field name="channel" readonly="state != 'draft'" />
                 <field name="invoice_id" />
-                <field name="partner_id" />
+                <field name="partner_id" readonly="True" />
                 <field name="manual_followup" />
                 <field name="amount_due" widget="monetary" optional="hide" />
                 <field name="balance_due" widget="monetary" />
@@ -237,17 +230,13 @@
                 />
                 <field name="move_line_id" optional="hide" />
                 <field name="account_id" optional="hide" />
-                <field name="policy_level_id" />
-                <field name="policy_id" />
-                <field name="activity_date_deadline" />
-                <button
-                    name="button_schedule_activity"
-                    type="object"
-                    aria-label="Schedule activity"
-                    title="Schedule activity"
-                    icon="fa-clock-o"
+                <field
+                    name="policy_level_id"
+                    readonly="state != 'draft'"
+                    domain="[('policy_id', '=', policy_id)]"
                 />
-                <field name="activity_summary" />
+                <field name="policy_id" readonly="state != 'draft'" />
+                <field name="activity_ids" widget="list_activity" optional="show" />
             </tree>
         </field>
     </record>
@@ -264,7 +253,7 @@
         <field name="res_model">credit.control.line</field>
         <field name="domain" />
         <field name="binding_view_types">form</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree,form,activity</field>
         <field name="view_id" ref="credit_control_line_tree" />
         <field name="context">{'search_default_filter_draft': 1,
             'search_default_filter_to_be_sent': 1}

odoo/addons/account_credit_control/views/credit_control_policy.xml

@@ -5,73 +5,90 @@
         <field name="model">credit.control.policy</field>
         <field name="arch" type="xml">
             <form string="Credit control policy">
-                <div class="oe_button_box" name="button_box">
+                <sheet>
+                    <div class="oe_button_box" name="button_box" />
                     <widget
                         name="web_ribbon"
                         title="Archived"
-                        bg_color="bg-danger"
+                        bg_color="text-bg-danger"
                         invisible="active"
                     />
-                </div>
-                <group>
-                    <field name="name" />
-                    <field name="do_nothing" />
-                    <field name="company_id" groups="base.group_multi_company" />
-                    <field name="active" />
-                </group>
-                <notebook colspan="4">
-                    <page string="Policy levels">
-                        <field name="level_ids" nolabel="1" colspan="4">
-                            <tree>
-                                <field name="name" />
-                                <field name="level" />
-                                <field name="channel" />
-                                <field name="delay_days" />
-                                <field name="computation_mode" />
-                                <field name="email_template_id" />
-                            </tree>
-                            <form string="Policy level">
-                                <field name="name" />
-                                <notebook>
-                                    <page string="Delay Setting">
-                                        <group>
-                                            <field name="level" />
-                                            <field name="channel" />
-                                            <field name="delay_days" />
-                                            <field name="computation_mode" />
-                                        </group>
-                                    </page>
-                                    <page string="Mail and reporting">
-                                        <group colspan="2">
-                                            <field
-                                                name="email_template_id"
-                                                context="{'default_model': 'credit.control.communication'}"
-                                                colspan="2"
-                                            />
-                                            <field name="custom_text" colspan="2" />
-                                            <field
-                                                name="custom_text_after_details"
-                                                colspan="2"
-                                            />
-                                            <field
-                                                name="mail_show_invoice_detail"
-                                                invisible="channel != 'email'"
-                                                colspan="2"
-                                            />
-                                            <field
-                                                name="custom_mail_text"
-                                                colspan="2"
-                                            />
-                                        </group>
-                                    </page>
-                                </notebook>
-                            </form>
-                        </field>
-                    </page>
-                    <page string="Accounts">
-                        <field name="account_ids" nolabel="1" />
-                    </page>
-                </notebook>
+                    <group>
+                        <group>
+                            <field name="name" />
+                            <field name="do_nothing" />
+                            <field name="active" invisible="1" />
+                        </group>
+                        <group>
+                            <field name="apply_max_policy_level" />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Policy levels">
+                            <field name="level_ids" nolabel="1" colspan="4">
+                                <tree>
+                                    <field name="name" />
+                                    <field name="level" />
+                                    <field name="channel" />
+                                    <field name="delay_days" />
+                                    <field name="computation_mode" />
+                                    <field name="email_template_id" />
+                                </tree>
+                                <form string="Policy level">
+                                    <field name="name" />
+                                    <notebook>
+                                        <page string="Delay Setting">
+                                            <group>
+                                                <field name="level" />
+                                                <field name="channel" />
+                                                <field name="delay_days" />
+                                                <field name="computation_mode" />
+                                            </group>
+                                        </page>
+                                        <page string="Mail and reporting">
+                                            <group colspan="2">
+                                                <field
+                                                    name="email_template_id"
+                                                    context="{'default_model': 'credit.control.communication'}"
+                                                    colspan="2"
+                                                />
+                                                <field name="custom_text" colspan="2" />
+                                                <field
+                                                    name="custom_text_after_details"
+                                                    colspan="2"
+                                                />
+                                                <field
+                                                    name="mail_show_invoice_detail"
+                                                    invisible="channel != 'email'"
+                                                    colspan="2"
+                                                />
+                                                <field
+                                                    name="custom_mail_text"
+                                                    colspan="2"
+                                                />
+                                            </group>
+                                        </page>
+                                    </notebook>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Accounts">
+                            <field name="account_ids" nolabel="1">
+                                <tree>
+                                    <field name="code" />
+                                    <field name="name" />
+                                    <field name="account_type" />
+                                    <field name="currency_id" />
+                                    <field name="tag_ids" widget="many2many_tags" />
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
             </form>
         </field>
     </record>

odoo/addons/account_credit_control/views/res_config_settings_view.xml

@@ -38,6 +38,14 @@
                                 </div>
                             </div>
                         </setting>
+                        <setting
+                            id="default_apply_max_policy_level"
+                            help="Apply max policy level for one partner in a credit
+                            control run execution to have all credit control lines on
+                            same communication level"
+                        >
+                            <field name="default_apply_max_policy_level" />
+                        </setting>
                     </block>
                 </t>
             </xpath>

odoo/addons/account_credit_control/views/res_partner.xml

@@ -12,10 +12,7 @@
             name="context"
         >{'search_default_partner_id': active_id, 'default_partner_id': active_id}</field>
         <field name="res_model">credit.control.line</field>
-        <field name="binding_model_id" ref="base.model_res_partner" />
-        <field name="binding_view_types">form</field>
-        <field name="target">new</field>
-        <field name="view_mode">form</field>
+        <field name="view_mode">tree,form,activity</field>
     </record>
 
     <record id="partner_view_buttons" model="ir.ui.view">

{odoo_addon_account_credit_control-17.0.2.1.0.dist-info → odoo_addon_account_credit_control-17.0.2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-account_credit_control
-Version: 17.0.2.1.0
+Version: 17.0.2.2.0
 Requires-Python: >=3.10
 Requires-Dist: odoo>=17.0a,<17.1dev
 Summary: Account Credit Control
@@ -22,7 +22,7 @@ Account Credit Control
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:2635413f841e91a777bf205d12ca8a06898ae17261db40ee6851e056f69764c3
+   !! source digest: sha256:8d227f945da4773a09a1870bf1a39d6b943f789c4e1dc9cd3c396f12b481d985
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png