Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,268 Commits 3 Branches 0 Tags 1 GiB
f70e3aabcb
Commit Graph

365 Commits

Author SHA1 Message Date
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
Rushabh Mehta
bf24581eb2 leave application fix, print_table Sr fix 2012-12-05 18:02:13 +05:30
Rushabh Mehta
c09128ab47 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:27:48 +05:30
Rushabh Mehta
ea025d50a1 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:17:00 +05:30
Rushabh Mehta
7e5c5aa9f3 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:10:18 +05:30
Rushabh Mehta
ed29af98a9 message updates in Leave / Expense, catch localstorage error 2012-12-05 17:06:07 +05:30
Rushabh Mehta
38f19104d8 merge 2012-12-05 16:49:58 +05:30
Rushabh Mehta
b4be22b3a4 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-05 15:38:13 +05:30
Nabin Hait
abe9d7be0b fixes in employee leave balance report 2012-12-05 14:36:39 +05:30
Rushabh Mehta
39c356393b refactored leave and expense 2012-12-05 14:27:50 +05:30
Anand Doshi
a502f7dcd9 Merge branch 'master' of github.com:webnotes/erpnext 2012-12-03 17:35:56 +05:30
Nabin Hait
23aac61bbf removed basic info section 2012-12-03 17:27:21 +05:30
Anand Doshi
74c4cc1845 removed debug=1 in salary manager 2012-12-03 17:26:35 +05:30
Rushabh Mehta
833f070991 added allow_rename and also fix in autonotification 2012-12-03 11:33:08 +05:30
Anand Doshi
eaed03d010 replaced convert_to_lists 2012-11-30 17:24:54 +05:30
Anand Doshi
ea61d8cf99 replaced set 2012-11-30 17:18:45 +05:30
Anand Doshi
535fbb1b00 replaced get_value 2012-11-30 17:16:03 +05:30
Anand Doshi
0fd99e7536 removed unnecessary imports 2012-11-30 16:38:04 +05:30
Rushabh Mehta
71d6a0ce1d cleaned up leave application 2012-11-30 12:41:46 +05:30
Rushabh Mehta
86adcaa113 fixed employee permissions, fixed bug in import_merge of timestamps 2012-11-30 12:02:00 +05:30
Rushabh Mehta
35c017a78f cleanup of notification control: now in boot 2012-11-30 10:57:28 +05:30
Nabin Hait
c4fb30dc8d Removed basic info section 2012-11-28 16:49:18 +05:30
Rushabh Mehta
bc54dadd44 Merge branch 'master' of github.com:webnotes/erpnext 2012-11-23 17:54:19 +05:30
Rushabh Mehta
78d4b49e62 introducing model 3.0, refactored import module 2012-11-23 17:53:43 +05:30
Anand Doshi
bb37fb23d3 fix in appraisal form -- change status to draft on amend 2012-11-23 17:24:25 +05:30
Anand Doshi
353d408e88 added get_query for employee related table 2012-11-19 17:35:50 +05:30
Anand Doshi
e65e621145 get_query for profile based link fields to enable searching by name 2012-11-19 15:43:18 +05:30
Rushabh Mehta
dc06be26c6 docperm fix for appraisal, removed validation in item 2012-11-16 16:52:02 +05:30
Rushabh Mehta
04b9579b24 appraisal cleanup, removed un-necessary logic 2012-11-16 10:37:14 +05:30
Rushabh Mehta
85df835db2 hotfix for desktop icon + updates to assign to and patch 2012-11-15 16:36:42 +05:30
Rushabh Mehta
d2a1e003a9 removed some mandatories from employee and fixed link field in Project 2012-11-14 17:05:38 +05:30
Rushabh Mehta
cf53f8ced9 employee: set user_id and defaults 2012-11-14 16:23:24 +05:30
Rushabh Mehta
13a0e4693e added the missing patch 2012-11-12 12:12:24 +05:30
Rushabh Mehta
fced017aad renamed employee leave balance report 2012-11-12 12:07:28 +05:30
Anand Doshi
d871145346 allow expense claim sanctioned amount to have 0 value 2012-11-06 14:37:18 +05:30
Anand Doshi
48d253fec7 fix in sanctioned amount in expense claim 2012-11-06 13:47:05 +05:30
Anand Doshi
92e6ebdf71 allow to change new leave allocation after submit -- raise appropriate validations 2012-10-17 12:52:51 +05:30
Anand Doshi
1aace542c9 removed import error bypass and added missing py files for each doctype 2012-10-10 14:26:23 +05:30
Anand Doshi
05aaae33ae Merge branch 'master' of github.com:webnotes/erpnext into 1209 
Conflicts:
	accounts/doctype/account/account.py
	erpnext/accounts/doctype/journal_voucher/journal_voucher.py
	patches/patch_list.py
	startup/event_handlers.py
 2012-10-02 14:35:20 +05:30
Rushabh Mehta
7c454b3039 dont save duplicate files 2012-09-25 18:20:36 +05:30
Rushabh Mehta
0152b12e75 __session_cache removed and introducted memcache for caching 2012-09-25 14:22:23 +05:30
Rushabh Mehta
707932da0c updated paths 2012-09-25 10:42:00 +05:30
Rushabh Mehta
2fa2f7178d moved directory structure 2012-09-24 19:13:42 +05:30
Rushabh Mehta
66ac2b018a first cut for lazy loading framework 2011-09-05 18:43:09 +05:30
Nabin Hait
343e10586b fixed sal slip email format 2011-09-02 17:45:13 +05:30
Nabin Hait
93592132b2 reload dashboard 2011-08-31 11:27:51 +05:30
Nabin Hait
2c03015537 same from and to flds deleted from mapper 2011-08-25 19:41:24 +05:30
Nabin Hait
9292ac773e Email will be sent on submit 2011-08-25 16:21:58 +05:30
Nabin Hait
54fbc8e4e6 fixed test case 2011-08-25 14:12:17 +05:30
Nabin Hait
cfe8ee89fe Salary Manager Link in HR module and deleted salary slip control panel link 2011-08-25 14:02:01 +05:30
Nabin Hait
6d121b3faa Error in loading JV fixed 2011-08-25 13:51:21 +05:30
Nabin Hait
781b3eeb81 Salary Manager rewriten for multiple sal slip generation. 
Test case included.
 2011-08-25 13:30:02 +05:30
Nabin Hait
da894640f3 deleted salary slip control panel 2011-08-25 13:26:54 +05:30
Nabin Hait
3cb633d829 removed eval 2011-08-23 16:12:31 +05:30
Nabin Hait
cd71c1cd48 removed eval 2011-08-23 16:06:44 +05:30
Nabin Hait
86a41d463a removed eval 2011-08-23 16:04:27 +05:30
Nabin Hait
a891bd445b Merge pull request #45 from nabinhait/master 
Serial No Issues
 2011-08-18 00:25:00 -07:00
Nabin Hait
1d828f644a permission updated in employee 2011-08-17 15:05:32 +05:30
Nabin Hait
d075a6c53d Removed cstr in return for get_server_fields() 2011-08-17 10:50:57 +05:30
Rushabh Mehta
89717292b7 fixed get_server_values to make them utf-8 friendly 2011-08-12 10:55:43 +05:30
Nabin Hait
d0d9bdfe90 Half day validation in leave application 2011-08-08 15:13:05 +05:30
Nabin Hait
3cb7b165d1 considered half day lwp in sal slip 2011-08-08 14:58:38 +05:30
Nabin Hait
a74f12a982 salary slip restored 2011-07-27 13:11:39 +05:30
Brahma K
790a78785b fixed conflict 2011-07-27 10:54:11 +05:30
nabinhait
1458af0691 Index patch released and doctype updated based on index 2011-07-20 10:31:19 +05:30
Brahma K
37fec6e219 Added Loan in Module Def 2011-07-15 11:20:04 +05:30
Ravi Dey
9dd0c0b7a1 Salary Slip docfield update 2011-07-13 18:08:38 +05:30
Ravi Dey
fac96e19f5 leave_application letter head fix 2011-07-08 13:38:16 +05:30
nabinhait
1bd56b1c08 removed get_tips() from js file 2011-07-05 14:41:36 +05:30
nabinhait
963f36b969 all txt files updated due to module renaming/merging 2011-07-01 15:47:42 +05:30
nabinhait
ec097975d0 restructured erpnext and deleted unwanted 2011-07-01 13:34:41 +05:30