From 32263ec703d0f916a473e6322be9a189b9368942 Mon Sep 17 00:00:00 2001
From: Saran440 <saranl@ecosoft.co.th>
Date: Tue, 24 Oct 2023 13:16:40 +0700
Subject: [PATCH] [FIX] tracking mail template

---
 hr_expense_substate/__manifest__.py                         | 2 +-
 .../data/hr_expense_substate_mail_template_data.xml         | 6 +++---
 hr_expense_substate/demo/hr_expense_substate_demo.xml       | 3 ---
 hr_expense_substate/models/hr_expense.py                    | 2 +-
 hr_expense_substate/readme/DESCRIPTION.rst                  | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/hr_expense_substate/__manifest__.py b/hr_expense_substate/__manifest__.py
index f6a692ce3..d32420a9d 100644
--- a/hr_expense_substate/__manifest__.py
+++ b/hr_expense_substate/__manifest__.py
@@ -4,7 +4,7 @@
 {
     "name": "Expense Report Sub State",
     "version": "15.0.1.0.0",
-    "category": "Tools",
+    "category": "Human Resources",
     "author": "Ecosoft,Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/hr-expense",
     "license": "AGPL-3",
diff --git a/hr_expense_substate/data/hr_expense_substate_mail_template_data.xml b/hr_expense_substate/data/hr_expense_substate_mail_template_data.xml
index 9e4f79c46..093b3ce22 100644
--- a/hr_expense_substate/data/hr_expense_substate_mail_template_data.xml
+++ b/hr_expense_substate/data/hr_expense_substate_mail_template_data.xml
@@ -3,12 +3,12 @@
     <record id="mail_template_data_hr_expense_substate_verified" model="mail.template">
         <field name="name">Verified</field>
         <field name="model_id" ref="hr_expense.model_hr_expense_sheet" />
-        <field name="subject">Your expense report ${object.name} is verified</field>
+        <field name="subject">Your expense report {{ object.name }} is verified</field>
         <field name="use_default_to" eval="True" />
         <field name="body_html" type="html">
             <div>
-    Dear ${object.employee_id.name or 'requester'},<br />
-    This email is to inform that your expense report ${object.name} was verified by approver team.
+    Dear {{ object.employee_id.name or 'Requester' }},<br />
+    This email is to inform that your expense report {{ object.name }} was verified by approver team.
        <br /><br />
     Thank you,
     <br />
diff --git a/hr_expense_substate/demo/hr_expense_substate_demo.xml b/hr_expense_substate/demo/hr_expense_substate_demo.xml
index ca4815265..980c491fc 100644
--- a/hr_expense_substate/demo/hr_expense_substate_demo.xml
+++ b/hr_expense_substate/demo/hr_expense_substate_demo.xml
@@ -5,13 +5,11 @@
         <field name="name">To Verify</field>
         <field name="sequence">1</field>
         <field name="target_state_value_id" ref="target_state_value_submit" />
-        <field name="active" eval="False" />
     </record>
     <record id="base_substate_checked" model="base.substate">
         <field name="name">Checked</field>
         <field name="sequence">2</field>
         <field name="target_state_value_id" ref="target_state_value_submit" />
-        <field name="active" eval="False" />
     </record>
     <record id="base_substate_verified" model="base.substate">
         <field name="name">Verified</field>
@@ -21,6 +19,5 @@
             name="mail_template_id"
             ref="hr_expense_substate.mail_template_data_hr_expense_substate_verified"
         />
-        <field name="active" eval="False" />
     </record>
 </odoo>
diff --git a/hr_expense_substate/models/hr_expense.py b/hr_expense_substate/models/hr_expense.py
index 1a7a804c9..5b5da43f2 100644
--- a/hr_expense_substate/models/hr_expense.py
+++ b/hr_expense_substate/models/hr_expense.py
@@ -14,6 +14,6 @@ class BaseSubstateType(models.Model):
 
 
 class HrExpenseSheet(models.Model):
-    _inherit = ["hr.expense.sheet", "base.substate.mixin"]
     _name = "hr.expense.sheet"
+    _inherit = ["hr.expense.sheet", "base.substate.mixin"]
     _state_field = "state"
diff --git a/hr_expense_substate/readme/DESCRIPTION.rst b/hr_expense_substate/readme/DESCRIPTION.rst
index 8eab193a1..77fefd863 100644
--- a/hr_expense_substate/readme/DESCRIPTION.rst
+++ b/hr_expense_substate/readme/DESCRIPTION.rst
@@ -1,4 +1,4 @@
-This module allows to add a substate to expense report.
+This module allows to add a substate to an expense report.
 For each expense report state you can define a substate.
 We this module you can define substate which allow you to extend expense report workflow.
 For example, you can add substate "To Verify" if