Commit Graph

4267 Commits

Author SHA1 Message Date
Anand Doshi
0f502112d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-14 13:15:22 +05:30
Anand Doshi
161cf87cc0 in mousetrap - do not save if cur_frm.save_disabled is set 2012-12-14 13:13:02 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Nabin Hait
df011dbfa5 deleted unwanted control doctype and pages 2012-12-14 10:42:09 +05:30
Rushabh Mehta
c248e2769e Merge branch 'master' of github.com:webnotes/erpnext 2012-12-14 10:27:42 +05:30
Rushabh Mehta
a59aa68eac added new reports 2012-12-14 10:27:10 +05:30
Anand Doshi
72d2a627f5 replace createLocal in Client script only 2012-12-13 19:35:32 +05:30
Anand Doshi
0f8c67d776 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 18:57:45 +05:30
Anand Doshi
94850557c2 fix in support ticket attachment 2012-12-13 18:53:31 +05:30
Nabin Hait
d5d54c24b5 fixed conflict 2012-12-13 18:39:08 +05:30
Nabin Hait
9db3b6dc71 replace createlocal 2012-12-13 18:36:49 +05:30
Anand Doshi
4622523c0d Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 15:45:48 +05:30
Rushabh Mehta
ba9b5ad6c2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 15:25:33 +05:30
Rushabh Mehta
8a4ceb98c2 remove hyphen from file_list 2012-12-13 15:24:33 +05:30
Anand Doshi
b91a3cabdb Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 15:16:22 +05:30
Anand Doshi
62b5c7fc1f fix in task_list 2012-12-13 15:14:58 +05:30
Nabin Hait
22c3f63edd small fixes: sms, quotation messages etc 2012-12-13 15:09:42 +05:30
Anand Doshi
221f03be01 minor fixes 2012-12-13 15:04:18 +05:30
Rushabh Mehta
ce3775dfdd doctype, attendance, sandbox fix 2012-12-13 14:24:15 +05:30
Rushabh Mehta
e848e9c4c3 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-13 13:14:22 +05:30
Nabin Hait
351f790ae6 bom code cleanup 2012-12-13 13:13:19 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
7e20d938d4 bom code cleanup 2012-12-13 11:47:41 +05:30
Nabin Hait
4301dadaab bom code cleanup 2012-12-13 11:10:17 +05:30
Nabin Hait
d8e5dcc6f8 accepted qty = received qty, if not accepted qty 2012-12-12 16:52:23 +05:30
Nabin Hait
48b7fc8972 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:35:50 +05:30
Nabin Hait
561be839c5 voucher import tool message 2012-12-12 16:35:31 +05:30
Rushabh Mehta
1b8a4cab26 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:30:40 +05:30
Rushabh Mehta
4b8f90c5b4 permission, user_default fix 2012-12-12 16:28:21 +05:30
Nabin Hait
003b31ae06 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 16:27:22 +05:30
Nabin Hait
06cbd3427f dynamic query for root in sales browser, validation for tree structure document 2012-12-12 16:26:39 +05:30
Rushabh Mehta
9e12af4b7c updated recipients email in communication 2012-12-12 16:13:29 +05:30
Rushabh Mehta
d1b2afcd18 webnotes.user.roles deprecated to webnotes.user.get_roles() 2012-12-12 15:58:46 +05:30
Rushabh Mehta
686022f777 fixes to recent patch and removed company_control, home_control, webforms, wip_monitor 2012-12-12 15:25:51 +05:30
Rushabh Mehta
73ccac4ccb moved recent to memcache 2012-12-12 14:42:17 +05:30
Rushabh Mehta
2e580fc345 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 14:33:34 +05:30
Rushabh Mehta
20b75e372f added session expiry in global defaults 2012-12-12 14:33:02 +05:30
Nabin Hait
34f89e4760 Update selling/page/selling_home/selling_home.html 2012-12-12 13:13:13 +05:30
Nabin Hait
33e0b5581e communication list in selling module 2012-12-12 13:01:01 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Nabin Hait
2650ab0104 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 11:04:45 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Nabin Hait
b5171539cc Expense Claim option removed from authorization rule 2012-12-12 11:03:16 +05:30
Nabin Hait
c52edd1e59 production cleanup 2012-12-11 18:38:58 +05:30
Rushabh Mehta
39b5b0653e assign_to / messages public bug 2012-12-11 16:28:33 +05:30
Rushabh Mehta
38b6af97e5 updates to attachment 2012-12-11 16:19:14 +05:30
Rushabh Mehta
24a69613e0 update file urls 2012-12-11 15:58:19 +05:30
Anand Doshi
d3e04c3185 fixed syntax error in patch list 2012-12-11 15:25:06 +05:30
Anand Doshi
038d7aae9b Merge branch 'production' of github.com:webnotes/erpnext into production 2012-12-11 15:22:40 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30