modified patches.txt
This commit is contained in:
parent
4298bcfa40
commit
fc0e8e5c6a
@ -58,12 +58,14 @@ jobs:
|
||||
- stage: test
|
||||
script:
|
||||
- set -e
|
||||
- bench execute erpnext.patches.v10_0.workflow_leave_application.execute
|
||||
- bench run-tests
|
||||
env: Server Side Test
|
||||
- # stage
|
||||
script:
|
||||
- bench --verbose run-setup-wizard-ui-test
|
||||
- bench execute erpnext.setup.utils.enable_all_roles_and_domains
|
||||
- bench execute erpnext.patches.v10_0.workflow_leave_application.execute
|
||||
- bench run-ui-tests --app erpnext
|
||||
env: Client Side Test
|
||||
- # stage
|
||||
|
@ -34,7 +34,7 @@ QUnit.test("Test: Leave application [HR]", function (assert) {
|
||||
() => frappe.set_route("List", "Leave Application", "List"),
|
||||
() => frappe.timeout(1),
|
||||
// // check approved application in list
|
||||
() => assert.deepEqual(["Test Employee 1", "Approved"], [cur_list.data[0].employee_name, cur_list.data[0].workflow_state],
|
||||
() => assert.deepEqual(["Test Employee 1", "Approved"], [cur_list.data[0].employee_name, cur_list.data[0].workflow_state]),
|
||||
// "leave for correct employee is approved"),
|
||||
() => done()
|
||||
]);
|
||||
|
@ -488,3 +488,4 @@ erpnext.patches.v10_0.set_numeric_ranges_in_template_if_blank
|
||||
erpnext.patches.v10_0.update_reserved_qty_for_purchase_order
|
||||
erpnext.patches.v10_0.update_assessment_plan
|
||||
erpnext.patches.v10_0.update_assessment_result
|
||||
erpnext.patches.v10_0.workflow_leave_application
|
@ -48,4 +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""")
|
||||
# frappe.db.sql("""alter table `tabLeave Application` drop column status""")
|
||||
|
@ -169,8 +169,5 @@ input[type=number]::-webkit-outer-spin-button {
|
||||
height: 60px;
|
||||
}
|
||||
.grand-total .grand-total-value {
|
||||
font-size: 18px;
|
||||
}
|
||||
.rounded-total-value {
|
||||
font-size: 18px;
|
||||
font-size: 24px;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user