Merge PR #736 into 16.0

Signed-off-by pedrobaeza

Author: OCA-git-bot

base_substate/README.rst

@@ -7,7 +7,7 @@ Base Sub State
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:79bcb3dc0e2500c10c934339ae0ccb057746e55563ec6f2e5617604e7a9df501
+   !! source digest: sha256:cde74a0197c2b71ab368c3fec83af2191d927a0931edcfe9614755d817ef7af9
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

base_substate/__manifest__.py

@@ -5,7 +5,7 @@
     "name": "Base Sub State",
     "version": "16.0.1.0.0",
     "category": "Tools",
-    "author": "Akretion, " "Odoo Community Association (OCA)",
+    "author": "Akretion, Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/server-ux",
     "license": "AGPL-3",
     "depends": ["base", "mail"],

base_substate/models/base_substate_mixin.py

@@ -28,23 +28,6 @@ def check_substate_id_value(self):
                     }
                 )
 
-    def _track_template(self, tracking):
-        res = super()._track_template(tracking)
-        first_rec = self[0]
-        changes, tracking_value_ids = tracking[first_rec.id]
-        if "substate_id" in changes and first_rec.substate_id.mail_template_id:
-            res["substate_id"] = (
-                first_rec.substate_id.mail_template_id,
-                {
-                    "auto_delete_message": True,
-                    "subtype_id": self.env["ir.model.data"].xmlid_to_res_id(
-                        "mail.mt_note"
-                    ),
-                    "notif_layout": "mail.mail_notification_light",
-                },
-            )
-        return res
-
     def _get_default_substate_id(self, state_val=False):
         """Gives default substate_id"""
         search_domain = self._get_default_substate_domain(state_val)
@@ -116,6 +99,19 @@ def _update_before_write_create(self, values):
         if values.get(state_field) and not values.get("substate_id"):
             state_val = values.get(state_field)
             values["substate_id"] = self._get_default_substate_id(state_val)
+        # Send mail if substate has mail template
+        if values.get("substate_id"):
+            substate = self.env["base.substate"].browse(values["substate_id"])
+            if (
+                hasattr(self, "message_post_with_template")
+                and substate.mail_template_id
+            ):
+                self.message_post_with_template(
+                    substate.mail_template_id.id,
+                    subtype_id=self.env["ir.model.data"]._xmlid_to_res_id(
+                        "mail.mt_note"
+                    ),
+                )
         return values
 
     def write(self, values):

base_substate/static/description/index.html

@@ -367,7 +367,7 @@ <h1 class="title">Base Sub State</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:79bcb3dc0e2500c10c934339ae0ccb057746e55563ec6f2e5617604e7a9df501
+!! source digest: sha256:cde74a0197c2b71ab368c3fec83af2191d927a0931edcfe9614755d817ef7af9
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/server-ux/tree/16.0/base_substate"><img alt="OCA/server-ux" src="https://img.shields.io/badge/github-OCA%2Fserver--ux-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/server-ux-16-0/server-ux-16-0-base_substate"><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/server-ux&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module provide abstract models to manage customizable

base_substate/tests/sale_test.py

@@ -6,8 +6,8 @@
 
 
 class SaleTest(models.Model, TestMixin):
-    _inherit = "base.substate.mixin"
     _name = "base.substate.test.sale"
+    _inherit = ["base.substate.mixin", "mail.thread"]
     _description = "Base substate Test Model"
 
     name = fields.Char(required=True)

base_substate/tests/test_base_substate.py

@@ -17,6 +17,14 @@ def setUpClass(cls):
         cls.substate_test_sale = cls.env["base.substate.test.sale"]
         cls.substate_test_sale_line = cls.env["base.substate.test.sale.line"]
 
+        cls.mail_template = cls.env["mail.template"].create(
+            {
+                "name": "Waiting for legal documents",
+                "model_id": cls.substate_test_sale.id,
+                "subject": "Test Email Substate",
+            }
+        )
+
         cls.base_substate = cls.env["base.substate.mixin"]
         cls.substate_type = cls.env["base.substate.type"]
 
@@ -68,6 +76,7 @@ def setUpClass(cls):
                 "name": "Waiting for legal documents",
                 "sequence": 2,
                 "target_state_value_id": cls.substate_val_sale.id,
+                "mail_template_id": cls.mail_template.id,
             }
         )
 
@@ -106,12 +115,17 @@ def test_sale_order_substate(self):
         )
         self.assertTrue(so_test1.state == "draft")
         self.assertTrue(so_test1.substate_id == self.substate_under_negotiation)
-
+        self.assertNotIn(
+            self.mail_template.subject, so_test1.message_ids.mapped("subject")
+        )
         # Test that validation of sale order change substate_id
         so_test1.button_confirm()
         self.assertTrue(so_test1.state == "sale")
         self.assertTrue(so_test1.substate_id == self.substate_wait_docs)
-
+        # Check some message_ids are created and sent email
+        self.assertIn(
+            self.mail_template.subject, so_test1.message_ids.mapped("subject")
+        )
         # Test that substate_id is set to false if
         # there is not substate corresponding to state
         so_test1.button_cancel()