Skip to content

Commit

Permalink
[FIX] base_substate: track template on substate
Browse files Browse the repository at this point in the history
  • Loading branch information
Saran440 committed Oct 25, 2023
1 parent 20d6321 commit e3863e4
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 20 deletions.
1 change: 1 addition & 0 deletions base_substate/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
from . import base_substate
from . import base_substate_mixin
from . import mail_thread
17 changes: 0 additions & 17 deletions base_substate/models/base_substate_mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
25 changes: 25 additions & 0 deletions base_substate/models/mail_thread.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2023 Ecosoft Co., Ltd. (http://ecosoft.co.th)
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).

from odoo import models


class MailThread(models.AbstractModel):
_inherit = "mail.thread"

def _track_template(self, changes):
res = super()._track_template(changes)
first_rec = self[0]
if "substate_id" in changes and first_rec.substate_id.mail_template_id:
res["substate_id"] = (
first_rec.substate_id.mail_template_id,
{
"composition_mode": "comment",
"auto_delete_message": True,
"subtype_id": self.env["ir.model.data"]._xmlid_to_res_id(
"mail.mt_note"
),
"email_layout_xmlid": "mail.mail_notification_light",
},
)
return res
2 changes: 1 addition & 1 deletion base_substate/tests/sale_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@


class SaleTest(models.Model, TestMixin):
_inherit = "base.substate.mixin"
_name = "base.substate.test.sale"
_inherit = ["mail.thread", "base.substate.mixin"]
_description = "Base substate Test Model"

name = fields.Char(required=True)
Expand Down
14 changes: 12 additions & 2 deletions base_substate/tests/test_base_substate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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,
}
)

Expand Down Expand Up @@ -106,12 +115,13 @@ def test_sale_order_substate(self):
)
self.assertTrue(so_test1.state == "draft")
self.assertTrue(so_test1.substate_id == self.substate_under_negotiation)

# 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)

# Test track template
res = so_test1._track_template({"substate_id"})
self.assertEqual(res["substate_id"][0], self.mail_template)
# Test that substate_id is set to false if
# there is not substate corresponding to state
so_test1.button_cancel()
Expand Down

0 comments on commit e3863e4

Please sign in to comment.