[merge] merge with master

This commit is contained in:
Rushabh Mehta
2013-05-24 16:09:13 +05:30
120 changed files with 1431 additions and 712 deletions

View File

@@ -1,5 +1,9 @@
$.extend(cur_frm.cscript, {
refresh: function(doc) {
wn.provide("erpnext.projects");
erpnext.projects.TimeLog = wn.ui.form.Controller.extend({
setup: function() {
this.frm.set_query("task", erpnext.queries.task);
}
});
});
cur_frm.cscript = new erpnext.projects.TimeLog({frm: cur_frm});