[17.0][MIG] hr_expense_invoice: Migration to 17.0 #256

desdelinux · 2024-07-15T23:44:28Z

Actions performed:
- Deprecated hr.expense.reference field as part of 1.
- Merged the hr.expense.is_editable and hr.expense.sheet_is_editable
fields as part of 1.
- Renamed hr.expense.unit_amount to hr.expense.price_unit.
- Renamed hr.expense.attachment_number to hr.expense.nb_attachment.
- Renamed hr.expense.approve_expense_sheets() to
hr.expense.action_approve_expense_sheets().
- Renamed hr.expense.account_move_id to hr.expense.account_move_ids.
- Renamed hr.expense.total_amount to
hr.expense.total_amount_currency.
- Inherit compute of hr.expense.sheet.state to consider expenses with
linked invoices.
- Switched from old %-based string formatting to f-strings.
- Replaced the use of attrs in views with their equivalent Python
expressions as part of 2.
- Adapted the hr.expense.sheet records creation in tests.
- Updated to use the employee partner from hr.employee.work_contact_id
instead of hr.employee.address_home_id since it has been split into
multiple fields.
- Added the hr.expense.amount_residual field to maintain the one
invoice per expense functionality.
- Adapted test assertions for hr.expense.sheet.state since it is now
a computed field.

Set supplier invoices on HR expenses ==================================== This module should be used when a supplier invoice is paid by an employee. It allows to set a supplier invoice for each expense line, adding the corresponding journal items to transfer the debt to the employee. Installation ============ Install the module the regular way. Configuration ============= You don't need to configure anything more to use this module. Usage ===== Instead of coding a full expense line, select an existing supplier invoice, and then the rest of the fields will be auto-filled and grayed. When you generate the expenses account entries, lines with invoices filled will be generated as opposite of the payable move line of the invoice, and both will be reconciled, letting the employee payable account as the only open balance. Known issues / Roadmap ====================== * Multiple payment terms for a supplier invoice are not handled correctly. * Partial reconcile supplier invoices are also not correctly handled. OCA Transbot updated translations from Transifex

…se view OCA Transbot updated translations from Transifex

…l amount (OCA#237) On the same expense, when we have 2 or more lines with different invoices, and each invoices have the same total amount, reconcile is not possible. The fix is to exclude reconcile account.move.line, and the first time if we have more than one line to reconcile on the same amount, we keep the first. OCA Transbot updated translations from Transifex

OCA Transbot updated translations from Transifex

[UPD] Update hr_expense_invoice.pot

Currently translated at 100.0% (4 of 4 strings) Translation: hr-11.0/hr-11.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-11-0/hr-11-0-hr_expense_invoice/de/ Update translation files Updated by Update PO files to match POT (msgmerge) hook in Weblate.

[UPD] Update hr_expense_invoice.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-12.0/hr-12.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_expense_invoice/

Add expense info to invoice info or create/edit

From expense sheet, add action "Create Invoice" from multiple expenses Change the way reference invoice_id is checked. - No more onchange invoice_id that set values to expense - Instead, check amount on expense and invoice during post entry - Change the way to allow reconcile with > 2 account move lines

Currently translated at 100.0% (4 of 4 strings) Translation: hr-12.0/hr-12.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_expense_invoice/de/

Currently translated at 100.0% (4 of 4 strings) Translation: hr-12.0/hr-12.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_expense_invoice/es/ [UPD] README.rst [UPD] Update hr_expense_invoice.pot [UPD] README.rst hr_expense_invoice 12.0.1.3.0 Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-12.0/hr-12.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_expense_invoice/

hr_expense_invoice 12.0.1.3.1

[UPD] Update hr_expense_invoice.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-expense-13.0/hr-expense-13.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-expense-13-0/hr-expense-13-0-hr_expense_invoice/ Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-expense-13.0/hr-expense-13.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-expense-13-0/hr-expense-13-0-hr_expense_invoice/

If not, the total amount of the expense won't match to invoices with taxes. [UPD] README.rst

[UPD] README.rst hr_expense_invoice 13.0.1.1.0

… partners. - Intercept properly the sheet paid action for not marking it as paid when reconciling the expense lines that belongs to invoices. - Prevent set invoices paid when sheet paid by company. - Some docstring. Co-authored-by: Pedro M. Baeza <pedro.baeza@tecnativa.com> Co-authored-by: Víctor Martínez <victor.martinez@tecnativa.com> hr_expense_invoice 13.0.1.1.2 [UPD] Update hr_expense_invoice.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-expense-13.0/hr-expense-13.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-expense-13-0/hr-expense-13-0-hr_expense_invoice/

…ing to sheet hr_expense_invoice 13.0.1.2.0 [UPD] Update hr_expense_invoice.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-expense-13.0/hr-expense-13.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-expense-13-0/hr-expense-13-0-hr_expense_invoice/

…ent models (hr.expense.create.invoice)

…ted with expense and improve domain to prevent set same invoice in different expenses.

…e is set) hr_expense_invoice 13.0.1.3.0 [UPD] Update hr_expense_invoice.pot Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: hr-expense-13.0/hr-expense-13.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-expense-13-0/hr-expense-13-0-hr_expense_invoice/

xmglord · 2024-08-21T02:51:07Z

@pedrobaeza @luisg123v all comments were applied, please review again.

luisg123v · 2024-08-21T18:23:48Z

hr_expense_invoice/models/hr_expense_sheet.py

+        return action
+
+    def _compute_state(self):
+        """Set proper state according linked invoices."""


"according to"

luisg123v · 2024-08-21T18:25:34Z

hr_expense_invoice/models/hr_expense.py

@@ -27,6 +27,9 @@ class HrExpense(models.Model):
        comodel_name="account.move",
        inverse_name="source_invoice_expense_id",
    )
+    amount_residual = fields.Monetary(
+        string="Amount Due", compute="_compute_amount_residual", store="True"


The store attribute should be a boolean

luisg123v · 2024-08-21T18:26:23Z

hr_expense_invoice/models/hr_expense_sheet.py

@@ -112,3 +143,30 @@ def action_view_invoices(self):
            action["view_mode"] = "tree,form"
            action["domain"] = [("id", "in", invoice_ids)]
        return action
+
+    def _compute_state(self):


Missing api.depends, it could be an empty one.

I don't think it's needed if you are overriding an existing one.

luisg123v · 2024-08-21T18:29:19Z

hr_expense_invoice/models/hr_expense_sheet.py

+        sheets_with_paid_invoices = (
+            sheets_with_invoices - company_account_sheets
+        ).filtered(
+            lambda sheet: all(


You could filter by previous state to discard invalid candidates, e.g. draft ones.

This is already filtered in line 155. This is the original compute.

luisg123v · 2024-08-21T18:31:05Z

hr_expense_invoice/models/hr_expense_sheet.py

+        company_account_sheets = sheets_with_invoices.filtered(
+            lambda sheet: sheet.payment_mode == "company_account"
+        )
+        company_account_sheets.write({"state": "done"})


You should not write inside compute methods

company_account_sheets.state = "done"

Same below.

luisg123v · 2024-08-21T18:36:58Z

hr_expense_invoice/views/hr_expense_views.xml

@@ -140,8 +113,8 @@
                    icon="fa-book"
                    name="action_view_invoices"
                    groups="account.group_account_invoice"
+                    invisible="invoice_count == 0"


not invoice_count

xmglord · 2024-08-22T16:37:48Z

@luisg123v please review

luisg123v

@xmglord we're almost done, just only one pending comment.

luisg123v

LGTM 👍

CC @pedrobaeza

xmglord · 2024-08-28T16:57:24Z

@pedrobaeza friendly reminder

pedrobaeza

Hi, sorry for the delay. In a test in runboat, everything seems to work better.

Functionally, I only miss the journal entries smart-button to navigate to the created "transfer entries" in a expense report with expenses paid by employee linked to vendor bills. Is it possible to have it?

Technically, I have put several comments inline.

pedrobaeza · 2024-08-28T17:39:52Z

hr_expense_invoice/models/hr_expense.py

@@ -27,56 +27,31 @@ class HrExpense(models.Model):
        comodel_name="account.move",
        inverse_name="source_invoice_expense_id",
    )
+    amount_residual = fields.Monetary(


Why do you need this extra field? If there's a strong reason, put a comment above documenting the reason to add it.

I already add the reason.

pedrobaeza · 2024-08-28T17:42:15Z

hr_expense_invoice/models/hr_expense.py

@@ -88,7 +63,7 @@ def _prepare_own_account_transfer_move_vals(self):
            ],
            limit=1,
        )
-        employee_partner = self.employee_id.sudo().address_home_id.commercial_partner_id
+        employee_partner = self.employee_id.sudo().work_contact_id


Although I understand the reason for this change (as the private address has been removed), this is not truly correct, as the work contact is not really representing the employee, and you can't put a journal entry linked to a children contact. How Odoo handles this in other parts where the debt is to the employee?

Actually I took it from Odoo.

Example 1:
v17
v16

Example 2:
v17
v16

pedrobaeza · 2024-08-28T17:42:45Z

hr_expense_invoice/models/hr_expense.py

@@ -153,27 +128,26 @@ def _onchange_invoice_id(self):
        """
        if self.invoice_id:
            self.quantity = 1
-            self.reference = self.invoice_id.name


Maybe we should add the vendor bill number in the expense name?

Done but since both models, hr.expense and account.move have smart buttons to go from one to another and since in v17 the filtering is more robust. I think is not necessary to have it. Maybe something like:

self.name = self.name or self.invoice_id.name

What do you think?

hr_expense_invoice/models/hr_expense.py

pedrobaeza · 2024-08-28T17:44:37Z

hr_expense_invoice/models/hr_expense_sheet.py

@@ -112,3 +143,30 @@ def action_view_invoices(self):
            action["view_mode"] = "tree,form"
            action["domain"] = [("id", "in", invoice_ids)]
        return action
+
+    def _compute_state(self):


I don't think it's needed if you are overriding an existing one.

Actions performed: - Deprecated `hr.expense.reference` field as part of [1]. - Merged the `hr.expense.is_editable` and `hr.expense.sheet_is_editable` fields as part of [1]. - Renamed `hr.expense.unit_amount` to `hr.expense.price_unit`. - Renamed `hr.expense.attachment_number` to `hr.expense.nb_attachment`. - Renamed `hr.expense.approve_expense_sheets()` to `hr.expense.action_approve_expense_sheets()`. - Renamed `hr.expense.account_move_id` to `hr.expense.account_move_ids`. - Renamed `hr.expense.total_amount` to `hr.expense.total_amount_currency`. - Inherit compute of `hr.expense.sheet.state` to consider expenses with linked invoices. - Switched from old %-based string formatting to f-strings. - Replaced the use of `attrs` in views with their equivalent Python expressions as part of [2]. - Adapted the `hr.expense.sheet` records creation in tests. - Updated to use the employee partner from `hr.employee.work_contact_id` instead of `hr.employee.address_home_id` since it has been split into multiple fields. - Added the `hr.expense.amount_residual` field to maintain the one invoice per expense functionality. - Adapted test assertions for `hr.expense.sheet.state` since it is now a computed field. Co-authored-by: desdelinux <luigys@vauxoo.com> [1]: odoo/odoo#130244 [2]: odoo/odoo#104741

xmglord · 2024-09-04T08:42:06Z

Hi @pedrobaeza

In v16 was not possible to have the smart button since the field related to it was a one2many field but in this version is possible and I already add it. Could you please test it functionally again?

xmglord · 2024-09-09T21:19:42Z

@pedrobaeza friendly reminder

pedrobaeza

OK, let's move on. The contact associated to the move doesn't convince me, as it's not correct, but is the same on Vanilla Odoo, so let's not block it for now.

/ocabot merge nobump

OCA-git-bot · 2024-09-10T06:12:38Z

Hey, thanks for contributing! Proceeding to merge this for you.
Prepared branch 17.0-ocabot-merge-pr-256-by-pedrobaeza-bump-nobump, awaiting test results.

OCA-git-bot · 2024-09-10T06:17:10Z

Congratulations, your PR was merged at 38e6859. Thanks a lot for contributing to OCA. ❤️

pedrobaeza and others added 30 commits July 15, 2024 17:48

[IMP] hr_expense_invoice: Allow to create supplier invoice from expen…

a4928b8

…se view OCA Transbot updated translations from Transifex

[MIG] hr_expense_invoice: Migration to 10.0

20a1eec

OCA Transbot updated translations from Transifex

[MIG] hr_expense_invoice: Migration to 11.0

63c8ca1

[UPD] Update hr_expense_invoice.pot

Added translation using Weblate (German)

30757d5

[12.0][IMP] hr_expense_invoice

d5cb0b3

Add expense info to invoice info or create/edit

Translated using Weblate (German)

7e03408

Currently translated at 100.0% (4 of 4 strings) Translation: hr-12.0/hr-12.0-hr_expense_invoice Translate-URL: https://translation.odoo-community.org/projects/hr-12-0/hr-12-0-hr_expense_invoice/de/

[FIX] Avoid not intended warnings

fdadb12

hr_expense_invoice 12.0.1.3.1

[IMP] hr_expense_invoice : black, isort

b1eeb75

[IMP] hr_expense_invoice: onchange invoice

9487be1

[FIX] hr_expense_invoice: Reset taxes on invoice change

666b31f

If not, the total amount of the expense won't match to invoices with taxes. [UPD] README.rst

[FIX] hr_expense_invoice: Proper analytic account field name

c145886

[FIX] hr_expense_invoice: Set groups to invoice_id field in expense view

af43368

[UPD] README.rst hr_expense_invoice 13.0.1.1.0

[OU-ADD] hr_expense_invoice: Migration scripts

438b388

[OU-FIX] hr_expense_invoice: Proper syntax

09da673

[IMP] hr_expense_invoice: Docstring + convention on not overwriting self

4e6113c

[FIX] hr_expense_invoice: Set empty tax_ids when create_invoice wizard

d841b93

[IMP] : Add migration to prevent error related to many2many in Transi…

6ec13fb

…ent models (hr.expense.create.invoice)

[IMP] hr_expense_invoice: Add button to create invoice from expenses

08ed873

[FIX] hr_expense_invoice: Allow create invoice from invoice_id field

5b74c5b

[IMP] hr_expense_invoice: Prevent change invoice total when it's rela…

d52ce72

…ted with expense and improve domain to prevent set same invoice in different expenses.

xmglord force-pushed the 17.0-mig-hr_expense_invoice branch 4 times, most recently from be6e661 to 1a6445b Compare August 21, 2024 02:46

luisg123v suggested changes Aug 21, 2024

View reviewed changes

xmglord force-pushed the 17.0-mig-hr_expense_invoice branch from 1a6445b to 6c9a848 Compare August 22, 2024 16:37

desdelinux requested review from luisg123v and pedrobaeza August 22, 2024 17:43

luisg123v suggested changes Aug 23, 2024

View reviewed changes

xmglord force-pushed the 17.0-mig-hr_expense_invoice branch 2 times, most recently from 5b2214b to e69abe3 Compare August 24, 2024 05:19

desdelinux requested a review from luisg123v August 26, 2024 17:22

luisg123v approved these changes Aug 26, 2024

View reviewed changes

pedrobaeza reviewed Aug 28, 2024

View reviewed changes

xmglord force-pushed the 17.0-mig-hr_expense_invoice branch from e69abe3 to bef9479 Compare September 4, 2024 08:39

desdelinux requested a review from pedrobaeza September 4, 2024 17:15

pedrobaeza approved these changes Sep 10, 2024

View reviewed changes

OCA-git-bot added the approved label Sep 10, 2024

OCA-git-bot added the bot is merging ⏳ label Sep 10, 2024

OCA-git-bot merged commit c18487e into OCA:17.0 Sep 10, 2024
6 of 7 checks passed

OCA-git-bot added merged 🎉 and removed bot is merging ⏳ labels Sep 10, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[17.0][MIG] hr_expense_invoice: Migration to 17.0 #256

[17.0][MIG] hr_expense_invoice: Migration to 17.0 #256

desdelinux commented Jul 15, 2024 •

edited

Loading

xmglord commented Aug 21, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

pedrobaeza Aug 28, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

luisg123v Aug 21, 2024

xmglord Aug 22, 2024

xmglord commented Aug 22, 2024

luisg123v left a comment

luisg123v left a comment

xmglord commented Aug 28, 2024

pedrobaeza left a comment

pedrobaeza Aug 28, 2024

xmglord Sep 4, 2024

pedrobaeza Aug 28, 2024

xmglord Sep 4, 2024

pedrobaeza Aug 28, 2024

xmglord Sep 4, 2024

pedrobaeza Aug 28, 2024

xmglord commented Sep 4, 2024

xmglord commented Sep 9, 2024

pedrobaeza left a comment

OCA-git-bot commented Sep 10, 2024

OCA-git-bot commented Sep 10, 2024

[17.0][MIG] hr_expense_invoice: Migration to 17.0 #256

[17.0][MIG] hr_expense_invoice: Migration to 17.0 #256

Conversation

desdelinux commented Jul 15, 2024 • edited Loading

xmglord commented Aug 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xmglord commented Aug 22, 2024

luisg123v left a comment

Choose a reason for hiding this comment

luisg123v left a comment

Choose a reason for hiding this comment

xmglord commented Aug 28, 2024

pedrobaeza left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

xmglord commented Sep 4, 2024

xmglord commented Sep 9, 2024

pedrobaeza left a comment

Choose a reason for hiding this comment

OCA-git-bot commented Sep 10, 2024

OCA-git-bot commented Sep 10, 2024

desdelinux commented Jul 15, 2024 •

edited

Loading