From cab1576838fcd1d9c84dc25c7d01b14151c6daf3 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Tue, 24 Oct 2023 13:16:40 +0700 Subject: [PATCH] [FIX] tracking mail template --- hr_expense_substate/README.rst | 25 ++++++----- hr_expense_substate/__manifest__.py | 2 +- ...hr_expense_substate_mail_template_data.xml | 8 ++-- .../demo/hr_expense_substate_demo.xml | 3 -- hr_expense_substate/models/hr_expense.py | 2 +- hr_expense_substate/readme/DESCRIPTION.rst | 2 +- .../static/description/index.html | 43 ++++++++++--------- .../views/hr_expense_views.xml | 14 +++--- 8 files changed, 52 insertions(+), 47 deletions(-) diff --git a/hr_expense_substate/README.rst b/hr_expense_substate/README.rst index 64bf5d730..1ea309d39 100644 --- a/hr_expense_substate/README.rst +++ b/hr_expense_substate/README.rst @@ -2,10 +2,13 @@ Expense Report Sub State ======================== -.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:3a6399e3cc32fd585364d03e868abca9577218a017d7ccaf63675086dec82a30 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png :target: https://odoo-community.org/page/development-status @@ -14,18 +17,18 @@ Expense Report Sub State :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html :alt: License: AGPL-3 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github - :target: https://github.com/OCA/hr-expense/tree/14.0/hr_expense_substate + :target: https://github.com/OCA/hr-expense/tree/15.0/hr_expense_substate :alt: OCA/hr-expense .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/hr-expense-14-0/hr-expense-14-0-hr_expense_substate + :target: https://translation.odoo-community.org/projects/hr-expense-15-0/hr-expense-15-0-hr_expense_substate :alt: Translate me on Weblate -.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/289/14.0 - :alt: Try me on Runbot +.. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png + :target: https://runboat.odoo-community.org/builds?repo=OCA/hr-expense&target_branch=15.0 + :alt: Try me on Runboat -|badge1| |badge2| |badge3| |badge4| |badge5| +|badge1| |badge2| |badge3| |badge4| |badge5| -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 @@ -51,8 +54,8 @@ Bug Tracker Bugs are tracked on `GitHub Issues `_. In case of trouble, please check there if your issue has already been reported. -If you spotted it first, help us smashing it by providing a detailed and welcomed -`feedback `_. +If you spotted it first, help us to smash it by providing a detailed and welcomed +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -82,6 +85,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. -This module is part of the `OCA/hr-expense `_ project on GitHub. +This module is part of the `OCA/hr-expense `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. 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..a007ce297 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,14 @@ Verified - Your expense report ${object.name} is verified + Your expense report {{ object.name }} is verified
- Dear ${object.employee_id.name or 'requester'},
- This email is to inform that your expense report ${object.name} was verified by approver team. + Dear ,
+ This email is to inform that your expense report was verified by approver team.

Thank you,
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 @@ To Verify 1 - Checked 2 - Verified @@ -21,6 +19,5 @@ name="mail_template_id" ref="hr_expense_substate.mail_template_data_hr_expense_substate_verified" /> - 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 diff --git a/hr_expense_substate/static/description/index.html b/hr_expense_substate/static/description/index.html index 57f154e05..27ad97ae4 100644 --- a/hr_expense_substate/static/description/index.html +++ b/hr_expense_substate/static/description/index.html @@ -1,20 +1,19 @@ - - + Expense Report Sub State