Commit Graph

17195 Commits

Author SHA1 Message Date
Rushabh Mehta
b0d15db17d Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-23 11:25:15 +01:00
Rushabh Mehta
339afe858c link empty value and kb fix 2012-03-23 15:54:49 +05:30
Anand Doshi
5f9501d4d8 Merge branch 'sync_file_db' into shf_merge
Conflicts:
	erpnext/projects/doctype/project/project.txt
2012-03-23 14:51:35 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +05:30
Rushabh Mehta
a6f063d9f9 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-23 09:50:12 +01:00
Rushabh Mehta
b6f808846d website fixes 2012-03-23 14:19:49 +05:30
Anand Doshi
9b56a8ada9 Merge branch 'handlerupdate' into sync_handler_merge
Conflicts:
	js/all-app.js
	version.num
2012-03-23 13:55:20 +05:30
Anand Doshi
134ca41db8 Merge branch 'sync_file_db' of github.com:webnotes/erpnext into sync_file_db 2012-03-23 12:45:05 +05:30
Rushabh Mehta
d9831e9073 listing fix 2012-03-23 11:48:48 +05:30
Rushabh Mehta
06f74cc730 listing fix 2012-03-23 11:47:30 +05:30
Anand Doshi
358304d216 fix in sales common regarding date formatting 2012-03-23 11:12:03 +05:30
Rushabh Mehta
357a170f3b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 12:49:48 +01:00
Anand Doshi
268b2196d8 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 17:18:11 +05:30
Anand Doshi
365453e479 fix in filter location 2012-03-22 17:17:12 +05:30
Rushabh Mehta
ee10a66639 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 10:37:41 +01:00
Nabin Hait
191e55f1bc sync ref db patch 2012-03-22 15:07:28 +05:30
Nabin Hait
f88326ba3f sync ref db 2012-03-22 15:07:05 +05:30
Rushabh Mehta
14079e5ea6 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 15:06:11 +05:30
Rushabh Mehta
e8a2fda06e list button-group one more time 2012-03-22 14:59:25 +05:30
Rushabh Mehta
f3e8721e2b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 10:05:40 +01:00
Anand Doshi
7944b4b888 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 14:34:35 +05:30
Anand Doshi
3697534f10 Merge branch 'master' into handlerupdate 2012-03-22 14:32:10 +05:30
Rushabh Mehta
fb7589d97f Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:57:16 +01:00
Rushabh Mehta
9662cb8564 doclistview 2012-03-22 14:27:05 +05:30
Rushabh Mehta
4bbeb7a265 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:54:59 +01:00
Rushabh Mehta
842f782253 listing - ajax icon 2012-03-22 14:24:49 +05:30
Rushabh Mehta
0807227b92 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:24:11 +01:00
Rushabh Mehta
479061df9c merge 2012-03-22 13:53:34 +05:30
Rushabh Mehta
c4d77e7e6c listing ajax indicator fix 2012-03-22 13:52:40 +05:30
Rushabh Mehta
fa0e7b6933 listing/messages fix 2012-03-22 13:44:04 +05:30
Rushabh Mehta
cbd6cb0a89 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 09:09:39 +01:00
Anand Doshi
8463870a4f Added Custom Scripts in setup page 2012-03-22 13:39:23 +05:30
Rushabh Mehta
a65ab16e2b Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 08:57:39 +01:00
Anand Doshi
fb33112961 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 13:25:32 +05:30
Anand Doshi
902687091c fix in search 2012-03-22 13:24:41 +05:30
Rushabh Mehta
457743941c allow doctype doctype 2012-03-22 12:40:09 +05:30
Rushabh Mehta
9af3911092 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:52:12 +01:00
Rushabh Mehta
1952f5b033 lead listview 2012-03-22 12:21:56 +05:30
Rushabh Mehta
e9f7e6c949 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:40:58 +01:00
Rushabh Mehta
6ac1d73731 lead listview 2012-03-22 12:10:49 +05:30
Rushabh Mehta
342d133a98 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 12:00:15 +05:30
Rushabh Mehta
7af1c880fd grid table size fix 2012-03-22 11:59:46 +05:30
Rushabh Mehta
5eda364856 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:27:09 +01:00
Anand Doshi
fa77978aa0 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 11:56:35 +05:30
Rushabh Mehta
cb11585ff1 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 07:08:34 +01:00
Rushabh Mehta
27cf13b541 merge 2012-03-22 11:37:56 +05:30
Anand Doshi
5d78c584dd focus on first input only if docstatus = 0 2012-03-22 11:37:50 +05:30
Rushabh Mehta
3f46696db2 removed slider ui 2012-03-22 11:37:08 +05:30
Rushabh Mehta
421e25c5ae Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate 2012-03-22 06:48:45 +01:00
Anand Doshi
98f847c01f fix in todo 2012-03-22 11:18:28 +05:30