Commit Graph

36689 Commits

Author SHA1 Message Date
Rushabh Mehta
3bbc7aeeb8 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-14 07:58:10 +01:00
Anand Doshi
0493897297 Merge branch 'master' into sync
Conflicts:
	js/all-app.js
	js/all-web.js
	version.num
2012-03-14 12:24:37 +05:30
Anand Doshi
990599ad9a Merge branch 'master' of github.com:webnotes/erpnext 2012-03-14 12:20:58 +05:30
Anand Doshi
37654c5fba desktop notifications 2012-03-14 12:19:40 +05:30
Nabin Hait
4af2c094cc rename dt error fixed 2012-03-14 12:12:23 +05:30
Nabin Hait
1732905db8 rename dt error fixed 2012-03-14 12:04:16 +05:30
Anand Doshi
7854f81ca0 show todo, calendar and support desktop notifications 2012-03-14 12:01:13 +05:30
Anand Doshi
1fc098241f working on desktop notifications 2012-03-14 11:12:09 +05:30
Nabin Hait
26889bd2e0 search and replace code with confirmation 2012-03-14 11:08:15 +05:30
Nabin Hait
64f40fab6d Rename doctype for more meaningful name 2012-03-14 11:07:00 +05:30
Rushabh Mehta
db97d28e77 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-13 11:42:13 +01:00
Rushabh Mehta
38474e2db0 form section autohide 2012-03-13 16:11:52 +05:30
Rushabh Mehta
bef7662187 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-13 10:49:52 +01:00
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30
Nabin Hait
c6b989c9d7 update stock reco permission 2012-03-13 12:47:07 +05:30
Nabin Hait
9826ccce54 update stock reco permission 2012-03-13 12:45:53 +05:30
Rushabh Mehta
194b5f8e1f Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-12 11:42:55 +01:00
Rushabh Mehta
b9878d01e1 style fixes 2012-03-12 16:12:09 +05:30
Rushabh Mehta
ae4d1f973c modules cleanup 2012-03-12 14:34:55 +05:30
Anand Doshi
5230aa89a2 Merge branch 'master' into sync 2012-03-12 13:28:15 +05:30
Rushabh Mehta
aa845e9daa fixed autosuggest for non form fields, email removed moduledef in core, erpnext 2012-03-12 13:22:09 +05:30
Rushabh Mehta
09595eee3e Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-12 13:21:07 +05:30
Nabin Hait
b5b39f0e48 update cost as per LPR and standard rate 2012-03-12 11:25:10 +05:30
Rushabh Mehta
a250ac983f Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-12 06:43:54 +01:00
Rushabh Mehta
9b24946c47 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-09 13:46:08 +01:00
Rushabh Mehta
ec47ad5d22 datafield onupdate chain broken - fix 2012-03-09 18:15:54 +05:30
Rushabh Mehta
9f89e35ebe search selector fix for link 2012-03-09 17:51:39 +05:30
Rushabh Mehta
89b93fd6fb Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-09 12:51:50 +01:00
Rushabh Mehta
519f70b384 new autosuggest, other fixes 2012-03-09 16:44:21 +05:30
Nabin Hait
6715172211 sub contracted item are allowed to create po 2012-03-09 16:04:19 +05:30
Rushabh Mehta
39ad7ec807 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-08 10:20:18 +01:00
Anand Doshi
4cc7d3e392 fix in support ticket rendering 2012-03-08 14:49:49 +05:30
Rushabh Mehta
6c7011fc0f Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-08 10:05:54 +01:00
Anand Doshi
c37c772678 fix in support ticket thread 2012-03-08 14:35:19 +05:30
Rushabh Mehta
fe89da76a0 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-08 07:41:18 +01:00
Anand Doshi
20f63da794 fix in messages 2012-03-08 12:10:51 +05:30
Rushabh Mehta
21f5407949 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-08 07:36:57 +01:00
Anand Doshi
eb55df0aa3 fix in messages 2012-03-08 12:06:27 +05:30
Rushabh Mehta
80698620db Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-08 07:23:00 +01:00
Anand Doshi
2a72179597 fix in messages 2012-03-08 11:44:49 +05:30
Anand Doshi
a6952c935c doctype refactor first commit 2012-03-07 19:37:23 +05:30
Rushabh Mehta
9a1bdf7224 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-07 18:20:33 +05:30
Rushabh Mehta
f81a64e57f new listing and changed wn.widgets.listing to wn.ui.listing 2012-03-07 18:19:41 +05:30
Rushabh Mehta
741780767d Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-07 10:05:24 +01:00
Nabin Hait
928e89a359 validation added in enquire 2012-03-07 13:11:24 +05:30
Nabin Hait
20f68b342b Merge branch 'master' of github.com:webnotes/erpnext 2012-03-07 12:51:19 +05:30
Nabin Hait
00260870d1 fixes in rv 2012-03-07 12:50:55 +05:30
Anand Doshi
c805422b3d Merge branch 'master' into sync
Conflicts:
	version.num
2012-03-07 11:22:03 +05:30
Rushabh Mehta
0dd5da2299 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-06 18:41:52 +05:30
Rushabh Mehta
15da133de9 removed 2012-03-06 18:41:11 +05:30