nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 15:42:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: test

Browse Source
This commit is contained in:
Anurag Mishra
2021-07-14 12:33:50 +05:30
parent 7d272dc648
commit 10647bfcd7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/payroll/doctype/overtime_slip/overtime_slip.py
View File

@@ -116,7 +116,7 @@ class OvertimeSlip(Document):
def get_attendance_record(self): def get_attendance_record(self):
if self.from_date and self.to_date: if self.from_date and self.to_date:
records = frappe.db.sql("""SELECT overtime_duration, name, attendance_date, overtime_type, standard_working_time records = frappe.db.sql("""SELECT overtime_duration, name, attendance_date, overtime_type, standard_working_time
FROM `TabAttendance` FROM `tabAttendance`
WHERE WHERE
attendance_date >= %s AND attendance_date <= %s attendance_date >= %s AND attendance_date <= %s
AND employee = %s AND employee = %s
@@ -132,7 +132,7 @@ class OvertimeSlip(Document):
if self.from_date and self.to_date: if self.from_date and self.to_date:
records = frappe.db.sql("""SELECT ts.name, ts.start_date, ts.end_date, tsd.overtime_on, tsd.overtime_type, tsd.overtime_hours records = frappe.db.sql("""SELECT ts.name, ts.start_date, ts.end_date, tsd.overtime_on, tsd.overtime_type, tsd.overtime_hours
FROM `TabTimesheet` AS ts FROM `tabTimesheet` AS ts
INNER JOIN `tabTimesheet Detail` As tsd ON tsd.parent = ts.name INNER JOIN `tabTimesheet Detail` As tsd ON tsd.parent = ts.name
WHERE WHERE
ts.docstatus = 1 ts.docstatus = 1

2
erpnext/payroll/doctype/salary_slip/salary_slip.py
View File

@@ -769,7 +769,7 @@ class SalarySlip(TransactionBase):
tax_row = get_salary_component_data(d) tax_row = get_salary_component_data(d)
self.update_component_row(tax_row, tax_amount, "deductions") self.update_component_row(tax_row, tax_amount, "deductions")
def update_component_row(self, component_data, amount, component_type, additional_salary=None, processed_overtime_slips =[]): def update_component_row(self, component_data, amount, component_type, additional_salary=None, processed_overtime_slips =[], is_recurring=0):
component_row = None component_row = None
for d in self.get(component_type): for d in self.get(component_type):
if d.salary_component != component_data.salary_component: if d.salary_component != component_data.salary_component: