diff --git a/hr_expense_cancel_confirm/__manifest__.py b/hr_expense_cancel_confirm/__manifest__.py index 0d5febf7a..9cf1f32cf 100644 --- a/hr_expense_cancel_confirm/__manifest__.py +++ b/hr_expense_cancel_confirm/__manifest__.py @@ -11,6 +11,7 @@ "depends": ["base_cancel_confirm", "hr_expense"], "data": [ "data/config_parameter.xml", + "views/hr_expense_views.xml", ], "installable": True, "maintainers": ["Saran440"], diff --git a/hr_expense_cancel_confirm/model/hr_expense.py b/hr_expense_cancel_confirm/model/hr_expense.py index bb84daf10..55bcaa60b 100644 --- a/hr_expense_cancel_confirm/model/hr_expense.py +++ b/hr_expense_cancel_confirm/model/hr_expense.py @@ -10,10 +10,10 @@ class HrExpenseSheet(models.Model): _has_cancel_reason = "optional" # ["no", "optional", "required"] - def action_unpost(self): + def action_unpost_confirm(self): if not self.filtered("cancel_confirm"): return self.open_cancel_confirm_wizard() - return super().action_unpost() + self.action_unpost() def action_sheet_move_create(self): """Clear reason cancel when post journal entries on expense""" diff --git a/hr_expense_cancel_confirm/static/description/index.html b/hr_expense_cancel_confirm/static/description/index.html index 7f2e15b71..8397bbd9a 100644 --- a/hr_expense_cancel_confirm/static/description/index.html +++ b/hr_expense_cancel_confirm/static/description/index.html @@ -1,4 +1,3 @@ - @@ -9,10 +8,11 @@ /* :Author: David Goodger (goodger@python.org) -:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $ +:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $ :Copyright: This stylesheet has been placed in the public domain. Default cascading style sheet for the HTML output of Docutils. +Despite the name, some widely supported CSS2 features are used. See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to customize this style sheet. @@ -275,7 +275,7 @@ margin-left: 2em ; margin-right: 2em } -pre.code .ln { color: grey; } /* line numbers */ +pre.code .ln { color: gray; } /* line numbers */ pre.code, code { background-color: #eeeeee } pre.code .comment, code .comment { color: #5C6576 } pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold } @@ -301,7 +301,7 @@ span.pre { white-space: pre } -span.problematic { +span.problematic, pre.problematic { color: red } span.section-subtitle { @@ -417,7 +417,9 @@

Contributors

Maintainers

This module is maintained by the OCA.

-Odoo Community Association + +Odoo Community Association +

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.

diff --git a/hr_expense_cancel_confirm/views/hr_expense_views.xml b/hr_expense_cancel_confirm/views/hr_expense_views.xml new file mode 100644 index 000000000..263591049 --- /dev/null +++ b/hr_expense_cancel_confirm/views/hr_expense_views.xml @@ -0,0 +1,25 @@ + + + + + + hr.expense.sheet.form.inherit + hr.expense.sheet + + + + {'invisible': 1} + + +