From 5164997db739aedd6a0cc5fa9f87023bd9ffdb53 Mon Sep 17 00:00:00 2001 From: Shreya Date: Mon, 22 Jan 2018 12:34:39 +0530 Subject: [PATCH] delete column status --- .../doctype/leave_application/test_leave_application.js | 8 +++++--- erpnext/patches/v10_0/workflow_leave_application.py | 1 + 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.js b/erpnext/hr/doctype/leave_application/test_leave_application.js index 45719c75c37..6d51b710574 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.js +++ b/erpnext/hr/doctype/leave_application/test_leave_application.js @@ -20,13 +20,15 @@ QUnit.test("Test: Leave application [HR]", function (assert) { {follow_via_email: 0} ]); }, - () => frappe.timeout(1), + () => frappe.timeout(1), () => frappe.click_button('Actions'), - () => frappe.timeout(0.5), - () => frappe.click_button('Approve'), // approve the application [as administrator] + () => frappe.click_link('Approve'), // approve the application [as administrator] + () => frappe.click_button('Yes'), + () => frappe.timeout(1), () => assert.ok(cur_frm.doc.docstatus, "leave application submitted after approval"), + // check auto filled posting date [today] () => assert.equal(today_date, cur_frm.doc.posting_date, diff --git a/erpnext/patches/v10_0/workflow_leave_application.py b/erpnext/patches/v10_0/workflow_leave_application.py index 0b13a319eae..ca31128c21c 100644 --- a/erpnext/patches/v10_0/workflow_leave_application.py +++ b/erpnext/patches/v10_0/workflow_leave_application.py @@ -48,3 +48,4 @@ def execute(): }).insert(ignore_permissions=True) frappe.db.sql("""update `tabLeave Application` set workflow_state = status""") + frappe.db.sql("""alter table `tabLeave Application` drop column status""")