Commit Graph

148 Commits

Author SHA1 Message Date
Rushabh Mehta
23d366a0be Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-05 11:31:04 +01:00
Nabin Hait
cf9c4c45a5 export /import fld hide issue, discount issue 2012-03-05 15:21:35 +05:30
Rushabh Mehta
e45ffd6daf activity date fix 2012-03-02 16:25:22 +05:30
Rushabh Mehta
5b952cd7f2 send docs 2012-03-02 15:23:59 +05:30
Rushabh Mehta
f4ea48439c send docs 2012-03-02 15:15:57 +05:30
Rushabh Mehta
645ee267ba send docs 2012-03-02 15:15:15 +05:30
Rushabh Mehta
952b60ebd7 send docs 2012-03-02 15:14:11 +05:30
Rushabh Mehta
ecf29741db send docs 2012-03-02 15:11:33 +05:30
Anand Doshi
cd5712d390 fix in get_base_url method of dom.js 2012-03-02 15:10:20 +05:30
Rushabh Mehta
04be9690a4 send docs 2012-03-02 15:10:04 +05:30
Rushabh Mehta
a86f3e4507 cleanup of handler.js 2012-03-02 14:56:51 +05:30
Anand Doshi
86fa67065e Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-02 12:21:01 +05:30
Anand Doshi
ecd8df8cfb fix in user password change by system manager 2012-03-02 12:18:47 +05:30
Rushabh Mehta
37f531b6da fixes to profile update 2012-03-02 11:29:09 +05:30
Anand Doshi
1e9b15eb5d Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
	version.num
2012-03-01 19:28:36 +05:30
Anand Doshi
e306a1f5e1 fix in sales and purchase common column hide 2012-03-01 19:25:33 +05:30
Rushabh Mehta
d222b2769b browser support 2012-03-01 19:20:37 +05:30
Rushabh Mehta
025d4be6de browser support 2012-03-01 19:07:11 +05:30
Rushabh Mehta
b5af807281 browser support 2012-03-01 18:58:29 +05:30
Rushabh Mehta
5d267a4ad7 browse support 2012-03-01 18:53:06 +05:30
Rushabh Mehta
70f7674aed browse support and images 2012-03-01 18:42:05 +05:30
Anand Doshi
48ca42beb9 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 14:54:01 +05:30
Anand Doshi
08c8edb87f fix in desktop and notifications 2012-03-01 14:53:05 +05:30
Rushabh Mehta
b473a4d489 added all_read condition to check if user can read 2012-03-01 13:58:17 +05:30
Anand Doshi
552093c3fd Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-03-01 13:51:23 +05:30
Anand Doshi
1f4efc77ac fix in print formats and file rename 2012-03-01 13:50:33 +05:30
Rushabh Mehta
df33cb3a39 added activity avatar and removed menus.css 2012-03-01 13:44:09 +05:30
Rushabh Mehta
fe521fdbc2 add messages to always show and add attribution to patch 2012-03-01 13:39:09 +05:30
Anand Doshi
0e140962b8 Fixes in support ticket overflow, desktop gradients and shadows, setup control fiscal defaults 2012-03-01 12:16:02 +05:30
Rushabh Mehta
428929b1f7 fixed permissions 2012-03-01 11:24:45 +05:30
Rushabh Mehta
a4f454faa0 module page link fix 2012-02-29 19:19:01 +05:30
Rushabh Mehta
204e77d125 background, user_info 2012-02-29 19:09:20 +05:30
Anand Doshi
0b8ac7fc68 fix in company setup 2012-02-29 18:33:39 +05:30
Rushabh Mehta
12852e73ab added activity page 2012-02-29 15:11:06 +05:30
Rushabh Mehta
a38bbe28ce home page fixes 2012-02-29 10:55:43 +05:30
Rushabh Mehta
17da764d04 modules_setup 2012-02-28 18:56:56 +05:30
Rushabh Mehta
d01cc0bc50 messages and merge 2012-02-28 17:45:08 +05:30
Rushabh Mehta
75d8f51e7d messages and merge 2012-02-28 17:44:16 +05:30
Rushabh Mehta
aaf86ba4ef added users 2012-02-28 17:40:13 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Anand Doshi
f9f73bfa55 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-27 18:32:38 +05:30
Anand Doshi
e68a1e5ecc click effect on button 2012-02-27 18:31:15 +05:30
Rushabh Mehta
07a36a4baa messages 2012-02-27 18:17:57 +05:30
Anand Doshi
5b1beebd33 Changed position of menus in navbar 2012-02-27 17:17:48 +05:30
Anand Doshi
41ea46b4ed merge master with navupdate 2012-02-27 13:22:30 +05:30
Anand Doshi
0455ddfb98 Merge branch 'master' into navupdate
Conflicts:
	version.num
2012-02-27 13:21:48 +05:30
Anand Doshi
3dfa4401ff allow emails with uppercase 2012-02-27 13:19:47 +05:30
Anand Doshi
8e586cf180 allow emails with uppercase 2012-02-27 13:18:59 +05:30
Nabin Hait
8771da0a27 flixible width of buttom and class-name for each column in grid 2012-02-27 12:44:28 +05:30