nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Rucha Mahabal
2022-03-13 21:05:06 +05:30
committed by GitHub
parent d50dbca844
commit 465c117708
2 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/hr/doctype/leave_application/test_leave_application.py
View File

@@ -272,14 +272,7 @@ class TestLeaveApplication(unittest.TestCase):
make_allocation_record(leave_type=leave_type.name, from_date=get_year_start(date), to_date=get_year_ending(date)) make_allocation_record(leave_type=leave_type.name, from_date=get_year_start(date), to_date=get_year_ending(date))
employee = get_employee() employee = get_employee()
<<<<<<< HEAD
original_holiday_list = employee.holiday_list
frappe.db.set_value("Employee", employee.name, "holiday_list", holiday_list)
first_sunday = get_first_sunday(holiday_list)
=======
first_sunday = get_first_sunday(self.holiday_list) first_sunday = get_first_sunday(self.holiday_list)
>>>>>>> 3f3b1766c2 (test: get leave details for leave application dashboard)
leave_application = make_leave_application(employee.name, first_sunday, add_days(first_sunday, 3), leave_type.name) leave_application = make_leave_application(employee.name, first_sunday, add_days(first_sunday, 3), leave_type.name)
leave_application.reload() leave_application.reload()
@@ -288,12 +281,7 @@ class TestLeaveApplication(unittest.TestCase):
leave_application.cancel() leave_application.cancel()
<<<<<<< HEAD
frappe.db.set_value("Employee", employee.name, "holiday_list", original_holiday_list)
=======
@set_holiday_list('Salary Slip Test Holiday List', '_Test Company') @set_holiday_list('Salary Slip Test Holiday List', '_Test Company')
>>>>>>> 3f3b1766c2 (test: get leave details for leave application dashboard)
def test_attendance_update_for_exclude_holidays(self): def test_attendance_update_for_exclude_holidays(self):
# Case 2: leave type with 'Include holidays within leaves as leaves' disabled # Case 2: leave type with 'Include holidays within leaves as leaves' disabled
frappe.delete_doc_if_exists("Leave Type", "Test Do Not Include Holidays", force=1) frappe.delete_doc_if_exists("Leave Type", "Test Do Not Include Holidays", force=1)
@@ -307,13 +295,7 @@ class TestLeaveApplication(unittest.TestCase):
make_allocation_record(leave_type=leave_type.name, from_date=get_year_start(date), to_date=get_year_ending(date)) make_allocation_record(leave_type=leave_type.name, from_date=get_year_start(date), to_date=get_year_ending(date))
employee = get_employee() employee = get_employee()
<<<<<<< HEAD
original_holiday_list = employee.holiday_list
frappe.db.set_value("Employee", employee.name, "holiday_list", holiday_list)
first_sunday = get_first_sunday(holiday_list)
=======
first_sunday = get_first_sunday(self.holiday_list) first_sunday = get_first_sunday(self.holiday_list)
>>>>>>> 3f3b1766c2 (test: get leave details for leave application dashboard)
# already marked attendance on a holiday should be deleted in this case # already marked attendance on a holiday should be deleted in this case
config = { config = {
@@ -482,15 +464,7 @@ class TestLeaveApplication(unittest.TestCase):
holiday_list = 'Test Holiday List for Optional Holiday' holiday_list = 'Test Holiday List for Optional Holiday'
employee = get_employee() employee = get_employee()
<<<<<<< HEAD
default_holiday_list = make_holiday_list()
original_holiday_list = employee.holiday_list
frappe.db.set_value("Employee", employee.name, "holiday_list", default_holiday_list)
first_sunday = get_first_sunday(default_holiday_list)
=======
first_sunday = get_first_sunday(self.holiday_list) first_sunday = get_first_sunday(self.holiday_list)
>>>>>>> 3f3b1766c2 (test: get leave details for leave application dashboard)
optional_leave_date = add_days(first_sunday, 1) optional_leave_date = add_days(first_sunday, 1)
if not frappe.db.exists('Holiday List', holiday_list): if not frappe.db.exists('Holiday List', holiday_list):

5
erpnext/payroll/doctype/salary_slip/test_salary_slip.py
View File

@@ -1095,14 +1095,9 @@ def setup_test():
def make_holiday_list(list_name=None, from_date=None, to_date=None): def make_holiday_list(list_name=None, from_date=None, to_date=None):
fiscal_year = get_fiscal_year(nowdate(), company=erpnext.get_default_company()) fiscal_year = get_fiscal_year(nowdate(), company=erpnext.get_default_company())
<<<<<<< HEAD
holiday_list = frappe.db.exists("Holiday List", "Salary Slip Test Holiday List")
if not frappe.db.get_value("Holiday List", "Salary Slip Test Holiday List"):
=======
name = list_name or "Salary Slip Test Holiday List" name = list_name or "Salary Slip Test Holiday List"
holiday_list = frappe.db.exists("Holiday List", name) holiday_list = frappe.db.exists("Holiday List", name)
if not holiday_list: if not holiday_list:
>>>>>>> c050ce49c2 (test: employee leave balance report)
holiday_list = frappe.get_doc({ holiday_list = frappe.get_doc({
"doctype": "Holiday List", "doctype": "Holiday List",
"holiday_list_name": name, "holiday_list_name": name,