nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 20:29:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

modified patches.txt

Browse Source
This commit is contained in:
Shreya
2018-01-16 14:43:17 +05:30
parent 4298bcfa40
commit fc0e8e5c6a
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -58,12 +58,14 @@ jobs:
- stage: test - stage: test
script: script:
- set -e - set -e
- bench execute erpnext.patches.v10_0.workflow_leave_application.execute
- bench run-tests - bench run-tests
env: Server Side Test env: Server Side Test
- # stage - # stage
script: script:
- bench --verbose run-setup-wizard-ui-test - bench --verbose run-setup-wizard-ui-test
- bench execute erpnext.setup.utils.enable_all_roles_and_domains - 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 - bench run-ui-tests --app erpnext
env: Client Side Test env: Client Side Test
- # stage - # stage

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

@@ -34,7 +34,7 @@ QUnit.test("Test: Leave application [HR]", function (assert) {
() => frappe.set_route("List", "Leave Application", "List"), () => frappe.set_route("List", "Leave Application", "List"),
() => frappe.timeout(1), () => frappe.timeout(1),
// // check approved application in list // // 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"), // "leave for correct employee is approved"),
() => done() () => done()
]); ]);

1
erpnext/patches.txt
View File

@@ -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_reserved_qty_for_purchase_order
erpnext.patches.v10_0.update_assessment_plan erpnext.patches.v10_0.update_assessment_plan
erpnext.patches.v10_0.update_assessment_result erpnext.patches.v10_0.update_assessment_result
erpnext.patches.v10_0.workflow_leave_application

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

@@ -48,4 +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""") # frappe.db.sql("""alter table `tabLeave Application` drop column status""")

5
erpnext/public/css/pos.css
View File

@@ -169,8 +169,5 @@ input[type=number]::-webkit-outer-spin-button {
height: 60px; height: 60px;
} }
.grand-total .grand-total-value { .grand-total .grand-total-value {
font-size: 18px; font-size: 24px;
}
.rounded-total-value {
font-size: 18px;
} }