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 <https://github.com/OCA/hr-expense/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 <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_substate%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_substate%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
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 <https://github.com/OCA/hr-expense/tree/14.0/hr_expense_substate>`_ project on GitHub.
+This module is part of the `OCA/hr-expense <https://github.com/OCA/hr-expense/tree/15.0/hr_expense_substate>`_ 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 @@
<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 <t t-out="object.employee_id.name or 'Requester'" />,<br />
+ This email is to inform that your expense report <t
+ t-out="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
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 @@
-<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.15.1: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils: https://docutils.sourceforge.io/" />
<title>Expense Report Sub State</title>
<style type="text/css">
/*
:Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
:Copyright: This stylesheet has been placed in the public domain.
Default cascading style sheet for the HTML output of Docutils.
-See http://docutils.sf.net/docs/howto/html-stylesheets.html for how to
+See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
customize this style sheet.
*/
@@ -366,9 +365,11 @@ <h1 class="title">Expense Report Sub State</h1>
<!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!! source digest: sha256:3a6399e3cc32fd585364d03e868abca9577218a017d7ccaf63675086dec82a30
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" 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" 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" href="https://github.com/OCA/hr-expense/tree/14.0/hr_expense_substate"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/hr-expense-14-0/hr-expense-14-0-hr_expense_substate"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/289/14.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>This module allows to add a substate to expense report.
+<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/hr-expense/tree/15.0/hr_expense_substate"><img alt="OCA/hr-expense" src="https://img.shields.io/badge/github-OCA%2Fhr--expense-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/hr-expense-15-0/hr-expense-15-0-hr_expense_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/hr-expense&target_branch=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p>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
@@ -376,18 +377,18 @@ <h1 class="title">Expense Report Sub State</h1>
<p><strong>Table of contents</strong></p>
<div class="contents local topic" id="contents">
<ul class="simple">
-<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
-<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="toc-entry-1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="toc-entry-2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="toc-entry-3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="toc-entry-4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="toc-entry-5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="toc-entry-6">Maintainers</a></li>
</ul>
</li>
</ul>
</div>
<div class="section" id="usage">
-<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-1">Usage</a></h1>
<ol class="arabic simple">
<li><dl class="first docutils">
<dt>Go to ** Settings > Technical > Database Structure ** and Add “Base substate”.</dt>
@@ -401,35 +402,35 @@ <h1><a class="toc-backref" href="#id1">Usage</a></h1>
</ol>
</div>
<div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h1>
<p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/hr-expense/issues">GitHub Issues</a>.
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
-<a class="reference external" href="https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_substate%0Aversion:%2014.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+<a class="reference external" href="https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_substate%0Aversion:%2015.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
<p>Do not contact contributors directly about support or help with technical issues.</p>
</div>
<div class="section" id="credits">
-<h1><a class="toc-backref" href="#id3">Credits</a></h1>
+<h1><a class="toc-backref" href="#toc-entry-3">Credits</a></h1>
<div class="section" id="authors">
-<h2><a class="toc-backref" href="#id4">Authors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-4">Authors</a></h2>
<ul class="simple">
<li>Ecosoft</li>
</ul>
</div>
<div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
<ul class="simple">
<li>Pimolnat Suntian <<a class="reference external" href="mailto:pimolnats@ecosoft.co.th">pimolnats@ecosoft.co.th</a>></li>
</ul>
</div>
<div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h2>
<p>This module is maintained by the OCA.</p>
<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
<p>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.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-expense/tree/14.0/hr_expense_substate">OCA/hr-expense</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/hr-expense/tree/15.0/hr_expense_substate">OCA/hr-expense</a> project on GitHub.</p>
<p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
</div>
</div>
diff --git a/hr_expense_substate/views/hr_expense_views.xml b/hr_expense_substate/views/hr_expense_views.xml
index 74f6ba9b2..d03eeca51 100644
--- a/hr_expense_substate/views/hr_expense_views.xml
+++ b/hr_expense_substate/views/hr_expense_views.xml
@@ -13,12 +13,14 @@
<field name="model">hr.expense.sheet</field>
<field name="inherit_id" ref="hr_expense.view_hr_expense_sheet_form" />
<field name="arch" type="xml">
- <xpath expr="//header/field[@name='state']" position="before">
- <field
- name="substate_id"
- widget="statusbar"
- options="{'clickable': '1',}"
- />
+ <xpath expr="//header" position="after">
+ <header name="substate">
+ <field
+ name="substate_id"
+ widget="statusbar"
+ options="{'clickable': '1',}"
+ />
+ </header>
</xpath>
</field>
</record>