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

Merge branch 'master' of github.com:webnotes/erpnext into production

Browse Source
This commit is contained in:
Nabin Hait
2012-12-14 13:21:52 +05:30
parent f8de5b9878 0f502112d2
commit fce76cd5b2
5 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/startup.js
View File

@@ -168,7 +168,7 @@ erpnext.setup_mousetrap = function() {
});
Mousetrap.bind(["command+s", "ctrl+s"], function() {
if(cur_frm)
if(cur_frm && !cur_frm.save_disabled)
cur_frm.save();
else if(wn.container.page.save_action)
wn.container.page.save_action();