From eb51d3b12fbcdf43e61242ebb108d55a4d0f65ae Mon Sep 17 00:00:00 2001 From: Saran440 Date: Tue, 14 Mar 2023 09:45:45 +0700 Subject: [PATCH 01/11] [15.0][ADD] hr_expense_tax_adjust --- hr_expense_tax_adjust/README.rst | 101 ++++ hr_expense_tax_adjust/__init__.py | 3 + hr_expense_tax_adjust/__manifest__.py | 17 + hr_expense_tax_adjust/models/__init__.py | 3 + hr_expense_tax_adjust/models/hr_expense.py | 134 ++++++ hr_expense_tax_adjust/readme/CONTRIBUTORS.rst | 4 + hr_expense_tax_adjust/readme/DESCRIPTION.rst | 2 + hr_expense_tax_adjust/readme/USAGE.rst | 7 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 444 ++++++++++++++++++ hr_expense_tax_adjust/tests/__init__.py | 3 + .../tests/test_hr_expense_tax_adjust.py | 157 +++++++ .../views/hr_expense_views.xml | 12 + 13 files changed, 887 insertions(+) create mode 100644 hr_expense_tax_adjust/README.rst create mode 100644 hr_expense_tax_adjust/__init__.py create mode 100644 hr_expense_tax_adjust/__manifest__.py create mode 100644 hr_expense_tax_adjust/models/__init__.py create mode 100644 hr_expense_tax_adjust/models/hr_expense.py create mode 100644 hr_expense_tax_adjust/readme/CONTRIBUTORS.rst create mode 100644 hr_expense_tax_adjust/readme/DESCRIPTION.rst create mode 100644 hr_expense_tax_adjust/readme/USAGE.rst create mode 100644 hr_expense_tax_adjust/static/description/icon.png create mode 100644 hr_expense_tax_adjust/static/description/index.html create mode 100644 hr_expense_tax_adjust/tests/__init__.py create mode 100644 hr_expense_tax_adjust/tests/test_hr_expense_tax_adjust.py create mode 100644 hr_expense_tax_adjust/views/hr_expense_views.xml diff --git a/hr_expense_tax_adjust/README.rst b/hr_expense_tax_adjust/README.rst new file mode 100644 index 000000000..8cfe6f6ed --- /dev/null +++ b/hr_expense_tax_adjust/README.rst @@ -0,0 +1,101 @@ +====================== +Expense Tax Adjustment +====================== + +.. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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_tax_adjust + :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_tax_adjust + :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/15.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows users to edit taxes on the Expense to ensure accurate accounting entries in case of rounding differences. +Users must have the "Show Accounting Features - Readonly" access rights to edit the necessary fields for tax adjustment. + +.. 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 `_ + +**Table of contents** + +.. contents:: + :local: + +Usage +===== + +To use this module, you can follow these steps: + +#. Go to *Expenses > My Expenses > My Expenses to Report > Create*. +#. Choose a product from the list and add applicable taxes. +#. The "Price Tax" field will automatically calculate and display the total price including taxes. +#. If the calculated price tax is incorrect, edit the value to reflect the correct amount. +#. Follow the normal process for submitting and posting the journal entry. + +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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +~~~~~~~ + +* Ecosoft + +Contributors +~~~~~~~~~~~~ + +* `Ecosoft `__: + + * Pimolnat Suntian + * Saran Lim. + +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 `__: + +|maintainer-ps-tubtim| + +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_tax_adjust/__init__.py b/hr_expense_tax_adjust/__init__.py new file mode 100644 index 000000000..69f7babdf --- /dev/null +++ b/hr_expense_tax_adjust/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import models diff --git a/hr_expense_tax_adjust/__manifest__.py b/hr_expense_tax_adjust/__manifest__.py new file mode 100644 index 000000000..00c8fa8ab --- /dev/null +++ b/hr_expense_tax_adjust/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2023 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Expense Tax Adjustment", + "version": "15.0.1.0.0", + "author": "Ecosoft, Odoo Community Association (OCA)", + "summary": "Allow to edit tax amount on expenses", + "website": "https://github.com/OCA/hr-expense", + "license": "AGPL-3", + "depends": ["hr_expense"], + "category": "Human Resources/Expenses", + "data": ["views/hr_expense_views.xml"], + "installable": True, + "maintainers": ["ps-tubtim"], + "development_status": "Alpha", +} diff --git a/hr_expense_tax_adjust/models/__init__.py b/hr_expense_tax_adjust/models/__init__.py new file mode 100644 index 000000000..ced2eb18d --- /dev/null +++ b/hr_expense_tax_adjust/models/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from . import hr_expense diff --git a/hr_expense_tax_adjust/models/hr_expense.py b/hr_expense_tax_adjust/models/hr_expense.py new file mode 100644 index 000000000..5cec4c2c9 --- /dev/null +++ b/hr_expense_tax_adjust/models/hr_expense.py @@ -0,0 +1,134 @@ +# Copyright 2023 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class HrExpense(models.Model): + _inherit = "hr.expense" + + price_tax = fields.Float( + compute="_compute_amount_price_tax", + store=True, + readonly=False, + ) + tax_adjust = fields.Boolean( + copy=False, + help="trigger line with adjust tax", + ) + + def _get_expense_price_tax(self): + """Common function get price tax""" + amount = self.unit_amount if self.product_has_cost else self.total_amount + taxes = self.tax_ids.compute_all( + amount, + self.currency_id, + self.quantity, + self.product_id, + self.employee_id.user_id.partner_id, + ) + return sum(t.get("amount", 0.0) for t in taxes.get("taxes", [])) + + @api.depends("currency_id", "tax_ids", "total_amount", "unit_amount", "quantity") + def _compute_amount_price_tax(self): + for expense in self.filtered(lambda l: not l.tax_adjust): + price_tax = expense._get_expense_price_tax() + expense.price_tax = price_tax + + @api.onchange("price_tax", "tax_ids", "total_amount", "unit_amount", "quantity") + def _onchange_price_tax(self): + for expense in self: + price_tax = expense._get_expense_price_tax() + expense.tax_adjust = expense.price_tax != price_tax + + @api.depends("quantity", "unit_amount", "tax_ids", "currency_id", "price_tax") + def _compute_amount(self): + """Update the total amount to include any applicable taxes + for products that have a cost. In the core Odoo implementation, + this adjustment is invisible. This function supports making the adjustment visible + by overwriting the relevant field. + """ + res = super()._compute_amount() + for expense in self.filtered(lambda l: l.unit_amount and l.tax_adjust): + if expense.tax_ids.filtered(lambda l: not l.price_include): + price_tax = expense._get_expense_price_tax() + expense.total_amount -= price_tax - expense.price_tax + return res + + def _get_expense_balance(self, amount, account_date): + return self.currency_id._convert( + amount, self.company_id.currency_id, self.company_id, account_date + ) + + def _get_account_move_line_values(self): + """Adjust tax amount in accounting move line""" + move_line_values_by_expense = super()._get_account_move_line_values() + for expense in self.filtered(lambda l: l.tax_adjust): + account_src = expense._get_expense_account_source() + account_dst = expense._get_expense_account_destination() + account_date = ( + expense.sheet_id.accounting_date + or expense.date + or fields.Date.context_today(expense) + ) + # Find price diff origin and adjust + price_tax = expense._get_expense_price_tax() + diff_price_tax_currency = price_tax - expense.price_tax + diff_price_tax = expense._get_expense_balance( + diff_price_tax_currency, account_date + ) + first_line_tax = False + # NOTE: Core odoo value `move_line_values_by_expense` sort by + # source move line, taxes move lines and destination move line in order. + for move_line_values in move_line_values_by_expense[expense.id]: + # Tax adjust move line. if multi tax, we compute with first line tax only + if "tax_base_amount" in move_line_values: + if first_line_tax: + continue + new_tax_amount = move_line_values["debit"] - diff_price_tax + move_line_values.update( + { + "debit": new_tax_amount if new_tax_amount > 0 else 0, + # move to credit, if adjust tax more than tax calculate + "credit": abs(new_tax_amount) if new_tax_amount < 0 else 0, + "amount_currency": move_line_values["amount_currency"] + - diff_price_tax_currency, + } + ) + first_line_tax = True + continue + # Source move line, For case include price + if ( + expense.tax_ids.filtered("price_include") + and move_line_values.get("account_id") == account_src.id + ): + move_line_values.update( + { + "debit": move_line_values["debit"] + diff_price_tax + if move_line_values["debit"] > 0 + else 0, + "credit": move_line_values["credit"] + diff_price_tax + if move_line_values["credit"] > 0 + else 0, + "amount_currency": move_line_values["amount_currency"] + + diff_price_tax_currency, + } + ) + # Destination adjust move line, For case exclude price + elif ( + not expense.tax_ids.filtered("price_include") + and move_line_values.get("account_id") == account_dst + ): + move_line_values.update( + { + "debit": move_line_values["debit"] - diff_price_tax + if move_line_values["debit"] > 0 + else 0, + "credit": move_line_values["credit"] - diff_price_tax + if move_line_values["credit"] > 0 + else 0, + "amount_currency": move_line_values["amount_currency"] + - diff_price_tax_currency, + } + ) + return move_line_values_by_expense diff --git a/hr_expense_tax_adjust/readme/CONTRIBUTORS.rst b/hr_expense_tax_adjust/readme/CONTRIBUTORS.rst new file mode 100644 index 000000000..8b17ebf09 --- /dev/null +++ b/hr_expense_tax_adjust/readme/CONTRIBUTORS.rst @@ -0,0 +1,4 @@ +* `Ecosoft `__: + + * Pimolnat Suntian + * Saran Lim. diff --git a/hr_expense_tax_adjust/readme/DESCRIPTION.rst b/hr_expense_tax_adjust/readme/DESCRIPTION.rst new file mode 100644 index 000000000..c627c2116 --- /dev/null +++ b/hr_expense_tax_adjust/readme/DESCRIPTION.rst @@ -0,0 +1,2 @@ +This module allows users to edit taxes on the Expense to ensure accurate accounting entries in case of rounding differences. +Users must have the "Show Accounting Features - Readonly" access rights to edit the necessary fields for tax adjustment. diff --git a/hr_expense_tax_adjust/readme/USAGE.rst b/hr_expense_tax_adjust/readme/USAGE.rst new file mode 100644 index 000000000..f3f02df97 --- /dev/null +++ b/hr_expense_tax_adjust/readme/USAGE.rst @@ -0,0 +1,7 @@ +To use this module, you can follow these steps: + +#. Go to *Expenses > My Expenses > My Expenses to Report > Create*. +#. Choose a product from the list and add applicable taxes. +#. The "Price Tax" field will automatically calculate and display the total price including taxes. +#. If the calculated price tax is incorrect, edit the value to reflect the correct amount. +#. Follow the normal process for submitting and posting the journal entry. diff --git a/hr_expense_tax_adjust/static/description/icon.png b/hr_expense_tax_adjust/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/hr_expense_tax_adjust/static/description/index.html b/hr_expense_tax_adjust/static/description/index.html new file mode 100644 index 000000000..85dafc945 --- /dev/null +++ b/hr_expense_tax_adjust/static/description/index.html @@ -0,0 +1,444 @@ + + + + + + +Expense Tax Adjustment + + + +
+

Expense Tax Adjustment

+ + +

Alpha License: AGPL-3 OCA/hr-expense Translate me on Weblate Try me on Runbot

+

This module allows users to edit taxes on the Expense to ensure accurate accounting entries in case of rounding differences. +Users must have the “Show Accounting Features - Readonly” access rights to edit the necessary fields for tax adjustment.

+
+

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

+
+

Table of contents

+ +
+

Usage

+

To use this module, you can follow these steps:

+
    +
  1. Go to Expenses > My Expenses > My Expenses to Report > Create.
    2. +
  2. Choose a product from the list and add applicable taxes.
    3. +
  3. The “Price Tax” field will automatically calculate and display the total price including taxes.
    4. +
  4. If the calculated price tax is incorrect, edit the value to reflect the correct amount.
    5. +
  5. Follow the normal process for submitting and posting the journal entry.
    6. +
+
+
+

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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • Ecosoft
    • +
+
+
+

Contributors

+ +
+
+

Maintainers

+

This module is maintained by the OCA.

+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.

+

Current maintainer:

+

ps-tubtim

+

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_tax_adjust/tests/__init__.py b/hr_expense_tax_adjust/tests/__init__.py new file mode 100644 index 000000000..76864861d --- /dev/null +++ b/hr_expense_tax_adjust/tests/__init__.py @@ -0,0 +1,3 @@ +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). + +from . import test_hr_expense_tax_adjust diff --git a/hr_expense_tax_adjust/tests/test_hr_expense_tax_adjust.py b/hr_expense_tax_adjust/tests/test_hr_expense_tax_adjust.py new file mode 100644 index 000000000..56520bb73 --- /dev/null +++ b/hr_expense_tax_adjust/tests/test_hr_expense_tax_adjust.py @@ -0,0 +1,157 @@ +# Copyright 2023 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +from odoo.tests.common import Form, TransactionCase + + +class TestHrExpenseTaxAdjust(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.expense = cls.env["hr.expense"] + cls.sheet = cls.env["hr.expense.sheet"] + cls.employee_admin = cls.env.ref("hr.employee_admin") + cls.expense_product = cls.env.ref("hr_expense.trans_expense_product") + cls.tax_purchase_include = cls.env["account.tax"].create( + { + "name": "Test tax 10% (include)", + "type_tax_use": "purchase", + "amount": 10.00, + "price_include": True, + } + ) + cls.tax_purchase = cls.env["account.tax"].create( + { + "name": "Test tax 10%", + "type_tax_use": "purchase", + "amount": 10.00, + } + ) + + def test_01_expense_adjust_tax_include_tax(self): + expense = self.expense.create( + { + "name": "Expense test", + "employee_id": self.employee_admin.id, + "product_id": self.expense_product.id, + "unit_amount": 10, + "quantity": 10, + "tax_ids": [(6, 0, [self.tax_purchase_include.id])], + } + ) + self.assertEqual(expense.total_amount, 100) + self.assertFalse(expense.tax_adjust) + self.assertEqual(expense.price_tax, 9.09) # (100 * 10) / 110 + # Test increase taxes adjust + with Form(expense) as ex: + ex.price_tax = 10.0 + self.assertTrue(expense.tax_adjust) + self.assertEqual(expense.price_tax, 10.0) + # Create expense sheet + sheet = self.sheet.create( + { + "employee_id": self.employee_admin.id, + "name": "Expense test", + "expense_line_ids": [(6, 0, expense.id)], + } + ) + self.assertEqual(sheet.state, "draft") + sheet.action_submit_sheet() + self.assertEqual(sheet.state, "submit") + sheet.approve_expense_sheets() + self.assertEqual(sheet.state, "approve") + sheet.action_sheet_move_create() + self.assertEqual(sheet.state, "post") + self.assertTrue(sheet.account_move_id) + self.assertEqual(len(sheet.account_move_id.line_ids), 3) + sheet.expense_line_ids._get_expense_account_source() + src_move_line = sheet.account_move_id.line_ids[0] + tax_move_line = sheet.account_move_id.line_ids[1] + # Before adjust tax, source move line must accounting debit = 90.91 + # After adjust tax, it change accounting debit = 90 and tax debit = 10 + self.assertEqual(src_move_line.debit, 90.0) + self.assertEqual(tax_move_line.debit, 10.0) + + sheet.action_unpost() + # Test increase taxes adjust + with Form(expense) as ex: + ex.price_tax = 8 + self.assertTrue(expense.tax_adjust) + self.assertEqual(expense.price_tax, 8.0) + sheet.action_submit_sheet() + self.assertEqual(sheet.state, "submit") + sheet.approve_expense_sheets() + self.assertEqual(sheet.state, "approve") + sheet.action_sheet_move_create() + self.assertEqual(sheet.state, "post") + src_move_line = sheet.account_move_id.line_ids[0] + tax_move_line = sheet.account_move_id.line_ids[1] + # Before adjust tax, source move line must accounting debit = 90.91 + # After adjust tax, it change accounting debit = 92 and tax debit = 8 + self.assertEqual(src_move_line.debit, 92.0) + self.assertEqual(tax_move_line.debit, 8.0) + + def test_02_expense_adjust_tax_exclude_tax(self): + """In the core Odoo implementation, Tax exclude is invisible. + This test supports tax exclude if you develop it see it.""" + expense = self.expense.create( + { + "name": "Expense test", + "employee_id": self.employee_admin.id, + "product_id": self.expense_product.id, + "unit_amount": 10, + "quantity": 10, + "tax_ids": [(6, 0, [self.tax_purchase.id])], + } + ) + self.assertEqual(expense.total_amount, 110) + self.assertFalse(expense.tax_adjust) + self.assertEqual(expense.price_tax, 10) + # Test increase taxes adjust + with Form(expense) as ex: + ex.price_tax = 12.0 + self.assertTrue(expense.tax_adjust) + self.assertEqual(expense.price_tax, 12.0) + # Create expense sheet + sheet = self.sheet.create( + { + "employee_id": self.employee_admin.id, + "name": "Expense test", + "expense_line_ids": [(6, 0, expense.id)], + } + ) + self.assertEqual(sheet.state, "draft") + sheet.action_submit_sheet() + self.assertEqual(sheet.state, "submit") + sheet.approve_expense_sheets() + self.assertEqual(sheet.state, "approve") + sheet.action_sheet_move_create() + self.assertEqual(sheet.state, "post") + self.assertTrue(sheet.account_move_id) + self.assertEqual(len(sheet.account_move_id.line_ids), 3) + sheet.expense_line_ids._get_expense_account_source() + tax_move_line = sheet.account_move_id.line_ids[1] + dest_move_line = sheet.account_move_id.line_ids[2] + # Before adjust tax, dest move line must accounting credit = 110 + # After adjust tax, it change accounting credit = 112 and tax debit = 12 + self.assertEqual(tax_move_line.debit, 12.0) + self.assertEqual(dest_move_line.credit, 112.0) + + sheet.action_unpost() + # Test increase taxes adjust + with Form(expense) as ex: + ex.price_tax = 8 + self.assertTrue(expense.tax_adjust) + self.assertEqual(expense.price_tax, 8.0) + sheet.action_submit_sheet() + self.assertEqual(sheet.state, "submit") + sheet.approve_expense_sheets() + self.assertEqual(sheet.state, "approve") + sheet.action_sheet_move_create() + self.assertEqual(sheet.state, "post") + tax_move_line = sheet.account_move_id.line_ids[1] + dest_move_line = sheet.account_move_id.line_ids[2] + # Before adjust tax, source move line must accounting credit = 110 + # After adjust tax, it change accounting credit = 108 and tax debit = 8 + self.assertEqual(tax_move_line.debit, 8.0) + self.assertEqual(dest_move_line.credit, 108.0) diff --git a/hr_expense_tax_adjust/views/hr_expense_views.xml b/hr_expense_tax_adjust/views/hr_expense_views.xml new file mode 100644 index 000000000..bf60da626 --- /dev/null +++ b/hr_expense_tax_adjust/views/hr_expense_views.xml @@ -0,0 +1,12 @@ + + + hr.expense + + + + + + + + + From 99851c4161e5a0f7a4de66040f1cdeaea9e54efe Mon Sep 17 00:00:00 2001 From: oca-ci Date: Wed, 19 Apr 2023 23:50:47 +0000 Subject: [PATCH 02/11] [UPD] Update hr_expense_tax_adjust.pot --- .../i18n/hr_expense_tax_adjust.pot | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 hr_expense_tax_adjust/i18n/hr_expense_tax_adjust.pot diff --git a/hr_expense_tax_adjust/i18n/hr_expense_tax_adjust.pot b/hr_expense_tax_adjust/i18n/hr_expense_tax_adjust.pot new file mode 100644 index 000000000..2304f243d --- /dev/null +++ b/hr_expense_tax_adjust/i18n/hr_expense_tax_adjust.pot @@ -0,0 +1,34 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * hr_expense_tax_adjust +# +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_tax_adjust +#: model:ir.model,name:hr_expense_tax_adjust.model_hr_expense +msgid "Expense" +msgstr "" + +#. module: hr_expense_tax_adjust +#: model:ir.model.fields,field_description:hr_expense_tax_adjust.field_hr_expense__price_tax +msgid "Price Tax" +msgstr "" + +#. module: hr_expense_tax_adjust +#: model:ir.model.fields,field_description:hr_expense_tax_adjust.field_hr_expense__tax_adjust +msgid "Tax Adjust" +msgstr "" + +#. module: hr_expense_tax_adjust +#: model:ir.model.fields,help:hr_expense_tax_adjust.field_hr_expense__tax_adjust +msgid "trigger line with adjust tax" +msgstr "" From 1a06b3f27185268761f5924a1cbc74a43db6f653 Mon Sep 17 00:00:00 2001 From: OCA-git-bot Date: Wed, 19 Apr 2023 23:54:01 +0000 Subject: [PATCH 03/11] [UPD] README.rst --- hr_expense_tax_adjust/static/description/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hr_expense_tax_adjust/static/description/index.html b/hr_expense_tax_adjust/static/description/index.html index 85dafc945..02fc50a4e 100644 --- a/hr_expense_tax_adjust/static/description/index.html +++ b/hr_expense_tax_adjust/static/description/index.html @@ -3,7 +3,7 @@ - + Expense Tax Adjustment