Commit Graph

346 Commits

Author SHA1 Message Date
Anand Doshi
2e31e097fa [fix] [minor] _round function - implement round halfs to nearest even number 2013-08-19 19:58:23 +05:30
Anand Doshi
0b6fa018d6 [fix] [minor] create birthday event only for active employees, else delete it 2013-08-14 10:54:16 +05:30
Anand Doshi
05a340e764 [fix] [minor] fixes after merging akhilesh's changes 2013-08-12 20:01:55 +05:30
Anand Doshi
9e59aff54e Merge branch 'master' of git://github.com/akhileshdarjee/erpnext into akhileshdarjee-master
Conflicts:
	accounts/doctype/pos_setting/pos_setting.txt
	patches/patch_list.py
2013-08-12 20:00:33 +05:30
Nabin Hait
37fe72e4e9 [fix] [minor] Do not validate leave balance if status is Rejected 2013-08-12 15:29:50 +05:30
Akhilesh Darjee
de7d944f5e [issue] webnotes/erpnext#647 - recurring event for employee birthdays 2013-08-09 12:28:50 +05:30
Rushabh Mehta
75c3171c04 [rename] Naming Series is now Document Numbering Series and updated translations 2013-08-08 16:00:40 +05:30
Nabin Hait
5230318445 [minor] [fix] make bank voucher form expense claim 2013-08-08 11:28:37 +05:30
Rushabh Mehta
4d0f37e97c Merge branch 'master' of github.com:webnotes/erpnext 2013-08-06 17:54:11 +05:30
Rushabh Mehta
0b50b48104 [salary structure] Cleanup, Fixed Monthly Register Report and other minor changes 2013-08-06 17:53:41 +05:30
Anand Doshi
d5b06f78a5 [fix] leave approver selection 2013-08-06 15:21:43 +05:30
Rushabh Mehta
9a921f479b [employee] [fix] Employee naming fix 2013-08-06 12:53:09 +05:30
Anand Doshi
cc186da938 [fix] [minor] [test cases] 2013-08-05 18:43:01 +05:30
Anand Doshi
af4888f11a Merge branch 'master' of github.com:webnotes/erpnext 2013-08-05 18:08:59 +05:30
Anand Doshi
15253cb36a [fix] [minor] in_list_view for employee leave approver 2013-08-05 18:08:04 +05:30
Rushabh Mehta
e67d1fbcdf [license] [minor] Updated License Text in all js and py files 2013-08-05 14:59:54 +05:30
Anand Doshi
e79d57ca19 [salary slip] total no. of working days calculation [issue] webnotes/erpnext#285 2013-08-02 19:31:41 +05:30
Anand Doshi
a648f46d4e [fix] [minor] show stock ledger, general ledger, fixes post changes in script manager trigger [issue] webnotes/wnframework#228 2013-07-30 14:43:29 +05:30
Anand Doshi
1fac2a98cf [fix] [client script] call cur_frm.cscript.custom_ type functions in the callback of standard functions 2013-07-29 19:30:39 +05:30
Anand Doshi
985af32553 [cleanup] [minor] removed trash reason from grade 2013-07-26 16:08:11 +05:30
Anand Doshi
5491332772 [fix] [minor] use wn.defaults.get_default instead of sys_defaults 2013-07-26 13:02:18 +05:30
Nabin Hait
af679d2ff7 [feature] Make bank voucher option in Expense Claim 2013-07-25 17:48:00 +05:30
Rushabh Mehta
dd05d5eca0 Merge branch 'master' of github.com:webnotes/erpnext 2013-07-25 16:05:22 +05:30
Rushabh Mehta
1875fd177a [minor] [fix] missing icons in reports #589 2013-07-25 16:05:02 +05:30
Anand Doshi
85fa3d2bb9 [fix] [minor] upload callback arguments changed 2013-07-25 16:02:15 +05:30
Rushabh Mehta
c9bcfd1070 [cleanup] [minor] removed 'System Manager' permission for new setups 2013-07-22 15:33:10 +05:30
Nabin Hait
a9ec49e0bf [fix] [mapper] add rows only table is blank, allow multiple time pull and validation if same item pulled twice 2013-07-15 16:33:24 +05:30
Nabin Hait
cfecd2bc16 [fix] [cleanup] fixes while testing and code cleanup 2013-07-11 17:49:18 +05:30
Nabin Hait
1ac928ed5c Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-11 16:07:53 +05:30
Rushabh Mehta
df92a553cb [style] Added Icons to Pages 2013-07-11 14:50:43 +05:30
Nabin Hait
76cacdbb78 [fix] [hr] letter head in salary slip email 2013-07-11 11:11:34 +05:30
Nabin Hait
a4f0240bfc [conflict] merged for get_query 2013-07-10 19:05:57 +05:30
Nabin Hait
c0ebaae15a [fix][hr] fetch emp name in attendance and default value 2013-07-10 17:42:01 +05:30
Nabin Hait
10b112807c [fix] related to mapping 2013-07-10 16:48:29 +05:30
Nabin Hait
cb04d0cd14 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-10 15:16:30 +05:30
Rushabh Mehta
3429b609a7 [feature] [grid] Allow Grid viewable columns to be selected via 'In List View' 2013-07-10 15:03:37 +05:30
Nabin Hait
749b37f4f5 [fix][hr] pull salary structure in salary slip 2013-07-10 14:16:59 +05:30
Nabin Hait
6c17f012ba [minor][hr] validation added: salary slip can not be made if employee left before this month 2013-07-10 12:28:56 +05:30
Saurabh
2e3c06e66d [get_query]to server side 2013-07-09 18:20:49 +05:30
Saurabh
ab462d2000 [get_query]to server side 2013-07-09 16:18:52 +05:30
Rushabh Mehta
a2a1ec765b [mappers] cleanup, remove dt_map, map_doclist and other such functions 2013-07-08 11:08:27 +05:30
Nabin Hait
ed23cca9d3 [mapper] removed old mapper from files and database 2013-07-07 19:11:52 +05:30
Rushabh Mehta
11d688a536 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 15:14:15 +05:30
Rushabh Mehta
3a3c2710d1 [icon] added in doctype 2013-07-05 15:13:31 +05:30
Anand Doshi
ef8d3bcb77 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-07-05 12:57:41 +05:30
Anand Doshi
901773a139 [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files 2013-07-05 12:57:03 +05:30
Rushabh Mehta
54352c7140 [form cleanup] 2013-07-05 12:43:59 +05:30
Rushabh Mehta
d420401ba3 [moduleview] added top bar 2013-07-01 17:15:23 +05:30
Rushabh Mehta
64c2764b56 [translations/build] deleted translation files (to be built on demand) 2013-06-17 11:56:41 +05:30
Anand Doshi
b53b9dcff4 Merge branch 'responsive' of github.com:webnotes/erpnext into responsive 2013-06-11 16:23:45 +05:30