Commit Graph

2549 Commits

Author SHA1 Message Date
Rucha Mahabal
34e238ce4f
fix: Leave Encashment calculations (#31062) 2022-05-23 10:13:49 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30
Rucha Mahabal
28fe4f3d54
fix: unlink Attendance from Employee Checkins on cancellation (#31045) 2022-05-17 12:07:58 +05:30
Rucha Mahabal
1b7ce9649b
fix: IN time not captured in Attendance through Employee Checkin (#31029) 2022-05-16 15:45:00 +05:30
Rucha Mahabal
ead08aa192
Merge pull request #31013 from ruchamahabal/hr-reports-emp-status
feat: add Employee Status filter in leave balance reports
2022-05-13 22:07:08 +05:30
Rucha Mahabal
260cfa5d1e test: employee status filter in leave balance reports 2022-05-13 21:02:09 +05:30
Rucha Mahabal
08fb9a4318 fix: translation for status filter 2022-05-13 20:44:35 +05:30
Rucha Mahabal
ed8a49737a feat: add Employee Status filter in leave balance reports 2022-05-13 20:23:32 +05:30
Rucha Mahabal
3016ed958e
fix(Employee Advance): Return/Deduction from Salary button visibility (#31011) 2022-05-13 20:01:14 +05:30
Rucha Mahabal
51fcbe5826
feat(HR): Leave Type configuration to allow over allocation (#30940) 2022-05-09 21:29:58 +05:30
Rucha Mahabal
f92bc4dd33
fix: remove check for already allocated earned leaves (#30931)
* fix: remove check for already allocated earned leaves

* fix: do not set New Leaves Allocated field as read-only for earned leaves

- removing this until there's a better way to update existing allocations
2022-05-09 12:15:02 +05:30
Rucha Mahabal
7f1024f8aa
feat(minor): fetch default salary structure and base from Employee Grade in Salary Structure Assignment (#30918) 2022-05-06 17:44:30 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration 2022-05-02 11:47:37 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance (#30844) 2022-04-29 15:46:00 +05:30
Deepesh Garg
8dcbbf1b9e chore: Remove course links from training doctypes 2022-04-28 13:49:34 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test (#30810) 2022-04-26 17:43:08 +05:30
Rucha Mahabal
8e5327a0e0 fix: clear property child table on changing employee 2022-04-22 21:33:24 +05:30
Rucha Mahabal
9d158088ee chore: remove unused Employee Transfer Property doctype 2022-04-22 20:20:12 +05:30
Rucha Mahabal
cfa4dfe7a8 fix: reset old CTC on promotion cancellation 2022-04-22 20:20:04 +05:30
Rucha Mahabal
9b93c63830 fix: tests 2022-04-22 17:54:32 +05:30
Rucha Mahabal
788e0a1c6c chore: format employee_property_update.js 2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements 2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b test: employee property update via Employee Promotion 2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19 feat: add CTC fields in Employee master and Promotion 2022-04-22 16:28:14 +05:30
Rucha Mahabal
c3dc5d5ce7 fix: property addition not working for select fields 2022-04-21 08:17:00 +05:30
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view (#30752) 2022-04-20 14:56:06 +05:30
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
2022-04-19 13:17:36 +05:30
Rucha Mahabal
cf2e6c6c08 fix: remove hardcoded employee fields that can be updated via Promotion 2022-04-09 13:15:37 +05:30
Suraj Shetty
199419db80
Merge branch 'develop' into exotel-fixes 2022-04-08 21:37:08 +05:30
Rucha Mahabal
7ba66b0320
Merge branch 'develop' into multiple-shifts 2022-04-07 18:07:39 +05:30
Rucha Mahabal
ec65af5f38 fix: show allocation history for earned leaves allocated via scheduler 2022-04-07 12:57:04 +05:30
Rucha Mahabal
6203ffc8fa fix: make New Leaves Allocated read-only if policy assignment is linked to the allocation and leave type is earned leave 2022-04-07 12:57:04 +05:30
Rucha Mahabal
f8f1c3d8b5 fix: enable Track Changes in Leave Allocation 2022-04-07 12:57:04 +05:30
Rucha Mahabal
00ddb4c42a
Merge branch 'develop' into multiple-shifts 2022-04-06 11:22:46 +05:30
Rucha Mahabal
c5850e3923
Revert "feat: Scheduling Multiple shifts and Auto Attendance" (#30587) 2022-04-06 11:18:47 +05:30
Rucha Mahabal
f208903250
feat: Scheduling Multiple shifts and Auto Attendance (#29955)
* refactor: overlapping shifts validation

- convert raw query to frappe.qb

- check for overlapping timings if dates overlap

- translation friendly error messages with link to overlapping doc

* refactor: consider timeslots in `get_employee_shift`

* fix: handle shift grace overlap while finding current shift

* refactor: handle shifts spanning over 2 different days

* fix: fetching shift on timing boundaries

* refactor: rewrite docstrings and add type hints for functions

* refactor: Allow multiple attendance records creation for different shifts

* feat: auto attendance marking for multiple shifts on the same day

* refactor: mark absent for employees with no attendance

- break down into smaller functions

- make it work with multiple shifts

- this will mark employee as absent per shift, meaning employee can be present for one shift and absent for another on the same day

* chore: sort imports, remove unused imports

* refactor: Monthly Attendance Sheet

- split into smaller functions

- add type hints

- get rid of unnecessary db calls and loops

- add docstrings for functions

* feat: add colors for attendance status to lessen the cognitive load

- legend with colors and full form for status abbreviations

* feat: show shift-wise attendance in monthly attendance sheet

* test: monthly attendance sheet

* style: format code with black

* chore: ignore formatting changes in blame

* test: fetching shifts in Employee Checkins

* fix(test): make holiday list for shift and checkin tests

* fix: tests

* test: shift assignment creation

* fix: attendance fixes

- check half day attendance threshold before absent threshold to avoid half day getting marked as absent

- round working hours to 2 digits for better accuracy

- start and end dates for absent attendance marking

* test: Shift Type with Auto Attendance setup and working

fix test setups

* refactor: Overlapping validation for Shift Request

- commonify time overlap function between request and assignment

- add tests for shift request overlap

* chore: remove unused import

* fix: add validation for overlapping shift attendance

- skip auto attendance in case of overlapping shift attendance record

- this case won't occur in case of shift assignment, since it will not allow overlapping shifts to be assigned

- can happen if manual attendance records are created

* test: validations for duplicate and overlapping shift attendance records

* test: skip auto attendance

* fix: skip validation for overlapping shift attendance if no shift is linked

* test: add holiday related shift and attendance tests

* test: add attendance sheet tests for employee filter, half days

* fix: sider
2022-04-06 10:56:47 +05:30
Rucha Mahabal
0e1528365d fix: sider 2022-04-04 21:31:14 +05:30
Rucha Mahabal
bd077dbb3b test: add attendance sheet tests for employee filter, half days 2022-04-04 21:26:42 +05:30
Rucha Mahabal
fec47632bc test: add holiday related shift and attendance tests 2022-04-04 21:02:22 +05:30
Suraj Shetty
ca66224d57
Merge branch 'develop' into exotel-fixes 2022-04-04 20:22:06 +05:30
Rucha Mahabal
7675542926
Merge pull request #30569 from ruchamahabal/fix-leave-alloc-update 2022-04-04 20:18:55 +05:30
Rucha Mahabal
793164ac2e fix(test): set company for employee in leave allocation test setup 2022-04-04 19:08:27 +05:30
Rucha Mahabal
5499cecffd test: leave allocation validations and total value for updates done before and after submission 2022-04-04 18:32:17 +05:30
Suraj Shetty
117e5d05a3
Merge branch 'develop' into exotel-fixes 2022-04-04 18:21:46 +05:30
Rucha Mahabal
7b406f422d
Merge branch 'develop' into multiple-shifts 2022-04-04 18:14:49 +05:30
Rucha Mahabal
3538656a7d fix: total leaves allocated not validated and recalculated on updates post submission 2022-04-04 17:52:30 +05:30
Ankush Menat
a896895a9e fix: bulk fix (~330) missing translations 2022-04-04 13:59:51 +05:30
Rucha Mahabal
d9f00409b9
Merge branch 'develop' into multiple-shifts 2022-04-04 11:19:03 +05:30