Commit Graph

120 Commits

Author SHA1 Message Date
Rushabh Mehta
846678a1e4 added links to open count in module + other minor fixes 2013-01-10 12:25:25 +05:30
Rushabh Mehta
249b0b4942 Merge branch 'master' into edge 2013-01-10 11:12:35 +05:30
Rushabh Mehta
aecae587ce workflow updates: update_field not editable & bug fix 2013-01-09 19:03:20 +05:30
Rushabh Mehta
be0b7df27e Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-01-09 16:41:01 +05:30
Rushabh Mehta
ce1d5276ff added moduleview 2013-01-09 16:39:27 +05:30
Nabin Hait
55963a4164 added field description in employee 2013-01-09 14:50:01 +05:30
Anand Doshi
89230cbc4b fix in holiday list 2013-01-08 18:14:39 +05:30
Anand Doshi
cfd185e5ac fix in leave application holiday calculation 2013-01-08 17:44:31 +05:30
Rushabh Mehta
b8f39f00d8 appraisal template, total must be 100 2013-01-07 17:43:12 +05:30
Rushabh Mehta
523aec499a bootstrapped language and added 'hi' 2013-01-07 15:39:54 +05:30
Rushabh Mehta
cd7a02c489 added workflow help, fixed button primary action in form and refactored permissions 2013-01-04 14:03:36 +05:30
Rushabh Mehta
78a0c20305 new permission manager 2013-01-01 19:51:35 +05:30
Rushabh Mehta
0727169a5e expense_claim: approval status fix 2012-12-31 13:24:24 +05:30
Anand Doshi
f9a3c8fcdc added status validation 2012-12-28 19:42:49 +05:30
Nabin Hait
e606e7850a Merge branch 'master' of github.com:webnotes/erpnext 2012-12-28 16:51:55 +05:30
Rushabh Mehta
4337802cdb integrated workflow, disable Submit, Cancel if workflow is defined 2012-12-28 16:07:55 +05:30
Nabin Hait
5d273df92e changes in layout of module home page 2012-12-28 15:39:21 +05:30
Rushabh Mehta
5a3cbd8700 integrated workflow in form 2012-12-28 14:57:26 +05:30
Nabin Hait
eb92514a3c Merge branch 'master' of github.com:webnotes/erpnext 2012-12-27 18:55:39 +05:30
Nabin Hait
a964863e7e default filter values in leave balance report 2012-12-27 18:55:03 +05:30
Rushabh Mehta
1b1517155b added about us page and settings 2012-12-27 16:50:24 +05:30
Anand Doshi
a0713196d2 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-24 18:08:16 +05:30
Anand Doshi
f5d90abe92 addchild will never save added doc 2012-12-24 17:02:38 +05:30
Nabin Hait
00db863994 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-23 09:57:36 +05:30
Nabin Hait
2848bea64e fixed company and fiscal year options in attendance doctype 2012-12-23 09:45:02 +05:30
Rushabh Mehta
d3c9fb6b3b changed desktop modules now using font-awesome instead of noun project fonts 2012-12-21 18:27:40 +05:30
Nabin Hait
4ecc785aab fixed conflict 2012-12-19 12:18:15 +05:30
Nabin Hait
b6166caec7 modified timestamp 2012-12-19 10:35:09 +05:30
Nabin Hait
5f175dfd00 Merge branch 'master' into production 2012-12-18 13:49:07 +05:30
Nabin Hait
92af22aa12 removed debug mode 2012-12-18 13:45:59 +05:30
Nabin Hait
f8de5b9878 merged with master 2012-12-14 10:43:56 +05:30
Rushabh Mehta
ce3775dfdd doctype, attendance, sandbox fix 2012-12-13 14:24:15 +05:30
Rushabh Mehta
291449b6fb refactored javascript models 2012-12-13 12:53:21 +05:30
Nabin Hait
be356b8692 Merge branch 'master' of github.com:webnotes/erpnext into production 2012-12-12 12:58:22 +05:30
Nabin Hait
2650ab0104 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-12 11:04:45 +05:30
Rushabh Mehta
74aebf0965 added Communication to Selling and refactored module pages a bit 2012-12-12 11:03:51 +05:30
Nabin Hait
b5171539cc Expense Claim option removed from authorization rule 2012-12-12 11:03:16 +05:30
Anand Doshi
c3b9a00c53 changed old type txt to new type txtt 2012-12-11 15:20:53 +05:30
Anand Doshi
36bf910563 removed Standard from default print format 2012-12-11 14:01:59 +05:30
Anand Doshi
a02a14f442 employee query in expense claim 2012-12-10 15:15:52 +05:30
Anand Doshi
ae0ca1c0a0 changed fiscal year back to link in Leave Application DocType 2012-12-07 18:48:17 +05:30
Rushabh Mehta
c821f2b3ff leave application type fix 2012-12-07 16:17:59 +05:30
Rushabh Mehta
0db74a7ebd cleaned up item, fixed bug in dependency, removed legacy Listing, re-layed out DocField, refactored build.json for web, added featured_item and item_website_specification 2012-12-07 15:47:32 +05:30
Anand Doshi
8b9507f461 fixes in leave application and expense claim 2012-12-07 13:34:05 +05:30
Rushabh Mehta
0ea130a97c leave application: status no_copy and draft on Open 2012-12-07 10:25:07 +05:30
Anand Doshi
a113d85461 removed Self Approval Not Allowed validation 2012-12-06 22:04:32 +05:30
Anand Doshi
c842f79811 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-06 17:35:48 +05:30
Anand Doshi
14dcb47dc2 fix in expense claim 2012-12-06 17:34:57 +05:30
Rushabh Mehta
a2e4cb0235 item, leave_balance: hotfix 2012-12-06 17:09:38 +05:30
Rushabh Mehta
87192da372 website updates and leave balance bugfix 2012-12-06 16:45:00 +05:30