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

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

Browse Source 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
This commit is contained in:
Anand Doshi
2012-10-02 14:35:20 +05:30
parent 5bc86087fd 47d8947012
commit 05aaae33ae
20 changed files with 287 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stock/doctype/item/item.js
View File

@@ -106,6 +106,7 @@ cur_frm.fields_dict['item_group'].get_query = function(doc,cdt,cdn) {
cur_frm.cscript.add_image = function(doc, dt, dn) {
if(!doc.file_list) {
msgprint('Please attach a file first!');
return;
}
var f = doc.file_list.split('\n')[0];