Merge branch '15.0' of https://github.com/OCA/hr-expense into 15.0-mi…

…g-hr_expense_substate
OCA · May 30, 2024 · 77a06a2 · 77a06a2
2 parents cab1576 + 408d487
commit 77a06a2
Show file tree

Hide file tree

Showing 27 changed files with 709 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -33,11 +33,12 @@ addon | version | maintainers | summary
 [hr_expense_journal](hr_expense_journal/) | 15.0.1.0.0 | [![dreispt](https://github.com/dreispt.png?size=30px)](https://github.com/dreispt) | Set the Journal for the payment type used to pay the expense
 [hr_expense_pay_to_vendor](hr_expense_pay_to_vendor/) | 15.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | HR Expense - Pay To Vendor
 [hr_expense_payment](hr_expense_payment/) | 15.0.1.0.1 |  | HR Expense Payment
-[hr_expense_payment_widget_amount](hr_expense_payment_widget_amount/) | 15.0.1.0.0 | [![Saran440](https://github.com/Saran440.png?size=30px)](https://github.com/Saran440) | HR Expense Payment Widget Amount
+[hr_expense_payment_widget_amount](hr_expense_payment_widget_amount/) | 15.0.1.0.1 | [![Saran440](https://github.com/Saran440.png?size=30px)](https://github.com/Saran440) | HR Expense Payment Widget Amount
 [hr_expense_petty_cash](hr_expense_petty_cash/) | 15.0.1.2.0 |  | Petty Cash
 [hr_expense_portal](hr_expense_portal/) | 15.0.1.0.0 |  | Show current expense in a website.
 [hr_expense_sequence](hr_expense_sequence/) | 15.0.1.0.0 |  | HR expense sequence
-[hr_expense_tax_adjust](hr_expense_tax_adjust/) | 15.0.1.1.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Allow to edit tax amount on expenses
+[hr_expense_sequence_option](hr_expense_sequence_option/) | 15.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Manage sequence options for hr.expense.sheet
+[hr_expense_tax_adjust](hr_expense_tax_adjust/) | 15.0.1.1.1 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Allow to edit tax amount on expenses
 [hr_expense_tier_validation](hr_expense_tier_validation/) | 15.0.1.0.0 | [![ps-tubtim](https://github.com/ps-tubtim.png?size=30px)](https://github.com/ps-tubtim) | Expense Tier Validation
 [hr_expense_widget_o2m](hr_expense_widget_o2m/) | 15.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | HR Expense one2many widget
 [sale_expense_cost_reinvoice](sale_expense_cost_reinvoice/) | 15.0.1.0.0 | [![yankinmax](https://github.com/yankinmax.png?size=30px)](https://github.com/yankinmax) | Provide cost on order line when Auto Re-invoice at cost

diff --git a/hr_expense_payment_widget_amount/README.rst b/hr_expense_payment_widget_amount/README.rst
@@ -7,7 +7,7 @@ HR Expense Payment Widget Amount
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d854380b80956eab4d851d476e9acb0f6e9968ce5f56df81675211ef452b6610
+   !! source digest: sha256:baabb0954af5f9349ba3b84334e5e814056adf580ce2d997370f9f04a5e7e464
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/hr_expense_payment_widget_amount/__manifest__.py b/hr_expense_payment_widget_amount/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "HR Expense Payment Widget Amount",
-    "version": "15.0.1.0.0",
+    "version": "15.0.1.0.1",
     "category": "Human Resources",
     "author": "Ecosoft, Odoo Community Association (OCA)",
     "license": "AGPL-3",

diff --git a/hr_expense_payment_widget_amount/models/account_move.py b/hr_expense_payment_widget_amount/models/account_move.py
@@ -16,4 +16,7 @@ def js_remove_outstanding_partial(self, partial_id):
                 [("debit_move_id", "in", self.line_ids.ids)]
             )
             partial_id = len(partial) > 1 and partial.ids or partial_id
-        return super().js_remove_outstanding_partial(partial_id)
+        res = super().js_remove_outstanding_partial(partial_id)
+        # Back state to posted (if paid)
+        self.payment_id.expense_sheet_ids.write({"state": "post"})
+        return res
diff --git a/hr_expense_payment_widget_amount/static/description/index.html b/hr_expense_payment_widget_amount/static/description/index.html
@@ -1,4 +1,3 @@
-<?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>
@@ -367,7 +366,7 @@ <h1 class="title">HR Expense Payment Widget Amount</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d854380b80956eab4d851d476e9acb0f6e9968ce5f56df81675211ef452b6610
+!! source digest: sha256:baabb0954af5f9349ba3b84334e5e814056adf580ce2d997370f9f04a5e7e464
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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_payment_widget_amount"><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_payment_widget_amount"><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&amp;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 adds a popover widget in the expense report view

diff --git a/hr_expense_sequence_option/README.rst b/hr_expense_sequence_option/README.rst
@@ -0,0 +1,90 @@
+=======================
+Expense Sequence Option
+=======================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:1048bafb6aa56f02caf22ca5c6a7080eef3185f5578ff861008eb2729226cb95
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Alpha
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :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/15.0/hr_expense_sequence_option
+    :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-15-0/hr-expense-15-0-hr_expense_sequence_option
+    :alt: Translate me on Weblate
+.. |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|
+
+This module extends module ir_sequence_option and allow you to
+provide optional sequences for hr.expense.sheet documents.
+
+.. IMPORTANT::
+   This is an alpha version, the data model and design can change at any time without warning.
+   Only for development or testing purpose, do not use in production.
+   `More details on development status <https://odoo-community.org/page/development-status>`_
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+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 to smash it by providing a detailed and welcomed
+`feedback <https://github.com/OCA/hr-expense/issues/new?body=module:%20hr_expense_sequence_option%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.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Ecosoft
+
+Contributors
+~~~~~~~~~~~~
+
+* Pimolnat Suntian <[email protected]>
+
+Maintainers
+~~~~~~~~~~~
+
+This module is maintained by the OCA.
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+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.
+
+.. |maintainer-ps-tubtim| image:: https://github.com/ps-tubtim.png?size=40px
+    :target: https://github.com/ps-tubtim
+    :alt: ps-tubtim
+
+Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
+
+|maintainer-ps-tubtim| 
+
+This module is part of the `OCA/hr-expense <https://github.com/OCA/hr-expense/tree/15.0/hr_expense_sequence_option>`_ project on GitHub.
+
+You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/hr_expense_sequence_option/__init__.py b/hr_expense_sequence_option/__init__.py
@@ -0,0 +1,3 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import models
diff --git a/hr_expense_sequence_option/__manifest__.py b/hr_expense_sequence_option/__manifest__.py
@@ -0,0 +1,17 @@
+# Copyright 2021 Ecosoft Co., Ltd. (https://ecosoft.co.th)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+{
+    "name": "Expense Sequence Option",
+    "summary": "Manage sequence options for hr.expense.sheet",
+    "version": "15.0.1.0.0",
+    "license": "AGPL-3",
+    "author": "Ecosoft, Odoo Community Association (OCA)",
+    "website": "https://github.com/OCA/hr-expense",
+    "category": "Human Resources",
+    "depends": ["base_sequence_option", "hr_expense_sequence"],
+    "demo": ["demo/hr_expense_demo_options.xml"],
+    "development_status": "Alpha",
+    "maintainers": ["ps-tubtim"],
+    "installable": True,
+}
diff --git a/hr_expense_sequence_option/demo/hr_expense_demo_options.xml b/hr_expense_sequence_option/demo/hr_expense_demo_options.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="seq_hr_expense_option_1" model="ir.sequence">
+        <field name="name">Expense Sheet: Option 1</field>
+        <field name="padding" eval="5" />
+        <field name="prefix">EX-1/</field>
+    </record>
+
+    <record id="hr_expense_sequence_option" model="ir.sequence.option">
+        <field name="name">Expense Report</field>
+        <field name="model">hr.expense.sheet</field>
+        <field name="use_sequence_option" eval="False" />
+    </record>
+
+    <record id="hr_expense_sequence_option_line_1" model="ir.sequence.option.line">
+        <field name="base_id" ref="hr_expense_sequence_option" />
+        <field name="name">EX Option 1</field>
+        <field name="filter_domain">[]</field>
+        <field
+            name="sequence_id"
+            ref="hr_expense_sequence_option.seq_hr_expense_option_1"
+        />
+    </record>
+</odoo>
diff --git a/hr_expense_sequence_option/i18n/hr_expense_sequence_option.pot b/hr_expense_sequence_option/i18n/hr_expense_sequence_option.pot
@@ -0,0 +1,34 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* hr_expense_sequence_option
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 15.0\n"
+"Report-Msgid-Bugs-To: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: hr_expense_sequence_option
+#: model:ir.model.fields,field_description:hr_expense_sequence_option.field_ir_sequence_option__model
+msgid "Apply On Model"
+msgstr ""
+
+#. module: hr_expense_sequence_option
+#: model:ir.model,name:hr_expense_sequence_option.model_hr_expense_sheet
+msgid "Expense Report"
+msgstr ""
+
+#. module: hr_expense_sequence_option
+#: model:ir.model,name:hr_expense_sequence_option.model_ir_sequence_option
+msgid "Sequence Option Base Model"
+msgstr ""
+
+#. module: hr_expense_sequence_option
+#: model:ir.model.fields.selection,name:hr_expense_sequence_option.selection__ir_sequence_option__model__hr_expense_sheet
+msgid "hr.expense.sheet"
+msgstr ""
diff --git a/hr_expense_sequence_option/models/__init__.py b/hr_expense_sequence_option/models/__init__.py
@@ -0,0 +1,4 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from . import hr_expense_sheet
+from . import sequence_option
diff --git a/hr_expense_sequence_option/models/hr_expense_sheet.py b/hr_expense_sequence_option/models/hr_expense_sheet.py
@@ -0,0 +1,15 @@
+# Copyright 2021 Ecosoft Co., Ltd. (https://ecosoft.co.th)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import api, models
+
+
+class HrExpenseSheet(models.Model):
+    _inherit = "hr.expense.sheet"
+
+    @api.model
+    def create(self, vals):
+        seq = self.env["ir.sequence.option.line"].get_sequence(self.new(vals))
+        self = self.with_context(sequence_option_id=seq.id)
+        res = super().create(vals)
+        return res
diff --git a/hr_expense_sequence_option/models/sequence_option.py b/hr_expense_sequence_option/models/sequence_option.py
@@ -0,0 +1,13 @@
+# Copyright 2021 Ecosoft Co., Ltd. (https://ecosoft.co.th)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+
+from odoo import fields, models
+
+
+class IrSequenceOption(models.Model):
+    _inherit = "ir.sequence.option"
+
+    model = fields.Selection(
+        selection_add=[("hr.expense.sheet", "hr.expense.sheet")],
+        ondelete={"hr.expense.sheet": "cascade"},
+    )
diff --git a/hr_expense_sequence_option/readme/CONTRIBUTORS.rst b/hr_expense_sequence_option/readme/CONTRIBUTORS.rst
@@ -0,0 +1 @@
+* Pimolnat Suntian <[email protected]>
diff --git a/hr_expense_sequence_option/readme/DESCRIPTION.rst b/hr_expense_sequence_option/readme/DESCRIPTION.rst
@@ -0,0 +1,2 @@
+This module extends module ir_sequence_option and allow you to
+provide optional sequences for hr.expense.sheet documents.
diff --git a/hr_expense_sequence_option/static/description/icon.png b/hr_expense_sequence_option/static/description/icon.png