Commit Graph

257 Commits

Author SHA1 Message Date
Anand Doshi
3d9f436ce9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 13:43:05 +05:30
Rushabh Mehta
f30d1a0515 report builder - sort, save, pre-select columns, Report DocType 2012-04-20 13:37:49 +05:30
Anand Doshi
9e0221c58e Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-20 11:22:38 +05:30
Anand Doshi
b8660fb51c fixes in production, porjects, packing slip 2012-04-20 11:21:47 +05:30
Rushabh Mehta
6ff95727e1 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-19 17:49:44 +05:30
Rushabh Mehta
a11bc07a7f new report builder - todo: sort, save 2012-04-19 17:48:57 +05:30
Anand Doshi
f642168a26 hr home: changed Allocate Leaves --> Leave Allocation Tool 2012-04-18 18:35:30 +05:30
Anand Doshi
d24ac3ca9a Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 17:18:52 +05:30
Anand Doshi
ecf59f4c77 fix in breadcrubs - module home page issue 2012-04-18 17:18:33 +05:30
Rushabh Mehta
b194eb83a9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:56:09 +05:30
Rushabh Mehta
edab76b274 knowledge base cleanup 2012-04-18 16:55:43 +05:30
Anand Doshi
8d1a0b4061 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename 2012-04-18 16:08:15 +05:30
Anand Doshi
385380125b fixes in customize form, naming series form loading 2012-04-18 16:04:02 +05:30
Rushabh Mehta
3a9ddaf2c1 permission engine bugfix 2012-04-18 12:34:18 +05:30
Anand Doshi
40808e18f1 minor fixes 2012-04-17 18:43:29 +05:30
Anand Doshi
c9d1ac4112 fix - show about of application 2012-04-17 13:54:53 +05:30
Anand Doshi
0f51aef451 clear cache and refresh 2012-04-17 13:19:45 +05:30
Rushabh Mehta
9d98cc05f2 403 overrides 404 2012-04-17 12:52:43 +05:30
Anand Doshi
04cfaa0e1e fix in listing's create new button 2012-04-17 12:11:15 +05:30
Anand Doshi
b2974e8e59 fix in delete check 2012-04-17 11:57:50 +05:30
Anand Doshi
45a4edc9c9 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	css/all-app.css
	version.num
2012-04-17 11:19:15 +05:30
Nabin Hait
8c0dcd383b some more fixes in support 2012-04-16 18:47:20 +05:30
Rushabh Mehta
71085592a4 fixed account_browser 2012-04-16 18:36:46 +05:30
Rushabh Mehta
a2505d43b2 rename routing 2012-04-16 15:25:38 +05:30
Rushabh Mehta
6610d390e1 merge 2012-04-16 14:49:11 +05:30
Nabin Hait
6f89f1eb86 fixes in sales cycle 2012-04-16 14:44:47 +05:30
Rushabh Mehta
de457387c3 framework build 2012-04-16 13:36:08 +05:30
Rushabh Mehta
6820dbf72d framework build 2012-04-16 13:33:14 +05:30
Rushabh Mehta
0c18b18b84 new framework build 2012-04-16 11:18:45 +05:30
Rushabh Mehta
c8abe5b2ad style cleanups and new builds 2012-04-15 22:31:32 +05:30
Rushabh Mehta
03e8787cda removed version.num 2012-04-14 15:02:17 +05:30
Anand Doshi
a202f00dc0 fixes in accounts 2012-04-13 16:03:27 +05:30
Anand Doshi
1907ac69d7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-04-13 11:48:35 +05:30
Anand Doshi
79fe5a1542 fix in hide unhide fields error logging 2012-04-13 11:46:38 +05:30
Rushabh Mehta
97ae17eaf7 merge 2012-04-13 11:42:56 +05:30
Rushabh Mehta
f1264a7f76 listing, module pages in appframe 2012-04-13 11:41:43 +05:30
Anand Doshi
1c2ac00a82 fixes in sales cycle 2012-04-13 11:38:01 +05:30
Nabin Hait
de237e2bf7 error fixed 2012-04-12 16:36:01 +05:30
Anand Doshi
654f6bfa85 fixes 2012-04-12 12:15:35 +05:30
Anand Doshi
9e6af24269 fixes in button function calling 2012-04-11 19:07:02 +05:30
Rushabh Mehta
49086492c3 dialog form fixes 2012-04-11 18:02:23 +05:30
Rushabh Mehta
0f0b1f5235 added app frame 2012-04-11 17:26:03 +05:30
Rushabh Mehta
c6843484e5 form header refactor 2012-04-11 15:28:00 +05:30
Rushabh Mehta
f7f7f63a77 form header refactor 2012-04-11 15:18:24 +05:30
Anand Doshi
2424387651 fixes after sync testing 2012-04-10 19:14:37 +05:30
Rushabh Mehta
db05aacbc4 merge 2012-04-10 11:51:51 +05:30
Rushabh Mehta
d2cec5bd14 website style fixes 2012-04-10 11:51:08 +05:30
Anand Doshi
859cb72606 new favicon 2012-04-10 11:35:19 +05:30
Rushabh Mehta
b43f949e93 website smaller 2012-04-08 20:33:51 +05:30
Anand Doshi
82042f1cff fixes after sync 2012-04-06 17:54:17 +05:30
Anand Doshi
fedfd89e4a rename dt first cut 2012-03-30 12:29:06 +05:30
Anand Doshi
37fb9c8f27 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_rename
Conflicts:
	version.num
2012-03-29 15:35:08 +05:30
Anand Doshi
c9456c18dc listviews 2012-03-28 17:48:30 +05:30
Anand Doshi
2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge
Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
2012-03-27 19:37:10 +05:30
Rushabh Mehta
339afe858c link empty value and kb fix 2012-03-23 15:54:49 +05:30
Anand Doshi
2d4139cbeb sync_handler_merge 2012-03-23 14:46:07 +05:30
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
Rushabh Mehta
06f74cc730 listing fix 2012-03-23 11:47:30 +05:30
Rushabh Mehta
e8a2fda06e list button-group one more time 2012-03-22 14:59:25 +05:30
Rushabh Mehta
9662cb8564 doclistview 2012-03-22 14:27:05 +05:30
Rushabh Mehta
842f782253 listing - ajax icon 2012-03-22 14:24:49 +05:30
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
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
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
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
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
a12a28bec6 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-22 06:35:35 +01:00
Anand Doshi
06fcfdfcde assign to - allow comments 2012-03-22 11:01:38 +05:30
Rushabh Mehta
983a171567 using font lato 2012-03-21 13:35:34 +05:30
Rushabh Mehta
a632ebf1bb doclistview fix 2012-03-21 12:45:01 +05:30
Rushabh Mehta
c01b7e9c75 website topbar fix, doclistnew, back fix 2012-03-21 12:29:56 +05:30
Rushabh Mehta
a665c1f60d stylefixes and listviews 2012-03-21 11:47:58 +05:30
Rushabh Mehta
437c1b512c listview update and form fix 2012-03-20 18:45:28 +05:30
Rushabh Mehta
9b1afe197d cleanup of form, rename, route, added fonts 2012-03-20 14:37:44 +05:30
Rushabh Mehta
9d0fc767b2 merge 2012-03-19 18:44:33 +05:30
Rushabh Mehta
d48417c93b slide navigation fixes 2012-03-19 18:42:13 +05:30
Anand Doshi
a7158f6ea9 fix in session expiry 2012-03-19 14:41:05 +05:30
Rushabh Mehta
7afaa8665d major reworking of page navigation 2012-03-16 18:28:09 +05:30
Rushabh Mehta
8e3d596cbc Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 16:44:19 +05:30
Rushabh Mehta
2438de4c9b fixed tags in list2 2012-03-15 16:43:46 +05:30
Rushabh Mehta
2f052fd1ff Merge branch 'handlerupdate' of github.com:webnotes/erpnext into handlerupdate 2012-03-15 07:22:39 +01:00
Rushabh Mehta
5b9e0951d7 Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
Conflicts:
	version.num
2012-03-15 07:21:43 +01:00
Anand Doshi
92da889d32 fix in report builder saving 2012-03-15 11:50:26 +05:30
Rushabh Mehta
f47192c5ce merge 2012-03-14 19:07:11 +05:30
Rushabh Mehta
08b670bddd listing with stats 2012-03-14 19:06:20 +05:30
Anand Doshi
4b7ddff4c9 patch after doctype.py refactor 2012-03-14 17:45:54 +05:30
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
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
Rushabh Mehta
38474e2db0 form section autohide 2012-03-13 16:11:52 +05:30
Rushabh Mehta
052b7e4049 fixed list->new->onload hooks 2012-03-13 15:19:06 +05:30