Fixing

OCA · Jul 16, 2024 · c2884bb · c2884bb
1 parent e32dc68
commit c2884bb
Show file tree

Hide file tree

Showing 3 changed files with 99 additions and 88 deletions.
diff --git a/payroll_account/README.rst b/payroll_account/README.rst
@@ -68,6 +68,7 @@ Contributors
 
 * Odoo SA <[email protected]>
 * Saran Lim. <[email protected]>
+* Herry/Panca. <https://solusiaglis.co.id>
 
 Maintainers
 ~~~~~~~~~~~

diff --git a/payroll_account/models/hr_payslip.py b/payroll_account/models/hr_payslip.py
@@ -430,97 +430,107 @@ def generate_journal_batch(self):
     def action_payslip_done(self):
         res = super(HrPayslip, self).action_payslip_done()
 
-        can_merge = False
+        for rec in self:
+            # not batch, run original core odoo (generate_journal_single, this will until post)
+            if not rec.payslip_run_id:
+                rec.generate_journal_single()
+            else:
 
-        # check all confirm except the current record
-        rec_done = self.env["hr.payslip"].search(
-            [("state", "=", "done"), ("payslip_run_id", "=", self.payslip_run_id.id)]
-        )
-        rec_all = self.env["hr.payslip"].search(
-            [("payslip_run_id", "=", self.payslip_run_id.id)]
-        )
+                # for batch, merge journal until draft
 
-        if len(rec_all) == len(rec_done):
-            can_merge = True
-
-        if can_merge:
-            merge_line_ids = []
-            journal_id = False
-            journal_date = False
-            batch_name = False
-            for rec in rec_done:
-                if rec.payslip_run_id:
-                    rec.generate_journal_batch()
-                    journal_id = rec.move_id.id
-                    journal_date = rec.move_id.date
-                    batch_name = rec.payslip_run_id.name
-                    for move_rec in rec.move_id.line_ids:
-                        move_line = (
-                            0,
-                            0,
-                            {
-                                "name": move_rec.name,
-                                "partner_id": move_rec.partner_id.id
-                                if move_rec.partner_id
-                                else False,
-                                "account_id": move_rec.account_id.id,
-                                "analytic_account_id": move_rec.analytic_account_id.id
-                                if move_rec.analytic_account_id
-                                else False,
-                                "journal_id": move_rec.journal_id.id,
-                                "date": move_rec.date,
-                                "debit": move_rec.debit,
-                                "credit": move_rec.credit,
-                            },
-                        )
-                        merge_line_ids.append(move_line)
+                can_merge = False
 
-                    # delete draft journal per payslip
-                    rec.move_id.unlink()
-                    rec.move_id = False
+                # check all confirm except the current record
+                rec_done = self.env["hr.payslip"].search(
+                    [
+                        ("state", "=", "done"),
+                        ("payslip_run_id", "=", self.payslip_run_id.id),
+                    ]
+                )
+                rec_all = self.env["hr.payslip"].search(
+                    [("payslip_run_id", "=", self.payslip_run_id.id)]
+                )
 
-            move_narration = _("Payslip Batch")
-            move_dict = {
-                "narration": move_narration,
-                "ref": batch_name,
-                "journal_id": journal_id,
-                "date": journal_date,
-            }
+                if len(rec_all) == len(rec_done):
+                    can_merge = True
+
+                if can_merge:
+                    merge_line_ids = []
+                    journal_id = False
+                    journal_date = False
+                    batch_name = False
+                    for rec in rec_done:
+                        if rec.payslip_run_id:
+                            rec.generate_journal_batch()
+                            journal_id = rec.move_id.id
+                            journal_date = rec.move_id.date
+                            batch_name = rec.payslip_run_id.name
+                            for move_rec in rec.move_id.line_ids:
+                                move_line = (
+                                    0,
+                                    0,
+                                    {
+                                        "name": move_rec.name,
+                                        "partner_id": move_rec.partner_id.id
+                                        if move_rec.partner_id
+                                        else False,
+                                        "account_id": move_rec.account_id.id,
+                                        "analytic_account_id": move_rec.analytic_account_id.id
+                                        if move_rec.analytic_account_id
+                                        else False,
+                                        "journal_id": move_rec.journal_id.id,
+                                        "date": move_rec.date,
+                                        "debit": move_rec.debit,
+                                        "credit": move_rec.credit,
+                                    },
+                                )
+                                merge_line_ids.append(move_line)
+
+                            # delete draft journal per payslip
+                            rec.move_id.unlink()
+                            rec.move_id = False
+
+                    move_narration = _("Payslip Batch")
+                    move_dict = {
+                        "narration": move_narration,
+                        "ref": batch_name,
+                        "journal_id": journal_id,
+                        "date": journal_date,
+                    }
+
+                    final_merge_line_ids = []
+                    for line in merge_line_ids:
+                        # search account_id and analytic_account_id
+                        found_src = False
+                        found_src_id = 0
+                        if len(final_merge_line_ids) > 0:
+                            for src in final_merge_line_ids:
+                                if (
+                                    src[2]["account_id"] == line[2]["account_id"]
+                                    and src[2]["analytic_account_id"]
+                                    == line[2]["analytic_account_id"]
+                                    and src[2]["partner_id"] == line[2]["partner_id"]
+                                ):
+                                    found_src = True
+                                    break
+
+                                found_src_id += 1
+
+                        if not found_src:
+                            final_merge_line_ids.append(line)
+                        else:
+                            final_merge_line_ids[found_src_id][2]["debit"] += line[2][
+                                "debit"
+                            ]
+                            final_merge_line_ids[found_src_id][2]["credit"] += line[2][
+                                "credit"
+                            ]
 
-            final_merge_line_ids = []
-            for line in merge_line_ids:
-                # search account_id and analytic_account_id
-                found_src = False
-                found_src_id = 0
-                if len(final_merge_line_ids) > 0:
-                    for src in final_merge_line_ids:
-                        if (
-                            src[2]["account_id"] == line[2]["account_id"]
-                            and src[2]["analytic_account_id"]
-                            == line[2]["analytic_account_id"]
-                            and src[2]["partner_id"] == line[2]["partner_id"]
-                        ):
-                            found_src = True
-                            break
-
-                        found_src_id += 1
-
-                if not found_src:
-                    final_merge_line_ids.append(line)
-                else:
-                    final_merge_line_ids[found_src_id][2]["debit"] += line[2]["debit"]
-                    final_merge_line_ids[found_src_id][2]["credit"] += line[2]["credit"]
-
-            if final_merge_line_ids:
-                move_dict["line_ids"] = final_merge_line_ids
-                move = self.env["account.move"].create(move_dict)
-                # update all slip to this journal
-                for rec in rec_done:
-                    rec.write({"move_id": move.id, "date": journal_date})
-
-        else:
-            for rec in self:
-                if not rec.payslip_run_id:
-                    rec.generate_journal_single()
+                    if final_merge_line_ids:
+                        move_dict["line_ids"] = final_merge_line_ids
+                        move = self.env["account.move"].create(move_dict)
+                        # update all slip to this journal
+                        for rec in rec_done:
+                            rec.write({"move_id": move.id, "date": journal_date})
 
         return res
diff --git a/payroll_account/static/description/index.html b/payroll_account/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>
@@ -413,6 +412,7 @@ <h2><a class="toc-backref" href="#toc-entry-5">Contributors</a></h2>
 <ul class="simple">
 <li>Odoo SA &lt;<a class="reference external" href="mailto:info&#64;odoo.com">info&#64;odoo.com</a>&gt;</li>
 <li>Saran Lim. &lt;<a class="reference external" href="mailto:saranl&#64;ecosoft.co.th">saranl&#64;ecosoft.co.th</a>&gt;</li>
+<li>Herry/Panca. &lt;<a class="reference external" href="https://solusiaglis.co.id">https://solusiaglis.co.id</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">