From fc0e8e5c6a0edf6e8d75e219a27750d6f1c6b322 Mon Sep 17 00:00:00 2001 From: Shreya Date: Tue, 16 Jan 2018 14:43:17 +0530 Subject: [PATCH] modified patches.txt --- .travis.yml | 2 ++ .../hr/doctype/leave_application/test_leave_application.js | 2 +- erpnext/patches.txt | 1 + erpnext/patches/v10_0/workflow_leave_application.py | 2 +- erpnext/public/css/pos.css | 5 +---- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 03e75b6897..e19a1dc046 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/erpnext/hr/doctype/leave_application/test_leave_application.js b/erpnext/hr/doctype/leave_application/test_leave_application.js index 7d5fdf0ef6..45719c75c3 100644 --- a/erpnext/hr/doctype/leave_application/test_leave_application.js +++ b/erpnext/hr/doctype/leave_application/test_leave_application.js @@ -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() ]); diff --git a/erpnext/patches.txt b/erpnext/patches.txt index d99523fd49..fa73e1ce29 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -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 \ No newline at end of file diff --git a/erpnext/patches/v10_0/workflow_leave_application.py b/erpnext/patches/v10_0/workflow_leave_application.py index ca31128c21..4128631cd6 100644 --- a/erpnext/patches/v10_0/workflow_leave_application.py +++ b/erpnext/patches/v10_0/workflow_leave_application.py @@ -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""") diff --git a/erpnext/public/css/pos.css b/erpnext/public/css/pos.css index e2d301df0d..bc81182f32 100644 --- a/erpnext/public/css/pos.css +++ b/erpnext/public/css/pos.css @@ -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; }