nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-18 02:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,131 Commits 636 Branches 1,812 Tags
9b2cb23b22b5769535992914c474c27ca6431aaa
Commit Graph

2372 Commits

Author SHA1 Message Date
Rucha Mahabal
465c117708 fix: conflicts 2022-03-13 21:05:06 +05:30
Rucha Mahabal
d50dbca844 fix: flaky tests 
(cherry picked from commit d61c437588)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
70febe468b fix: add more type hints 
(cherry picked from commit 558650bc3a)
 2022-03-13 15:26:33 +00:00
Rucha Mahabal
9449d11a4c fix: simplify insufficient leave balance message 
(cherry picked from commit 8173e6a8ea)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
c66a66e090 fix: conflicts 
(cherry picked from commit b2c549a464)
 2022-03-13 15:26:32 +00:00
Rucha Mahabal
fab0153e34 test: separate leave ledger entries for leave applications across allocations 
(cherry picked from commit 97b7b5012e)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
75833243ae fix: boundary determination for separate ledger entries 
(cherry picked from commit 70239158b9)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
b63cedc7d7 test: leave application validations 
(cherry picked from commit 6755d6e6f5)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
bfedac47e6 fix: clearer validation/warning messages for insufficient balance in leave application 
(cherry picked from commit a504ffcc4c)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
a30ec8bef6 feat: split ledger entries for applications created across allocations 
- fix: ledger entry for expiring cf leaves not considering holidays

(cherry picked from commit c0f1e269e4)
 2022-03-13 15:26:31 +00:00
Rucha Mahabal
51b17cfbc0 fix: add type hints for employee leave balance report 
(cherry picked from commit 430bf00458)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
4cd89c3dac test: get leave details for leave application dashboard 
(cherry picked from commit 3f3b1766c2)

# Conflicts:
#	erpnext/hr/doctype/leave_application/test_leave_application.py
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
758e095ffd test: fix test test_leave_balance_near_allocaton_expiry 
(cherry picked from commit a58dfecb23)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
d9ec973096 fix: earned leave policy assignment test 
(cherry picked from commit aaa1ae94f2)
 2022-03-13 15:26:30 +00:00
Rucha Mahabal
b1d3d8226c fix: leave application dashboard 
- total leaves allocated considering cancelled leaves

- optional plural for leave category labels

- show dashboard only once from date is set, else it fetches all allocations till date and generates incorrect balance

- change pending leaves to 'Leaves Pending Approval' for better context

- update labels in Salary Slip Leave Details table

(cherry picked from commit 942511cfff)
 2022-03-13 15:26:29 +00:00
Rucha Mahabal
73b104aa45 test: Employee Leave Balance Summary 
(cherry picked from commit 88141d6116)
 2022-03-13 15:26:29 +00:00
Rucha Mahabal
49434e443c chore: remove unused imports, sort imports, fix sider 
(cherry picked from commit c7d594984a)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
6af8e9790b test: employee leave balance report 
- fix expired leaves calculation when filters span across 2 different allocation periods

(cherry picked from commit c050ce49c2)

# Conflicts:
#	erpnext/payroll/doctype/salary_slip/test_salary_slip.py
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
e96b661ca1 fix: show actual balance instead of consumption balance in opening balance 
- not changing opening balance based on remaining days

(cherry picked from commit dbfa463738)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
420cb8269c fix: sort imports, sider issues 
(cherry picked from commit b5c686ac40)
 2022-03-13 15:26:28 +00:00
Rucha Mahabal
4632d13dca refactor: balance in Balance Summary report near allocation expiry date 
- Leave Balance shows minimum leaves remaining after comparing with remaining days for allocation expiry causing ambiguity

- refactor remaining leaves calculation to return both, actual leave balance and balance for consumption

- show actual balance in leave application, use balance for consumption only in validations

(cherry picked from commit 55ac8519bf)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
60eb38c911 refactor: Leaves Taken calculation 
- fix issue where Leaves Taken also adds leaves expiring on boundary date as leaves taken, causing ambiguity

- remove unnecessary `skip_expiry_leaves` function

- `get_allocation_expiry` considering cancelled entries too

(cherry picked from commit 26b40e7cfd)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
d7a75a695d fix: expired leaves not calculated properly because of newly created expiry ledger entries 
(cherry picked from commit 1ea749cf1a)
 2022-03-13 15:26:27 +00:00
Rucha Mahabal
f7b06a622f refactor: Employee Leave Balance Report 
- incorrect opening balance on boundary allocation dates

- carry forwarded leaves accounted in leaves allocated column, should be part of opening balance

- leaves allocated column also adds expired leave allocations causing negative balances, should only consider non-expiry records

(cherry picked from commit 538b64b1fa)
 2022-03-13 15:26:27 +00:00
mergify[bot]
4febcd86f8 fix: flaky tests (backport #30154) (#30161) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-10 14:38:08 +05:30
Saqib Ansari
92a59fabe5 chore: imports (#30157) 
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-03-10 13:26:11 +05:30
mergify[bot]
d68cf1885f test: Added test for monthly attendance report (backport #29989) (#30143) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
 2022-03-09 17:32:29 +05:30
mergify[bot]
07b8dd0300 fix: leave allocation records query (backport #30118) (#30120) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-08 23:48:44 +05:30
mergify[bot]
e8f17e582b test: Fix flaky tests (backport #30107) (#30119) 
Co-authored-by: Chillar Anand <anand21nanda@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-08 23:25:59 +05:30
mergify[bot]
a8ae86e23f fix: wrong payment days in salary slip for employees joining/leaving during mid payroll dates (backport #29082) (#30099) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Co-authored-by: Dany Robert <danyrt@wahni.com>
 2022-03-07 20:29:52 +05:30
mergify[bot]
e5b50557e6 fix: show user id in emp group table (backport #29776) (#29777) 
Co-authored-by: Dany Robert <danyrt@wahni.com>
 2022-02-14 10:09:39 +05:30
Rucha Mahabal
0e3788e346 fix: conflicts 2022-02-11 21:27:44 +05:30
Rucha Mahabal
6a1c27a18f fix(test): reset test setup 
(cherry picked from commit cbaadcf113)
 2022-02-11 15:55:17 +00:00
Rucha Mahabal
c261621dca test: earned leave allocations based on DOJ 
(cherry picked from commit 9b0f9c3442)
 2022-02-11 15:55:16 +00:00
Rucha Mahabal
c0ea6d0721 chore: clean-up leave policy assignment tests 
(cherry picked from commit 51e6086829)
 2022-02-11 15:55:16 +00:00
Rucha Mahabal
9b6040979a fix: consider leaves for past months if assignment is based on joining date too 
(cherry picked from commit c7be9ef5d2)

# Conflicts:
#	erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
 2022-02-11 15:55:15 +00:00
Rucha Mahabal
3fea6fd9e8 fix: consider based on DOJ config while calculating leaves for passed months 
(cherry picked from commit 89fa0bb73f)
 2022-02-11 15:55:14 +00:00
Rucha Mahabal
2b4e532226 fix: Earned Leave allocation based on joining date not working 
(cherry picked from commit 7326d57966)
 2022-02-11 15:55:14 +00:00
Rucha Mahabal
e3246efa5d fix: conflicts 2022-02-08 16:12:24 +05:30
Rucha Mahabal
cc867d6338 fix: conflicts 2022-02-08 15:55:44 +05:30
Rucha Mahabal
a5f016a7cd fix: handle carry forwarded leaves while checking for duplicate allocation 
(cherry picked from commit bd1555bd23)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
aa04e02710 fix(test): add ignore duplicates flag to allocation function 
(cherry picked from commit e25544f94e)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
ce26759a95 fix: linter 
(cherry picked from commit a52ba0a544)
 2022-02-08 10:18:34 +00:00
Rucha Mahabal
d26a8d47e4 test: earned leave allocation for passed months and allocation on month-end 
(cherry picked from commit 63ee4f1b64)
 2022-02-08 10:18:33 +00:00
Rucha Mahabal
5363b1922a fix: earned leaves not allocated if assignment is created on month-end 
(cherry picked from commit 25c7f850b1)

# Conflicts:
#	erpnext/hr/doctype/leave_policy_assignment/leave_policy_assignment.py
 2022-02-08 10:18:33 +00:00
mergify[bot]
0608f61b80 fix: Program Enrollment tests (backport #29592) (#29594) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-02 17:51:46 +05:30
mergify[bot]
535e6d61f0 fix: employee reminders fixes (backport #29548) (#29576) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 20:22:49 +05:30
mergify[bot]
e2bdd5efdb fix: leave application tests (backport #29539) (#29563) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-02-01 16:18:16 +05:30
Rucha Mahabal
177a209f50 fix(Employee): set user image and validate user id only if user data is found (#29452) 2022-01-25 16:49:53 +05:30
mergify[bot]
895dd68691 fix: honour 'include holidays' setting while marking attendance for leave application (backport #29425) (#29432) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-01-24 19:21:58 +05:30