From 12bdd6820d8d70f9f7842a1953a7d95d5d694251 Mon Sep 17 00:00:00 2001
From: Nam Nguyen Phuong <73516957+namnguyenphuong355@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:11:21 +0700
Subject: [PATCH 1/2] Fix Bug When Generate Payslip

---
 hr_payroll_community/models/hr_payslip.py | 35 +++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/hr_payroll_community/models/hr_payslip.py b/hr_payroll_community/models/hr_payslip.py
index 1ef9fed3..506cbf46 100644
--- a/hr_payroll_community/models/hr_payslip.py
+++ b/hr_payroll_community/models/hr_payslip.py
@@ -237,20 +237,20 @@ def get_worked_day_lines(self, contracts, date_from, date_to):
 
             # compute leave days
             leaves = {}
-            query = "SELECT id FROM hr_leave WHERE employee_id = '" + str(
-                self.employee_id.id) + "' " \
-                                       "AND request_date_from > '" + str(
-                self.date_from) + "' AND " \
-                                  "request_date_to < '" + str(self.date_to) + (
-                        "' AND state = "
-                        "'validate'")
+            query = """
+                        SELECT id FROM hr_leave hl WHERE hl.employee_id = %s
+                        AND hl.request_date_from >= '%s'
+                        AND hl.request_date_to <= '%s'
+                        AND hl.state = 'validate'
+                    """
+            query = query % (str(contract.employee_id.id), str(day_from.strftime('%Y-%m-%d')), str(day_to.strftime('%Y-%m-%d')))
             self.env.cr.execute(query)
             docs = self.env.cr.dictfetchall()
             leave_ids = []
             for rec in docs:
                 leave_ids.append(rec['id'])
             hr_leaves = self.env['hr.leave'].browse(leave_ids)
-            work_hours = self.contract_id.resource_calendar_id.hours_per_day
+            work_hours = contract.resource_calendar_id.hours_per_day
             if hr_leaves:
                 list_leave = []
                 for item in hr_leaves:
@@ -268,17 +268,14 @@ def get_worked_day_lines(self, contracts, date_from, date_to):
                     list_leave.append(data)
                 for rec in list_leave:
                     holiday = rec['time off']
-                    current_leave_struct = leaves.setdefault(
-                        holiday.holiday_status_id, {
-                            'name': holiday.holiday_status_id.name or _(
-                                'Global Leaves'),
-                            'sequence': 5,
-                            'code': holiday.holiday_status_id.code or 'GLOBAL',
-                            'number_of_days': 0.0,
-                            'number_of_hours': 0.0,
-                            'contract_id': contract.id,
-                        })
-
+                    current_leave_struct = leaves.setdefault(holiday.holiday_status_id, {
+                        'name': holiday.holiday_status_id.name or _('Global Leaves'),
+                        'sequence': 5,
+                        'code': holiday.holiday_status_id.code or 'GLOBAL',
+                        'number_of_days': 0.0,
+                        'number_of_hours': 0.0,
+                        'contract_id': contract.id,
+                    })
                     current_leave_struct['number_of_hours'] += rec['duration']
                     current_leave_struct[
                         'number_of_days'] += (rec['duration'] / work_hours)

From 942725a071a417be150392a20f47246d8d4cbf76 Mon Sep 17 00:00:00 2001
From: Nam Nguyen Phuong <73516957+namnguyenphuong355@users.noreply.github.com>
Date: Thu, 3 Aug 2023 16:18:58 +0700
Subject: [PATCH 2/2] refactor

---
 hr_payroll_community/models/hr_payslip.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_payroll_community/models/hr_payslip.py b/hr_payroll_community/models/hr_payslip.py
index 506cbf46..802e33c5 100644
--- a/hr_payroll_community/models/hr_payslip.py
+++ b/hr_payroll_community/models/hr_payslip.py
@@ -243,7 +243,7 @@ def get_worked_day_lines(self, contracts, date_from, date_to):
                         AND hl.request_date_to <= '%s'
                         AND hl.state = 'validate'
                     """
-            query = query % (str(contract.employee_id.id), str(day_from.strftime('%Y-%m-%d')), str(day_to.strftime('%Y-%m-%d')))
+            query = query % (str(contract.employee_id.id), day_from.strftime('%Y-%m-%d'), day_to.strftime('%Y-%m-%d'))
             self.env.cr.execute(query)
             docs = self.env.cr.dictfetchall()
             leave_ids = []