Commit Graph

1770 Commits

Author SHA1 Message Date
Nabin Hait
1f4aeab85c error fixed in label_cleanup 2012-02-28 14:14:20 +05:30
Anand Doshi
6b69b4f6a4 Merge branch 'master' into navupdate 2012-02-28 13:51:29 +05:30
Anand Doshi
fc60335620 fix in leave application query 2012-02-28 13:51:04 +05:30
Nabin Hait
6c75cce4b9 fixed confilct 2012-02-28 11:46:43 +05:30
Anand Doshi
f9e4b16731 fix in scheduler related import issue 2012-02-28 11:31:46 +05:30
Anand Doshi
b37f22dc97 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:16:40 +05:30
Anand Doshi
ac144121ff fix in hover effect 2012-02-27 19:16:24 +05:30
Rushabh Mehta
caebd1bff6 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 19:05:44 +05:30
Rushabh Mehta
1a5c9c5926 message reply 2012-02-27 18:56:31 +05:30
Nabin Hait
5bdd20c46b dynamic label change, form cleanup, hide/unhide in purchase cycle 2012-02-27 18:46:51 +05:30
Anand Doshi
2b8c4d78f3 reload messages 2012-02-27 18:42:00 +05:30
Rushabh Mehta
ef29e55469 message delete 2012-02-27 18:41:11 +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
Rushabh Mehta
05c339cea7 merge 2012-02-27 18:08:27 +05:30
Rushabh Mehta
fdea966198 messages 2012-02-27 18:03:54 +05:30
Anand Doshi
226df715b2 support ticket css 2012-02-27 17:24:47 +05:30
Anand Doshi
b25b4b7624 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate 2012-02-27 17:19:03 +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
Rushabh Mehta
a3211d3e94 calendar bug fixes 2012-02-27 12:54:47 +05:30
Rushabh Mehta
aa999df088 calendar fix 2012-02-27 12:54:04 +05:30
Nabin Hait
5b09122264 fixed conflict while merging 2012-02-27 12:52:46 +05:30
Nabin Hait
78805e702e patch for form/label cleanup 2012-02-27 12:48:35 +05:30
Nabin Hait
0959341130 Form Cleanup: Dynamic label change, smart hide/unhide and dependencies 2012-02-27 12:47:40 +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
Nabin Hait
0cde984dc5 Update future year balances at the time of tranaction and acc bal reposting patch 2012-02-27 12:34:14 +05:30
Anand Doshi
01a7558589 added class 'web-footer' to text 'Powered by ERPNext' to make it visible in any background 2012-02-24 19:35:09 +05:30
Anand Doshi
d45ab64a85 Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 19:28:09 +05:30
Anand Doshi
40ee8d6432 UI fixes in support ticket and desktop 2012-02-24 19:21:47 +05:30
Rushabh Mehta
a50b762d36 support link 2012-02-24 18:13:08 +05:30
Anand Doshi
3f321e759d Merge branch 'navupdate' of github.com:webnotes/erpnext into navupdate
Conflicts:
	version.num
2012-02-24 17:57:34 +05:30
Anand Doshi
db62876bc9 desktop icons 2012-02-24 17:56:00 +05:30
Rushabh Mehta
f6be9b27bb changed icons to bootstrap 2012-02-24 16:36:58 +05:30
Anand Doshi
eaaf65131b desktop: first cut 2012-02-24 15:29:07 +05:30
Rushabh Mehta
b73fa49f34 cleaned up kb 2012-02-24 15:07:39 +05:30
Rushabh Mehta
2886b95da0 added todo 2012-02-24 11:26:31 +05:30
Anand Doshi
ef041114bb show submittable warning 2012-02-23 12:56:45 +05:30
Rushabh Mehta
3966f1dc5d added license files 2012-02-23 12:35:32 +05:30
Rushabh Mehta
c023cdd0c0 Merge branch 'master' of github.com:webnotes/erpnext into navupdate 2012-02-23 11:46:39 +05:30
Rushabh Mehta
1a35574afe redesigned scheduler 2012-02-23 11:46:28 +05:30
Anand Doshi
23b9de1582 Merge branch 'master' of github.com:webnotes/erpnext 2012-02-23 11:32:07 +05:30
Anand Doshi
bfa58a3516 allow deletion of products 2012-02-23 11:31:17 +05:30
Anand Doshi
9f94275d65 allow deletion of products 2012-02-23 11:27:40 +05:30
Nabin Hait
8569b7400a Update erpnext/production/doctype/bill_of_materials/bill_of_materials.py 2012-02-23 10:46:24 +05:30
Anand Doshi
cab5b31ffa change product's document type to Master 2012-02-22 18:33:39 +05:30