schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename occurences of max_days_allowed to max_continuous allowed (#14180)

Browse Source
This commit is contained in:
Faris Ansari
2018-05-23 10:31:39 +05:30
committed by Nabin Hait
parent 83149644e3
commit 26eb513274
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/demo/setup/setup_data.py
View File

@@ -241,10 +241,10 @@ def setup_user_roles():
def setup_leave_allocation(): def setup_leave_allocation():
year = now_datetime().year year = now_datetime().year
for employee in frappe.get_all('Employee', fields=['name']): for employee in frappe.get_all('Employee', fields=['name']):
leave_types = frappe.get_all("Leave Type", fields=['name', 'max_days_allowed']) leave_types = frappe.get_all("Leave Type", fields=['name', 'max_continuous_days_allowed'])
for leave_type in leave_types: for leave_type in leave_types:
if not leave_type.max_days_allowed: if not leave_type.max_continuous_days_allowed:
leave_type.max_days_allowed = 10 leave_type.max_continuous_days_allowed = 10
leave_allocation = frappe.get_doc({ leave_allocation = frappe.get_doc({
"doctype": "Leave Allocation", "doctype": "Leave Allocation",
@@ -252,7 +252,7 @@ def setup_leave_allocation():
"from_date": "{0}-01-01".format(year), "from_date": "{0}-01-01".format(year),
"to_date": "{0}-12-31".format(year), "to_date": "{0}-12-31".format(year),
"leave_type": leave_type.name, "leave_type": leave_type.name,
"new_leaves_allocated": random.randint(1, int(leave_type.max_days_allowed)) "new_leaves_allocated": random.randint(1, int(leave_type.max_continuous_days_allowed))
}) })
leave_allocation.insert() leave_allocation.insert()
leave_allocation.submit() leave_allocation.submit()

2
erpnext/hr/doctype/leave_application/leave_application.py
View File

@@ -252,7 +252,7 @@ class LeaveApplication(Document):
return leave_count_on_half_day_date * 0.5 return leave_count_on_half_day_date * 0.5
def validate_max_days(self): def validate_max_days(self):
max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_days_allowed") max_days = frappe.db.get_value("Leave Type", self.leave_type, "max_continuous_days_allowed")
if max_days and self.total_leave_days > cint(max_days): if max_days and self.total_leave_days > cint(max_days):
frappe.throw(_("Leave of type {0} cannot be longer than {1}").format(self.leave_type, max_days)) frappe.throw(_("Leave of type {0} cannot be longer than {1}").format(self.leave_type, max_days))

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

@@ -367,7 +367,7 @@ class TestLeaveApplication(unittest.TestCase):
leave_type_name = 'Test Leave Type', leave_type_name = 'Test Leave Type',
doctype = 'Leave Type', doctype = 'Leave Type',
max_leaves_allowed = 15, max_leaves_allowed = 15,
max_days_allowed = 3 max_continuous_days_allowed = 3
)).insert() )).insert()
date = add_days(nowdate(), -7) date = add_days(nowdate(), -7)

2
erpnext/hr/doctype/leave_type/leave_type.json
View File

@@ -113,7 +113,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "max_days_allowed", "fieldname": "max_continuous_days_allowed",
"fieldtype": "Int", "fieldtype": "Int",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,

2
erpnext/hr/doctype/leave_type/test_leave_type.js
View File

@@ -10,7 +10,7 @@ QUnit.test("Test: Leave type [HR]", function (assert) {
() => frappe.new_doc("Leave Type"), () => frappe.new_doc("Leave Type"),
() => frappe.timeout(1), () => frappe.timeout(1),
() => cur_frm.set_value("leave_type_name", "Test Leave type"), () => cur_frm.set_value("leave_type_name", "Test Leave type"),
() => cur_frm.set_value("max_days_allowed", "5"), () => cur_frm.set_value("max_continuous_days_allowed", "5"),
() => frappe.click_check('Is Carry Forward'), () => frappe.click_check('Is Carry Forward'),
// save form // save form
() => cur_frm.save(), () => cur_frm.save(),

1
erpnext/patches/v11_0/rename_field_max_days_allowed.py
View File

@@ -9,4 +9,3 @@ def execute():
frappe.db.sql_ddl("""ALTER table `tabLeave Type` modify max_days_allowed int(8) NOT NULL""") frappe.db.sql_ddl("""ALTER table `tabLeave Type` modify max_days_allowed int(8) NOT NULL""")
frappe.reload_doc("hr", "doctype", "leave_type") frappe.reload_doc("hr", "doctype", "leave_type")
rename_field("Leave Type", "max_days_allowed", "max_continuous_days_allowed") rename_field("Leave Type", "max_days_allowed", "max_continuous_days_allowed")

2
erpnext/setup/setup_wizard/operations/install_fixtures.py
View File

@@ -84,7 +84,7 @@ def install(country=None):
# leave type # leave type
{'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'), {'doctype': 'Leave Type', 'leave_type_name': _('Casual Leave'), 'name': _('Casual Leave'),
'allow_encashment': 1, 'is_carry_forward': 1, 'max_days_allowed': '3', 'include_holiday': 1}, 'allow_encashment': 1, 'is_carry_forward': 1, 'max_continuous_days_allowed': '3', 'include_holiday': 1},
{'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'), {'doctype': 'Leave Type', 'leave_type_name': _('Compensatory Off'), 'name': _('Compensatory Off'),
'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1}, 'allow_encashment': 0, 'is_carry_forward': 0, 'include_holiday': 1},
{'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'), {'doctype': 'Leave Type', 'leave_type_name': _('Sick Leave'), 'name': _('Sick Leave'),