From 5683857f9fc7953a86b0eff205bedfef417415ca Mon Sep 17 00:00:00 2001 From: Anurag Mishra Date: Thu, 24 Jun 2021 13:22:36 +0530 Subject: [PATCH] fix: sider --- .../doctype/overtime_slip/test_overtime_slip.py | 3 ++- .../overtime_type/overtime_type_dashboard.py | 4 ++-- .../doctype/overtime_type/test_overtime_type.py | 4 ++-- .../payroll/doctype/salary_slip/salary_slip.py | 4 ++-- .../doctype/salary_slip/salary_slip_dashboard.py | 2 +- .../doctype/salary_slip/test_salary_slip.py | 15 ++++----------- erpnext/projects/doctype/timesheet/timesheet.py | 2 +- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/erpnext/payroll/doctype/overtime_slip/test_overtime_slip.py b/erpnext/payroll/doctype/overtime_slip/test_overtime_slip.py index e208f1e0280..b8b72166a3d 100644 --- a/erpnext/payroll/doctype/overtime_slip/test_overtime_slip.py +++ b/erpnext/payroll/doctype/overtime_slip/test_overtime_slip.py @@ -106,7 +106,8 @@ def create_attendance_records_for_overtime(employee, overtime_type): attendance.status = 'Present' attendance.attendance_date = add_days(today(), -(x)) attendance.overtime_type = overtime_type - attendance.overtime_duration = 2 * 3600 #for convertion to duration + #for convertion to duration + attendance.overtime_duration = 2 * 3600 attendance.save() attendance.submit() diff --git a/erpnext/payroll/doctype/overtime_type/overtime_type_dashboard.py b/erpnext/payroll/doctype/overtime_type/overtime_type_dashboard.py index 411b387b2de..de42f395b03 100644 --- a/erpnext/payroll/doctype/overtime_type/overtime_type_dashboard.py +++ b/erpnext/payroll/doctype/overtime_type/overtime_type_dashboard.py @@ -6,10 +6,10 @@ def get_data(): 'fieldname': 'overtime_type', 'transactions': [ { - 'items': ['Attendance', 'Timesheet'] + 'items': [_('Attendance'), _('Timesheet')] }, { - 'items': ['Overtime Slip'] + 'items': [_('Overtime Slip')] } ] } \ No newline at end of file diff --git a/erpnext/payroll/doctype/overtime_type/test_overtime_type.py b/erpnext/payroll/doctype/overtime_type/test_overtime_type.py index 1c85b21f679..9978cf5acfc 100644 --- a/erpnext/payroll/doctype/overtime_type/test_overtime_type.py +++ b/erpnext/payroll/doctype/overtime_type/test_overtime_type.py @@ -21,8 +21,8 @@ def create_overtime_type(**args): overtime_type.employee = args.employee overtime_type.standard_multiplier = 1.25 - overtime_type.applicable_for_weekend = args.applicable_for_weekend or 0 - overtime_type.applicable_for_public_holiday = args.applicable_for_public_holiday or 0 + overtime_type.applicable_for_weekend = args.applicable_for_weekend or 0 + overtime_type.applicable_for_public_holiday = args.applicable_for_public_holiday or 0 if args.applicable_for_weekend: overtime_type.weekend_multiplier = 1.5 diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.py b/erpnext/payroll/doctype/salary_slip/salary_slip.py index 3a444974d96..4ffa60c8c9a 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip.py @@ -535,8 +535,7 @@ class SalarySlip(TransactionBase): def get_overtime_slips(self): return frappe.get_all("Overtime Slip", filters = { 'employee': self.employee, - 'posting_date': (">=", self.start_date), - 'posting_date': ("<=", self.end_date), + 'posting_date': ("between", [self.start_date, self.end_date]), 'salary_slip': '', 'docstatus': 1 }, fields = ["name", "from_date", 'to_date']) @@ -572,6 +571,7 @@ class SalarySlip(TransactionBase): if "applicable_amount" not in overtime_types_details[detail.overtime_type].keys(): component_amount = sum([data.default_amount for data in self.earnings if data.salary_component in \ overtime_types_details[detail.overtime_type]["components"] and not data.get('additional_salary', None)]) + overtime_types_details[detail.overtime_type]["applicable_daily_amount"] = component_amount/self.total_working_days standard_working_hours = detail.standard_working_time/3600 diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip_dashboard.py b/erpnext/payroll/doctype/salary_slip/salary_slip_dashboard.py index 7569a381458..a7b301bcd5f 100644 --- a/erpnext/payroll/doctype/salary_slip/salary_slip_dashboard.py +++ b/erpnext/payroll/doctype/salary_slip/salary_slip_dashboard.py @@ -6,7 +6,7 @@ def get_data(): 'fieldname': 'salary_slip', 'transactions': [ { - 'items': ['Overtime Slip'] + 'items': [_('Overtime Slip')] } ] } \ No newline at end of file diff --git a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py index 8f4db4901df..415d62c304e 100644 --- a/erpnext/payroll/doctype/salary_slip/test_salary_slip.py +++ b/erpnext/payroll/doctype/salary_slip/test_salary_slip.py @@ -501,12 +501,9 @@ class TestSalarySlip(unittest.TestCase): daily_wages = applicable_amount/ salary_slip.total_working_days hourly_wages = daily_wages/ frappe.db.get_single_value("Hr Settings", "standard_working_hours") overtime_amount = hourly_wages * 4 * 1.25 - #since multiplier is defined as 1.25 and - - self.assertEquals(flt(overtime_amount, 2), flt(overtime_component_details.amount, 2) ) - - + #since multiplier is defined as 1.25 # formula = sum(applicable_component)/(working_days)/ daily_standard_working_time * overtime hours * multiplier + self.assertEquals(flt(overtime_amount, 2), flt(overtime_component_details.amount, 2)) def get_salary_component_for_overtime(self): component = [{ @@ -541,12 +538,8 @@ def make_employee_salary_slip(user, payroll_frequency, salary_structure=None): salary_structure = payroll_frequency + " Salary Structure Test for Salary Slip" - employee = frappe.db.get_value("Employee", - { - "user_id": user - }, - ["name", "company", "employee_name"], - as_dict=True) + employee = frappe.db.get_value("Employee", {"user_id": user}, + ["name", "company", "employee_name"], as_dict=True) salary_structure_doc = make_salary_structure(salary_structure, payroll_frequency, employee=employee.name, company=employee.company) salary_slip_name = frappe.db.get_value("Salary Slip", {"employee": frappe.db.get_value("Employee", {"user_id": user})}) diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py index 1f24939986c..758e7c8e81b 100644 --- a/erpnext/projects/doctype/timesheet/timesheet.py +++ b/erpnext/projects/doctype/timesheet/timesheet.py @@ -70,7 +70,7 @@ class Timesheet(Document): if data.is_overtime: if frappe.db.get_single_value("Payroll Settings", "overtime_based_on") == "Timesheet": if not self.employee: - frappe.throw("Select Employee, if applicable for overtime") + frappe.throw(_("Select Employee, if applicable for overtime")) if not data.overtime_type: frappe.throw(_("Define Overtime Type for Employee {0}").format(self.employee))