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

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

Browse Source 
Conflicts:
	accounts/search_criteria/trend_analyzer/trend_analyzer.py
	buying/doctype/purchase_common/purchase_common.js
This commit is contained in:
Anand Doshi
2013-06-21 12:22:52 +05:30
parent cd6dcacc6e 2ef637b346
commit d52b03a8cc
57 changed files with 1572 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
buying/doctype/purchase_common/purchase_common.js
View File

@@ -445,7 +445,7 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
$.each(field_label_map, function(fname, label) {
$wrapper.find('[data-grid-fieldname="'+fname+'"]').text(label);
});
},
}
});
// to save previous state of cur_frm.cscript
@@ -459,4 +459,4 @@ $.extend(cur_frm.cscript, prev_cscript);
var tname = cur_frm.cscript.tname;
var fname = cur_frm.cscript.fname;
var fname = cur_frm.cscript.fname;