nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 16:34:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete column status

Browse Source
This commit is contained in:
Shreya
2018-01-22 12:34:39 +05:30
parent dd66bc03c7
commit 5164997db7
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/hr/doctype/leave_application/test_leave_application.js
View File

@@ -20,13 +20,15 @@ QUnit.test("Test: Leave application [HR]", function (assert) {
{follow_via_email: 0} {follow_via_email: 0}
]); ]);
}, },
() => frappe.timeout(1),
() => frappe.timeout(1),
() => frappe.click_button('Actions'), () => frappe.click_button('Actions'),
() => frappe.timeout(0.5), () => frappe.click_link('Approve'), // approve the application [as administrator]
() => frappe.click_button('Approve'), // approve the application [as administrator] () => frappe.click_button('Yes'),
() => frappe.timeout(1),
() => assert.ok(cur_frm.doc.docstatus, () => assert.ok(cur_frm.doc.docstatus,
"leave application submitted after approval"), "leave application submitted after approval"),
// check auto filled posting date [today] // check auto filled posting date [today]
() => assert.equal(today_date, cur_frm.doc.posting_date, () => assert.equal(today_date, cur_frm.doc.posting_date,

1
erpnext/patches/v10_0/workflow_leave_application.py
View File

@@ -48,3 +48,4 @@ def execute():
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True)
frappe.db.sql("""update `tabLeave Application` set workflow_state = status""") frappe.db.sql("""update `tabLeave Application` set workflow_state = status""")
frappe.db.sql("""alter table `tabLeave Application` drop column status""")