nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Nabin Hait
2018-02-07 16:07:20 +05:30
parent e2aec86bfa 0725eab858
commit c224d34a2c
14 changed files with 71 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/page/pos/pos.js
View File

@@ -15,6 +15,7 @@ frappe.pages['pos'].on_page_load = function (wrapper) {
cur_pos = wrapper.pos;
} else {
// online
frappe.flags.is_online = true
frappe.set_route('point-of-sale');
}
});
@@ -24,6 +25,10 @@ frappe.pages['pos'].refresh = function (wrapper) {
window.onbeforeunload = function () {
return wrapper.pos.beforeunload()
}
if (frappe.flags.is_online) {
frappe.set_route('point-of-sale');
}
}
erpnext.pos.PointOfSale = erpnext.taxes_and_totals.extend({