nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 16:45:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	accounts/doctype/purchase_invoice/purchase_invoice.py
	accounts/doctype/sales_invoice/sales_invoice.txt
	selling/doctype/lead/lead.txt
	selling/doctype/opportunity/opportunity.txt
	stock/doctype/warehouse/warehouse.py
This commit is contained in:
Anand Doshi
2013-10-02 16:52:52 +05:30
parent ea9f845814 efa94ce1bf
commit fa228e9c9b
68 changed files with 1296 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/doctype/time_log/time_log.js
View File

@@ -9,4 +9,6 @@ erpnext.projects.TimeLog = wn.ui.form.Controller.extend({
}
});
cur_frm.cscript = new erpnext.projects.TimeLog({frm: cur_frm});
cur_frm.cscript = new erpnext.projects.TimeLog({frm: cur_frm});
cur_frm.add_fetch('task','project','project');