From 51c85808123183204a3527b662d40a37a35a8a5a Mon Sep 17 00:00:00 2001 From: ps-tubtim Date: Wed, 22 Dec 2021 13:31:14 +0700 Subject: [PATCH] [14.0][ADD] hr_expense_tax_adjust --- hr_expense_tax_adjust/README.rst | 88 ++++ hr_expense_tax_adjust/__init__.py | 3 + hr_expense_tax_adjust/__manifest__.py | 23 + hr_expense_tax_adjust/models/__init__.py | 3 + hr_expense_tax_adjust/models/hr_expense.py | 173 +++++++ hr_expense_tax_adjust/readme/CONTRIBUTORS.rst | 3 + hr_expense_tax_adjust/readme/DESCRIPTION.rst | 1 + .../static/description/icon.png | Bin 0 -> 9455 bytes .../static/description/index.html | 430 ++++++++++++++++++ .../static/src/js/tax_group.js | 177 +++++++ .../static/src/xml/tax_group.xml | 44 ++ hr_expense_tax_adjust/views/asset_backend.xml | 11 + .../views/hr_expense_views.xml | 17 + .../odoo/addons/hr_expense_tax_adjust | 1 + setup/hr_expense_tax_adjust/setup.py | 6 + 15 files changed, 980 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/static/description/icon.png create mode 100644 hr_expense_tax_adjust/static/description/index.html create mode 100644 hr_expense_tax_adjust/static/src/js/tax_group.js create mode 100644 hr_expense_tax_adjust/static/src/xml/tax_group.xml create mode 100644 hr_expense_tax_adjust/views/asset_backend.xml create mode 100644 hr_expense_tax_adjust/views/hr_expense_views.xml create mode 120000 setup/hr_expense_tax_adjust/odoo/addons/hr_expense_tax_adjust create mode 100644 setup/hr_expense_tax_adjust/setup.py diff --git a/hr_expense_tax_adjust/README.rst b/hr_expense_tax_adjust/README.rst new file mode 100644 index 000000000..943ea4186 --- /dev/null +++ b/hr_expense_tax_adjust/README.rst @@ -0,0 +1,88 @@ +====================== +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/14.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-14-0/hr-expense-14-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/14.0 + :alt: Try me on Runbot + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to edit tax amount before Post Journal Entries on Expense Report. + +.. 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: + +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 + +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..9577d8a24 --- /dev/null +++ b/hr_expense_tax_adjust/__manifest__.py @@ -0,0 +1,23 @@ +# Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +{ + "name": "Expense Tax Adjustment", + "version": "14.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/asset_backend.xml", + "views/hr_expense_views.xml", + ], + "qweb": [ + "static/src/xml/tax_group.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..308506e1d --- /dev/null +++ b/hr_expense_tax_adjust/models/hr_expense.py @@ -0,0 +1,173 @@ +# Copyright 2021 Ecosoft Co., Ltd. (http://ecosoft.co.th) +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). + +import ast +from collections import defaultdict + +from odoo import api, fields, models +from odoo.tools.misc import formatLang + + +class HrExpense(models.Model): + _inherit = "hr.expense" + + tax_amount = fields.Float( + digits="Account", + string="Tax", + compute="_compute_tax_amount", + store=True, + readonly=False, + copy=False, + ) + amount_by_group = fields.Binary( + string="Tax amount by group", + compute="_compute_amount_by_group", + help="Edit Tax amounts if you encounter rounding issues.", + ) + amount_by_group_txt = fields.Text( + string="Tax Amount Text", + compute="_compute_expense_taxes_by_group", + store=True, + readonly=False, + copy=False, + ) + + @api.depends("amount_by_group_txt") + def _compute_amount_by_group(self): + for expense in self: + expense.amount_by_group = ast.literal_eval(expense.amount_by_group_txt) + + @api.depends("amount_by_group") + def _compute_tax_amount(self): + for expense in self: + tax_amount = 0.0 + for amount_line in expense.amount_by_group: + tax_amount += amount_line[1] + expense.tax_amount = tax_amount + + @api.depends("quantity", "unit_amount", "tax_ids", "currency_id", "tax_amount") + def _compute_amount(self): + """Override the `_compute_amount()`.""" + for expense in self: + taxes = expense.tax_ids.with_context(round=True).compute_all( + expense.unit_amount, + expense.currency_id, + expense.quantity, + expense.product_id, + expense.employee_id.user_id.partner_id, + ) + expense.untaxed_amount = taxes.get("total_excluded", 0.0) + expense.total_amount = expense.untaxed_amount + expense.tax_amount + + @api.depends("quantity", "unit_amount", "tax_ids", "currency_id", "employee_id") + def _compute_expense_taxes_by_group(self): + for expense in self: + partner_id = expense.employee_id.user_id.partner_id + lang_env = expense.with_context(lang=partner_id.lang).env + taxes = expense.tax_ids.with_context(round=True).compute_all( + expense.unit_amount, + expense.currency_id, + expense.quantity, + expense.product_id, + expense.employee_id.user_id.partner_id, + ) + base_amount = taxes.get("total_excluded", 0.0) + + tax_group_mapping = defaultdict( + lambda: { + "base_amount": base_amount, + "tax_amount": 0.0, + "tax_name": "", + } + ) + + for tax in expense.tax_ids.flatten_taxes_hierarchy(): + tax_group_vals = tax_group_mapping[tax.id] + tax_group_vals["tax_name"] = tax.name + for tax_line in taxes["taxes"]: + tax_id = tax_line["id"] + tax_group_vals = tax_group_mapping[tax_id] + tax_group_vals["tax_amount"] += tax_line["amount"] + amount_by_group = [] + for tax_group in tax_group_mapping.keys(): + tax_group_vals = tax_group_mapping[tax_group] + if isinstance(tax_group, models.NewId): + tax_group = tax_group.origin + amount_by_group.append( + [ + tax_group_vals["tax_name"], + tax_group_vals["tax_amount"], + tax_group_vals["base_amount"], + formatLang( + lang_env, + tax_group_vals["tax_amount"], + currency_obj=expense.currency_id, + ), + formatLang( + lang_env, + tax_group_vals["base_amount"], + currency_obj=expense.currency_id, + ), + len(tax_group_mapping), + tax_group, + ] + ) + expense.amount_by_group_txt = str(amount_by_group) + + def _get_account_move_line_values(self): + move_line_values_by_expense = super()._get_account_move_line_values() + for expense in self: + # Prepare data + account_date = ( + expense.sheet_id.accounting_date + or expense.date + or fields.Date.context_today(expense) + ) + company_currency = expense.company_id.currency_id + new_tax_amount = 0.0 + old_tax_amount = 0.0 + amount_by_group = dict() + for amount_line in expense.amount_by_group: + amount_by_group[amount_line[0]] = amount_line[1] + + # Update move_line_values_by_expense + for line in move_line_values_by_expense[expense.id]: + # taxes move lines + if line["name"] in amount_by_group.keys(): + tax = amount_by_group[line["name"]] + balance = expense.currency_id._convert( + tax, company_currency, expense.company_id, account_date + ) + old_tax_amount += line["amount_currency"] + new_tax_amount += balance + line.update( + { + "debit": balance if balance > 0 else 0, + "credit": -balance if balance < 0 else 0, + "amount_currency": balance, + } + ) + # destination move line + if "date_maturity" in line.keys(): + amount_currency = line["amount_currency"] + amount = expense.currency_id._convert( + amount_currency, + company_currency, + expense.company_id, + account_date, + ) + old_tax_amount = expense.currency_id._convert( + old_tax_amount, + company_currency, + expense.company_id, + account_date, + ) + balance = amount + (old_tax_amount - new_tax_amount) + line.update( + { + "debit": balance if balance > 0 else 0, + "credit": -balance if balance < 0 else 0, + "amount_currency": balance, + } + ) + 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..ea63aa7bc --- /dev/null +++ b/hr_expense_tax_adjust/readme/CONTRIBUTORS.rst @@ -0,0 +1,3 @@ +* `Ecosoft `__: + + * Pimolnat Suntian diff --git a/hr_expense_tax_adjust/readme/DESCRIPTION.rst b/hr_expense_tax_adjust/readme/DESCRIPTION.rst new file mode 100644 index 000000000..75cbaa0fc --- /dev/null +++ b/hr_expense_tax_adjust/readme/DESCRIPTION.rst @@ -0,0 +1 @@ +This module allows to edit tax amount before Post Journal Entries on Expense Report. 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..7ce650c3b --- /dev/null +++ b/hr_expense_tax_adjust/static/description/index.html @@ -0,0 +1,430 @@ + + + + + + +Expense Tax Adjustment + + + +
+

Expense Tax Adjustment

+ + +

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

+

This module allows to edit tax amount before Post Journal Entries on Expense Report.

+
+

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

+ +
+

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/static/src/js/tax_group.js b/hr_expense_tax_adjust/static/src/js/tax_group.js new file mode 100644 index 000000000..2adf95cb0 --- /dev/null +++ b/hr_expense_tax_adjust/static/src/js/tax_group.js @@ -0,0 +1,177 @@ +odoo.define("hr_expense_tax_adjust.ExpenseTaxGroupCustomField", function (require) { + "use strict"; + + var core = require("web.core"); + var session = require("web.session"); + var fieldRegistry = require("web.field_registry"); + var AbstractField = require("web.AbstractField"); + var fieldUtils = require("web.field_utils"); + var QWeb = core.qweb; + + var ExpenseTaxGroupCustomField = AbstractField.extend({ + events: { + "click .tax_group_edit": "_onClick", + "keydown .oe_tax_group_editable .tax_group_edit_input input": "_onKeydown", + "blur .oe_tax_group_editable .tax_group_edit_input input": "_onBlur", + }, + + // -------------------------------------------------------------------------- + // Private + // -------------------------------------------------------------------------- + + /** + * This method is called by "_setTaxGroups". It is + * responsible for calculating taxes based on + * tax groups and triggering an event to + * notify the ORM of a change. + * + * @param {Id} taxGroupId + * @param {Float} oldValue + * @param {Float} newValue + */ + _changeTaxValueByTaxGroup: function (taxGroupId, oldValue, newValue) { + var self = this; + var oldTax = oldValue.toString(); + var newTax = newValue.toString(); + var amount_by_group_txt = self.record.data.amount_by_group_txt; + var amount_by_group = amount_by_group_txt + .replace(/\[|\]|\'|\"/g, "") + .split(","); + var new_amount_by_group = []; + var lst_amount = []; + var tax_amount = 0.0; + var tax_amount_sign = ""; + var n = 0; + for (var i = 0, len = amount_by_group.length; i < len / 7; i++) { + n = i * 7; + tax_amount = parseFloat(amount_by_group[n + 1]); + tax_amount_sign = amount_by_group[n + 3]; + if (amount_by_group[n + 6] == taxGroupId) { + tax_amount = parseFloat( + amount_by_group[n + 1].replace(oldTax, newTax) + ); + var amount_array = amount_by_group[n + 3].split(" "); + tax_amount_sign = amount_array[0] + " " + tax_amount; + } + lst_amount = [ + amount_by_group[n], + tax_amount, + parseFloat(amount_by_group[n + 2]), + tax_amount_sign, + amount_by_group[n + 4], + parseFloat(amount_by_group[n + 5]), + parseFloat(amount_by_group[n + 6]), + ]; + console.log(lst_amount); + new_amount_by_group.push(lst_amount); + } + var new_amount_by_group_txt = JSON.stringify(new_amount_by_group); + // Trigger ORM + self.trigger_up("field_changed", { + dataPointID: self.record.id, + changes: {amount_by_group_txt: new_amount_by_group_txt}, + }); + }, + + /** + * This method is part of the widget life cycle and allows you to render + * the widget. + * + * @private + * @override + */ + _render: function () { + var self = this; + // Display the pencil and allow the event to click and edit only on purchase that are not posted and in edit mode. + // since the field is readonly its mode will always be readonly. Therefore we have to use a trick by checking the + // formRenderer (the parent) and check if it is in edit in order to know the correct mode. + var displayEditWidget = + this.record.data.state === "draft" && this.getParent().mode === "edit"; + this.$el.html( + $( + QWeb.render("ExpenseAccountTaxGroupTemplate", { + lines: self.value, + displayEditWidget: displayEditWidget, + }) + ) + ); + }, + + // -------------------------------------------------------------------------- + // Handler + // -------------------------------------------------------------------------- + + /** + * This method is called when the user is in edit mode and + * leaves the field. Then, we execute the code that + * modifies the information. + * + * @param {event} ev + */ + _onBlur: function (ev) { + ev.preventDefault(); + var $input = $(ev.target); + var newValue = $input.val(); + var currency = session.get_currency(this.record.data.currency_id.data.id); + try { + newValue = fieldUtils.parse.float(newValue); // Need a float for format the value. + newValue = fieldUtils.format.float(newValue, null, { + digits: currency.digits, + }); // Return a string rounded to currency precision + newValue = fieldUtils.parse.float(newValue); // Convert back to Float to compare with oldValue to know if value has changed + } catch (err) { + $input.addClass("o_field_invalid"); + return; + } + var oldValue = $input.data("originalValue"); + if (newValue === oldValue || newValue === 0) { + return this._render(); + } + var taxGroupId = $input + .parents(".oe_tax_group_editable") + .data("taxGroupId"); + this._changeTaxValueByTaxGroup(taxGroupId, oldValue, newValue); + }, + + /** + * This method is called when the user clicks on a specific . + * it will hide the edit button and display the field to be edited. + * + * @param {event} ev + */ + _onClick: function (ev) { + ev.preventDefault(); + var $taxGroupElement = $(ev.target).parents(".oe_tax_group_editable"); + // Show input and hide previous element + $taxGroupElement.find(".tax_group_edit").addClass("d-none"); + $taxGroupElement.find(".tax_group_edit_input").removeClass("d-none"); + var $input = $taxGroupElement.find(".tax_group_edit_input input"); + // Get original value and display it in user locale in the input + var formatedOriginalValue = fieldUtils.format.float( + $input.data("originalValue"), + {}, + {} + ); + $input.focus(); // Focus the input + $input.val(formatedOriginalValue); // Add value in user locale to the input + }, + + /** + * This method is called when the user is in edit mode and pressing + * a key on his keyboard. If this key corresponds to ENTER or TAB, + * the code that modifies the information is executed. + * + * @param {event} ev + */ + _onKeydown: function (ev) { + switch (ev.which) { + // Trigger only if the user clicks on ENTER or on TAB. + case $.ui.keyCode.ENTER: + case $.ui.keyCode.TAB: + // Trigger blur to prevent the code being executed twice + $(ev.target).blur(); + } + }, + }); + fieldRegistry.add("expense-tax-group-custom-field", ExpenseTaxGroupCustomField); +}); diff --git a/hr_expense_tax_adjust/static/src/xml/tax_group.xml b/hr_expense_tax_adjust/static/src/xml/tax_group.xml new file mode 100644 index 000000000..d4510c424 --- /dev/null +++ b/hr_expense_tax_adjust/static/src/xml/tax_group.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + +
+ + diff --git a/hr_expense_tax_adjust/views/asset_backend.xml b/hr_expense_tax_adjust/views/asset_backend.xml new file mode 100644 index 000000000..482215ec1 --- /dev/null +++ b/hr_expense_tax_adjust/views/asset_backend.xml @@ -0,0 +1,11 @@ + + +