[IMP] account_credit_control: Compute messages as discussion and impr…

…ove multicompany support

account_credit_control/models/__init__.py

@@ -6,6 +6,7 @@
 from . import credit_control_policy
 from . import credit_control_run
 from . import mail_mail
+from . import mail_message
 from . import res_company
 from . import res_partner
 from . import res_config_settings

account_credit_control/models/credit_control_communication.py

@@ -101,7 +101,9 @@ def get_email(self):
 
     @api.model
     @api.returns("credit.control.line")
-    def _get_credit_lines(self, line_ids, partner_id, level_id, currency_id):
+    def _get_credit_lines(
+        self, line_ids, partner_id, level_id, currency_id, company_id
+    ):
         """ Return credit lines related to a partner and a policy level """
         cr_line_obj = self.env["credit.control.line"]
         cr_lines = cr_line_obj.search(
@@ -110,6 +112,7 @@ def _get_credit_lines(self, line_ids, partner_id, level_id, currency_id):
                 ("partner_id", "=", partner_id),
                 ("policy_level_id", "=", level_id),
                 ("currency_id", "=", currency_id),
+                ("company_id", "=", company_id),
             ]
         )
         return cr_lines
@@ -124,7 +127,8 @@ def _aggregate_credit_lines(self, lines):
         sql = (
             "SELECT distinct partner_id, policy_level_id, "
             " credit_control_line.currency_id, "
-            " credit_control_policy_level.level"
+            " credit_control_policy_level.level, "
+            " credit_control_line.company_id "
             " FROM credit_control_line JOIN credit_control_policy_level "
             "   ON (credit_control_line.policy_level_id = "
             "       credit_control_policy_level.id)"
@@ -135,7 +139,6 @@ def _aggregate_credit_lines(self, lines):
         cr = self.env.cr
         cr.execute(sql, (tuple(lines.ids),))
         res = cr.dictfetchall()
-        company_currency = self.env.user.company_id.currency_id
         datas = []
         for group in res:
             data = {}
@@ -144,11 +147,15 @@ def _aggregate_credit_lines(self, lines):
                 group["partner_id"],
                 group["policy_level_id"],
                 group["currency_id"],
+                group["company_id"],
             )
+            company_currency = self.env["res.company"].browse(
+                group["company_id"]).currency_id
             data["credit_control_line_ids"] = [(6, 0, level_lines.ids)]
             data["partner_id"] = group["partner_id"]
             data["policy_level_id"] = group["policy_level_id"]
             data["currency_id"] = group["currency_id"] or company_currency.id
+            data["company_id"] = group["company_id"]
             datas.append(data)
         return datas
 

account_credit_control/models/credit_control_run.py

@@ -70,6 +70,8 @@ def _default_policies(self):
         comodel_name="res.company",
         string="Company",
         default=lambda self: self.env.company,
+        readonly=True,
+        states={"draft": [("readonly", False)]},
         index=True,
     )
 

account_credit_control/models/mail_message.py

@@ -0,0 +1,22 @@
+# Copyright 2020 Creu Blanca
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models
+
+
+class MailMessage(models.Model):
+    _inherit = 'mail.message'
+
+    def message_format(self):
+        result = super().message_format()
+        credit_control = self.env['ir.model.data'].xmlid_to_res_id(
+            'account_credit_control.mt_request'
+        )
+        for message in result:
+            message.update({
+                'is_discussion': message['is_discussion'] or (
+                    message['subtype_id'] and
+                    message['subtype_id'][0] == credit_control
+                )
+            })
+        return result

account_credit_control/readme/CONTRIBUTORS.rst

@@ -13,3 +13,5 @@
   * Ernesto Tejeda
   * Pedro M. Baeza
   * Jairo Llopis
+
+* Enric Tobella <[email protected]>

account_credit_control/views/credit_control_run.xml

@@ -66,6 +66,7 @@
                     </div>
                     <group>
                         <field name="date" />
+                        <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" />
                         <field name="hide_change_state_button" invisible="1" />
                     </group>
                     <notebook>