Commit Graph

424 Commits

Author SHA1 Message Date
Anand Doshi
6e8eaf097a [fix] test case of Leave Application 2016-02-19 00:27:02 +05:30
Valmik Jangla
7ae844f0a0 Minor fix 2016-02-17 15:06:30 +05:30
Valmik Jangla
b7ae1c1076 Inactive employees show up in report 2016-02-17 15:05:35 +05:30
Neil Trini Lasrado
25ab93a881 Changed image in employee from Attach to Attach Image, removed image view 2016-02-17 13:00:37 +05:30
Anand Doshi
870d0441a8 [minor] moved make_employee from Employee to Offer Letter 2016-02-16 15:53:09 +05:30
Valmik Jangla
5e771c5678 Changed doclist to doc 2016-02-16 15:33:35 +05:30
Valmik Jangla
93b1072cba Improved code 2016-02-16 15:33:35 +05:30
Valmik Jangla
bddc80bc66 Make Employee from Offer Letter 2016-02-16 15:33:35 +05:30
Anand Doshi
5f72504de1 [enhancement] Expense Claim - View Bank Entries 2016-02-15 18:02:38 +05:30
Rushabh Mehta
c403ce3b4f Merge pull request #4763 from rmehta/leave-app-cleanup
[cleanup] leave application
2016-02-08 18:51:29 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥
Depends on frappe/frappe#1532
2016-02-08 13:06:56 +05:30
Rushabh Mehta
ca2ce13817 Merge pull request #4748 from vjFaLk/Monthly-attendance-fix
Employees with no attendance show up as blank now
2016-02-08 10:58:45 +05:30
Rushabh Mehta
57fb74f262 Merge pull request #4742 from nabinhait/multifixes1
Multi fixes
2016-02-08 10:55:48 +05:30
Rushabh Mehta
cde997edfa [cleanup] leave application 2016-02-08 10:53:22 +05:30
Rushabh Mehta
65ade073a9 Merge pull request #4733 from ShashaQin/patch-15
Update leave_application.py
2016-02-08 10:22:09 +05:30
Valmik Jangla
de7e760788 Employees with no attendance show up as blank 2016-02-05 17:46:14 +05:30
Valmik Jangla
235de6566e Minor fix 2016-02-05 15:07:16 +05:30
Nabin Hait
3110c4a772 [fix] Make bank entry from expense claim 2016-02-04 17:22:57 +05:30
Valmik Jangla
8d0ed21c04 Added From and To date to Holiday Report
Changed HD to H in Monthly Attendance Report
2016-02-04 12:18:55 +05:30
ShashaQin
995a71c854 Update leave_application.py
fix half day leave issue
2016-02-03 13:10:15 +08:00
Valmik Jangla
0a76b8b29a Fixed issue where no Holidays would cause the report to break 2016-01-30 10:59:40 +05:30
Anand Doshi
6e33d91443 [minor] fixes to attendance tool and employee holiday attendance 2016-01-29 16:57:54 +05:30
Valmik Jangla
07364f5ece Feature - Employee Attendance Tool 2016-01-29 16:57:54 +05:30
Valmik Jangla
1890c794d7 Added Employee Report Attendance Report
Made Holiday details mandatory
2016-01-29 16:57:54 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Anand Doshi
03e7e581d8 [minor] removed Communication table 2016-01-06 13:23:45 +05:30
Rushabh Mehta
969d48a554 [translations] fixes #4534-38 2016-01-04 16:09:40 +05:30
Nabin Hait
b6b56453e1 [fix] Get defaults based on doctype or fieldname 2015-12-23 16:37:06 +05:30
Nabin Hait
533aba02c5 [fix] Payment days calculation in salary slip 2015-12-10 10:50:42 +05:30
Nabin Hait
9421e9873a [fix] Allowed import for Expense Claim 2015-12-07 10:40:13 +05:30
Nabin Hait
c43a11a313 Merge pull request #4431 from nabinhait/leave_fix
[fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period
2015-12-05 12:43:38 +05:30
Nabin Hait
d53e780fb8 [fix] Don't validate balance for lwp and in balance consider all leaves in the allocation period 2015-12-05 12:15:49 +05:30
Nabin Hait
734a40ad62 [fix] Offer letter print format fixed 2015-12-04 12:19:21 +05:30
Nabin Hait
a4eeb919e6 [fix] Set payment days considering joinging date, reliving date and applicable holidays 2015-12-03 15:10:30 +05:30
Nabin Hait
c4d9554a05 [fix] Payment Days and holidays considering joining and relieving dates 2015-12-03 15:10:30 +05:30
Nabin Hait
8df5900f98 [fix] Inactive salary structure validation 2015-12-02 14:50:08 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Nabin Hait
0f72750fc8 Merge pull request #4338 from anandpdoshi/fix/salary-slip-earning-deduction
[fix] pull earning and deduction on change of employee
2015-11-19 12:06:37 +05:30
Anand Doshi
7763bb5c15 [fix] pull earning and deduction on change of employee 2015-11-18 19:04:03 +05:30
Saurabh
a4bf02de6c [fixes] overlapping allocation 2015-11-18 17:39:26 +05:30
Saurabh
3bcf82c7a6 [fixes] test leave allocation record creation 2015-11-18 17:39:26 +05:30
Nabin Hait
c7fc11a812 [fix] Don't add pagebreak in print format if terms contains only spaces and newlines 2015-11-18 12:59:00 +05:30
Anand Doshi
3667da1053 [fix] Set user_id as Reply-To in birthday reminder emails 2015-11-16 19:31:20 +05:30
Nabin Hait
b3a68c3f40 Merge pull request #4323 from nabinhait/leaves
[fix][cleanup] Leave allocation, application and balance report cleanup and fixes
2015-11-16 15:57:04 +05:30
Nabin Hait
b6de519571 [fix] Test case fixed 2015-11-16 15:50:10 +05:30
Nabin Hait
58c4646199 [fix][cleanup] Leave allocation, application and balance report cleanup and fixes 2015-11-16 15:35:14 +05:30
Nabin Hait
cd87e76d88 [fix] Check Salary Structure validity 2015-11-15 11:06:55 +05:30
Rushabh Mehta
64e31e9a4e [fix] process payroll 2015-11-06 14:47:12 +05:30
Rushabh Mehta
b9e7cb02f4 [change-log] 2015-11-04 17:02:13 +05:30
Rushabh Mehta
d48c2394e8 [cleanup] drop ship testing & cleanup 2015-11-04 15:24:04 +05:30