[MIG] hr_expense_advance_clearing: Migration to 16.0

Author: Saran440

hr_expense_advance_clearing/__manifest__.py

@@ -3,7 +3,7 @@
 
 {
     "name": "Employee Advance and Clearing",
-    "version": "15.0.1.2.0",
+    "version": "16.0.1.0.0",
     "category": "Human Resources",
     "author": "Ecosoft, Odoo Community Association (OCA)",
     "license": "AGPL-3",

hr_expense_advance_clearing/models/hr_expense.py

@@ -3,6 +3,7 @@
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
 
 
 class HrExpense(models.Model):
@@ -59,37 +60,95 @@ def onchange_advance(self):
             )
 
     def _get_account_move_line_values(self):
-        move_line_values_by_expense = super()._get_account_move_line_values()
-        # Only when do the clearing, change cr payable to cr advance
-        emp_advance = self.env.ref("hr_expense_advance_clearing.product_emp_advance")
-        sheets = self.mapped("sheet_id").filtered("advance_sheet_id")
-        sheets_x = sheets.filtered(lambda x: x.advance_sheet_residual <= 0.0)
-        if sheets_x:  # Advance Sheets with no residual left
-            raise ValidationError(
-                _("Advance: %s has no amount to clear")
-                % ", ".join(sheets_x.mapped("name"))
+        """Create move line (journal) from clearing"""
+        move_line_values_by_expense = {}
+        for expense in self:
+            advance_to_clear = expense.sheet_id.advance_sheet_residual
+            move_line_name = (
+                expense.employee_id.name + ": " + expense.name.split("\n")[0][:64]
             )
-        for sheet in sheets:
-            advance_to_clear = sheet.advance_sheet_residual
-            for move_lines in move_line_values_by_expense.values():
-                payable_move_line = False
-                for move_line in move_lines:
-                    credit = move_line["credit"]
-                    if not credit:
-                        continue
-                    # cr payable -> cr advance
-                    remain_payable = 0.0
-                    if credit > advance_to_clear:
-                        remain_payable = credit - advance_to_clear
-                        move_line["credit"] = advance_to_clear
-                        advance_to_clear = 0.0
-                        # extra payable line
-                        payable_move_line = move_line.copy()
-                        payable_move_line["credit"] = remain_payable
-                    else:
-                        advance_to_clear -= credit
-                    # advance line
-                    move_line["account_id"] = emp_advance.property_account_expense_id.id
-                if payable_move_line:
-                    move_lines.append(payable_move_line)
+            account_src = expense.account_id
+            account_dst = expense._get_expense_account_destination()
+            account_date = (
+                expense.date
+                or expense.sheet_id.accounting_date
+                or fields.Date.context_today(expense)
+            )
+
+            move_line_values = []
+            unit_amount = expense.unit_amount or expense.total_amount
+            quantity = expense.quantity if expense.unit_amount else 1
+            taxes = expense.tax_ids.with_context(round=True).compute_all(
+                unit_amount, expense.currency_id, quantity, expense.product_id
+            )
+            total_amount = 0.0
+            total_amount_currency = 0.0
+            partner_id = (
+                expense.employee_id.sudo().address_home_id.commercial_partner_id.id
+            )
+            # source move line
+            balance = expense.total_amount_company - expense.amount_tax_company
+            amount_currency = expense.total_amount - expense.amount_tax
+            move_line_src = {
+                "name": move_line_name,
+                "quantity": expense.quantity or 1,
+                "debit": balance if balance > 0 else 0,
+                "credit": -balance if balance < 0 else 0,
+                "amount_currency": amount_currency,
+                "account_id": account_src.id,
+                "product_id": expense.product_id.id,
+                "product_uom_id": expense.product_uom_id.id,
+                "analytic_distribution": expense.analytic_distribution,
+                "expense_id": expense.id,
+                "partner_id": partner_id,
+                "tax_ids": [(6, 0, expense.tax_ids.ids)],
+                "tax_tag_ids": [(6, 0, taxes["base_tags"])],
+                "currency_id": expense.currency_id.id,
+            }
+            move_line_values.append(move_line_src)
+            total_amount -= expense.total_amount_company
+            total_amount_currency -= expense.total_amount
+
+            # destination move line
+            emp_advance = self.env.ref(
+                "hr_expense_advance_clearing.product_emp_advance"
+            )
+            move_line_dst = {
+                "name": move_line_name,
+                "debit": total_amount > 0 and total_amount,
+                "credit": total_amount < 0 and -total_amount,
+                "account_id": emp_advance.property_account_expense_id.id,
+                "date_maturity": account_date,
+                "amount_currency": total_amount_currency,
+                "currency_id": expense.currency_id.id,
+                "expense_id": expense.id,
+                "partner_id": partner_id,
+            }
+            # Check clearing > advance, it will split line
+            credit = move_line_dst["credit"]
+            # cr payable -> cr advance
+            remain_payable = 0.0
+            payable_move_line = []
+            if (
+                float_compare(
+                    credit,
+                    advance_to_clear,
+                    precision_rounding=expense.currency_id.rounding,
+                )
+                == 1
+            ):
+                remain_payable = credit - advance_to_clear
+                move_line_dst["credit"] = advance_to_clear
+                move_line_dst["amount_currency"] = -advance_to_clear
+                advance_to_clear = 0.0
+                # extra payable line
+                payable_move_line = move_line_dst.copy()
+                payable_move_line["credit"] = remain_payable
+                payable_move_line["amount_currency"] = -remain_payable
+                payable_move_line["account_id"] = account_dst
+            # Add destination first
+            move_line_values.append(move_line_dst)
+            if payable_move_line:
+                move_line_values.append(payable_move_line)
+            move_line_values_by_expense[expense.id] = move_line_values
         return move_line_values_by_expense

hr_expense_advance_clearing/models/hr_expense_sheet.py

@@ -1,7 +1,7 @@
 # Copyright 2019 Kitti Upariphutthiphong <[email protected]>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import Command, _, api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import float_compare
 from odoo.tools.safe_eval import safe_eval
@@ -64,6 +64,15 @@ def _check_advance_expense(self):
         if advance_lines and len(advance_lines) != len(self.expense_line_ids):
             raise ValidationError(_("Advance must contain only advance expense line"))
 
+    @api.depends("account_move_id.payment_state")
+    def _compute_payment_state(self):
+        """After clear advance. payment state will change to 'paid'"""
+        res = super()._compute_payment_state()
+        for sheet in self:
+            if sheet.advance_sheet_id and sheet.account_move_id.state == "posted":
+                sheet.payment_state = "paid"
+        return res
+
     @api.depends("account_move_id.line_ids.amount_residual")
     def _compute_clearing_residual(self):
         emp_advance = self.env.ref(
@@ -90,13 +99,13 @@ def _compute_clearing_count(self):
 
     def action_sheet_move_create(self):
         res = super().action_sheet_move_create()
-        # Reconcile advance of this sheet with the advance_sheet
         emp_advance = self.env.ref("hr_expense_advance_clearing.product_emp_advance")
-        ctx = self._context.copy()
-        ctx.update({"skip_account_move_synchronization": True})
         for sheet in self:
+            if not sheet.advance_sheet_id:
+                continue
+            amount_residual_bf_reconcile = sheet.advance_sheet_residual
             advance_residual = float_compare(
-                sheet.advance_sheet_residual,
+                amount_residual_bf_reconcile,
                 sheet.total_amount,
                 precision_rounding=sheet.currency_id.rounding,
             )
@@ -116,10 +125,45 @@ def action_sheet_move_create(self):
                     ]
                 )
             )
-            adv_move_lines.with_context(**ctx).reconcile()
+            adv_move_lines.reconcile()
             # Update state on clearing advance when advance residual > total amount
-            if sheet.advance_sheet_id and advance_residual != -1:
-                sheet.write({"state": "done"})
+            if advance_residual != -1:
+                sheet.write(
+                    {
+                        "state": "done",
+                    }
+                )
+            # Update amount residual and state when advance residual < total amount
+            else:
+                sheet.write(
+                    {
+                        "state": "post",
+                        "payment_state": "not_paid",
+                        "amount_residual": sheet.total_amount
+                        - amount_residual_bf_reconcile,
+                    }
+                )
+        return res
+
+    def _prepare_bill_vals(self):
+        """create journal entry instead of bills when clearing document"""
+        self.ensure_one()
+        res = super()._prepare_bill_vals()
+        if self.advance_sheet_id and self.payment_mode == "own_account":
+            if (
+                self.advance_sheet_residual <= 0.0
+            ):  # Advance Sheets with no residual left
+                raise ValidationError(
+                    _("Advance: %s has no amount to clear") % (self.name)
+                )
+            res["move_type"] = "entry"
+            move_line_vals = []
+
+            for expense in self.expense_line_ids:
+                # get move line values
+                move_line_values_by_expense = expense._get_account_move_line_values()
+                move_line_vals.extend(move_line_values_by_expense.get(expense.id))
+            res["line_ids"] = [Command.create(x) for x in move_line_vals]
         return res
 
     def open_clear_advance(self):
@@ -156,7 +200,7 @@ def _prepare_clear_advance(self, line):
         # Prepare the clearing expense
         clear_line_dict = {
             "advance": False,
-            "name": False,
+            "name": line.clearing_product_id.display_name,
             "product_id": line.clearing_product_id.id,
             "clearing_product_id": False,
             "date": fields.Date.context_today(self),
@@ -166,7 +210,7 @@ def _prepare_clear_advance(self, line):
             "av_line_id": line.id,
         }
         clear_line = self.env["hr.expense"].new(clear_line_dict)
-        clear_line._compute_from_product_id_company_id()  # Set some vals
+        clear_line._compute_account_id()  # Set some vals
         # Prepare the original advance line
         adv_dict = line._convert_to_write(line._cache)
         # remove no update columns

hr_expense_advance_clearing/tests/test_hr_expense_advance_clearing.py

@@ -41,17 +41,15 @@ def setUpClass(cls):
             {
                 "code": "154000",
                 "name": "Employee Advance",
-                "user_type_id": cls.env.ref(
-                    "account.data_account_type_current_assets"
-                ).id,
+                "account_type": "asset_current",
                 "reconcile": True,
             }
         )
         cls.account_sales = cls.env["account.account"].create(
             {
                 "code": "X1020",
                 "name": "Product Sales - (test)",
-                "user_type_id": cls.env.ref("account.data_account_type_revenue").id,
+                "account_type": "asset_current",
             }
         )
         cls.emp_advance = cls.env.ref("hr_expense_advance_clearing.product_emp_advance")
@@ -81,7 +79,6 @@ def _create_expense(
         amount,
         advance=False,
         payment_mode="own_account",
-        account=False,
     ):
         with Form(
             self.env["hr.expense"].with_context(default_advance=advance)
@@ -90,10 +87,8 @@ def _create_expense(
             expense.employee_id = employee
             if not advance:
                 expense.product_id = product
-            expense.unit_amount = amount
+            expense.total_amount = amount
             expense.payment_mode = payment_mode
-            if account:
-                expense.account_id = account
         expense = expense.save()
         expense.tax_ids = False  # Test no vat
         return expense
@@ -145,8 +140,9 @@ def test_0_test_constraints(self):
                 self.emp_advance,
                 1.0,
                 advance=True,
-                account=self.account_sales,
             )
+            expense.account_id = self.account_sales.id
+            expense._check_advance()
         # Advance Sheet should not have > 1 expense lines
         with self.assertRaises(ValidationError):
             expense = self._create_expense(
@@ -333,5 +329,10 @@ def test_4_clearing_product_advance(self):
         self.assertEqual(len(ex_sheet.expense_line_ids), 0)
         ex_sheet._onchange_advance_sheet_id()
         self.assertEqual(len(ex_sheet.expense_line_ids), 1)
-        reverse_move = self.advance.account_move_id._reverse_moves(cancel=True)
+        reverse_move = self.advance.account_move_id._reverse_moves(
+            default_values_list=[
+                {"invoice_date": self.advance.account_move_id.date, "ref": False}
+            ],
+            cancel=True,
+        )
         self.assertNotEqual(reverse_move, self.advance.account_move_id)

hr_expense_advance_clearing/views/hr_expense_views.xml

@@ -141,12 +141,7 @@
                     placeholder="Optional clearing product is used during clear advance"
                 />
             </field>
-            <field name="analytic_account_id" position="attributes">
-                <attribute name="attrs">
-                    {'invisible': [('advance', '!=', False)]}
-                </attribute>
-            </field>
-            <field name="analytic_tag_ids" position="attributes">
+            <field name="analytic_distribution" position="attributes">
                 <attribute name="attrs">
                     {'invisible': [('advance', '!=', False)]}
                 </attribute>

hr_expense_advance_clearing/wizard/account_payment_register.py

@@ -110,20 +110,17 @@ def expense_post_return_advance(self):
         emp_advance = self.env.ref("hr_expense_advance_clearing.product_emp_advance")
         advance_account = emp_advance.property_account_expense_id
         # Create return advance and post it
-        payment_vals = self._create_payment_vals_from_wizard()
+        batches = self._get_batches()
+        first_batch_result = batches[0]
+        payment_vals = self._create_payment_vals_from_wizard(first_batch_result)
+        # Set new payment_type and payment entry to be Dr Bank, Cr Advance
         payment_vals["advance_id"] = expense_sheet.id
+        payment_vals["partner_type"] = "customer"
+        payment_vals["destination_account_id"] = advance_account.id
         payment_vals_list = [payment_vals]
         payment = (
             self.env["account.payment"].with_context(**ctx).create(payment_vals_list)
         )
-        # Set new payment_type and payment entry to be Dr Bank, Cr Advance
-        payment.write(
-            {
-                "payment_type": "inbound",
-                "partner_type": "customer",
-                "destination_account_id": advance_account,
-            }
-        )
         payment.action_post()
 
         redirect_link = (