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

198 Commits

Author SHA1 Message Date
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
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
e4cc0c1c87 fix: tests 2022-03-31 00:21:23 +05:30
Rucha Mahabal
97547da7ee fix(test): make holiday list for shift and checkin tests 2022-03-31 00:17:32 +05:30
Rucha Mahabal
baec607ff5 style: format code with black 2022-03-30 15:23:13 +05:30
Rucha Mahabal
acb27430ac test: monthly attendance sheet 2022-03-30 15:14:31 +05:30
Rucha Mahabal
41cfcdba44 feat: show shift-wise attendance in monthly attendance sheet 2022-03-29 16:10:46 +05:30
Rucha Mahabal
865204a541 feat: add colors for attendance status to lessen the cognitive load 
- legend with colors and full form for status abbreviations
 2022-03-29 16:10:46 +05:30
Rucha Mahabal
e79d292233 refactor: Monthly Attendance Sheet 
- split into smaller functions

- add type hints

- get rid of unnecessary db calls and loops

- add docstrings for functions
 2022-03-29 16:10:41 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Rucha Mahabal
d61c437588 fix: flaky tests 2022-03-13 20:30:18 +05:30
Rucha Mahabal
558650bc3a fix: add more type hints 2022-03-13 20:02:51 +05:30
Rucha Mahabal
8173e6a8ea fix: simplify insufficient leave balance message 2022-03-11 15:30:01 +05:30
Rucha Mahabal
79b0354efc
Merge branch 'develop' into leave-opening-balance 2022-03-10 14:45:46 +05:30
Ankush Menat
84568ac341 chore: imports 2022-03-10 11:20:23 +05:30
Chillar Anand
b1c8a4543d
test: Added test for monthly attendance report (#29989) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-03-09 17:05:00 +05:30
Rucha Mahabal
430bf00458 fix: add type hints for employee leave balance report 2022-03-08 13:36:08 +05:30
Rucha Mahabal
88141d6116 test: Employee Leave Balance Summary 2022-02-28 12:12:52 +05:30
Rucha Mahabal
c7d594984a chore: remove unused imports, sort imports, fix sider 2022-02-28 10:19:16 +05:30
Rucha Mahabal
c050ce49c2 test: employee leave balance report 
- fix expired leaves calculation when filters span across 2 different allocation periods
 2022-02-28 09:58:12 +05:30
Rucha Mahabal
dbfa463738 fix: show actual balance instead of consumption balance in opening balance 
- not changing opening balance based on remaining days
 2022-02-04 13:04:25 +05:30
Rucha Mahabal
1ea749cf1a fix: expired leaves not calculated properly because of newly created expiry ledger entries 2022-02-03 23:34:46 +05:30
Rucha Mahabal
538b64b1fa 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
 2022-01-31 21:50:42 +05:30
Rucha Mahabal
a481a7c90e
fix(test): Employee Exit Summary (#28888) 2021-12-14 22:03:44 +05:30
Rucha Mahabal
bb97309e2e fix: tests 
- specify sorting order in employee exits query

- rollback after work order tests
 2021-12-12 23:20:04 +05:30
Rucha Mahabal
dcbf0c9eca fix: tests and sider issues 2021-12-07 23:40:10 +05:30
Rucha Mahabal
c305ff911f test: Employee Exits Report 2021-12-07 16:22:17 +05:30
Rucha Mahabal
ef38b127ae chore: fix report column widths 2021-12-07 15:02:00 +05:30
Rucha Mahabal
0a937dc050 fix: show Exit Questionnaire button only to the users with write access 
- fix linter issues
 2021-12-07 13:04:23 +05:30
Rucha Mahabal
3437f568be feat: Employee Exits report 2021-12-05 21:55:13 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Goh Yan Chang
632f7848a3
Update employee_leave_balance.py 
fix: Employee Leave Balance report showing wrong figures
 2021-10-01 16:30:33 +08:00
Chillar Anand
915b34391c
chore: Clean up imports (#27302) 
* chore: Added isort to pre-commit config

* chore: Sort imports with isort

* chore: Clean up imports with pycln

* chore: Sort imports with isort

* chore: Fix import issues

* chore: Clean up sider issues

* chore: Remove import errors from flake8 ignore list

* chore: Clean up lint issues
 2021-09-02 16:44:59 +05:30
Ankush Menat
2d62c500c4
fix: undefined variables 2021-09-01 15:05:00 +05:30
Ankush Menat
010060d92e
chore: correct indentation 2021-09-01 15:02:29 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Jannat Patel
ca8c3b90f0
fix: Update leave allocation after submit (#25975) 
* update leave allocation after submit

* fix: leave allocation update after submit

* fix: circular dependency

* fix: replaced update with submit in tests

* fix: replaced update with submit in tests

* fix: updating total leaves allocated
 2021-06-24 13:13:03 +05:30
Nabin Hait
0950481253 fix: merge conflict 2021-06-15 20:18:06 +05:30
Jannat Patel
1175e0686b
refactor: leave balance report (#25771) 
* refactor: leave balance report

* refactor: sql to orm
 2021-06-01 10:53:00 +05:30
Rucha Mahabal
3be28054de
refactor: Vehicle Expenses Report (#25727) 
* refactor: Vehicle Expense Report

* test: Vehicle Expenses Report

* feat: Added Employee filter to report

- fix Vehicle Log form view

* fix: set currency fieldtype for chart data

- added filters for employee and vehicle

* fix: service expenses not getting set
 2021-05-31 09:11:42 +05:30
Syed Mujeer Hashmi
bcf3f3dd29
fix: Monthly Attendance Sheet Summarized view (#24976) 
* fix: Monthly Attendance Sheet Summarized view

This fixes the count of different leave types in the monthly
attendance sheet summarized view.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

* fix: Avoid using raw sql query

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
 2021-05-07 13:34:21 +05:30
Nikhil Ponnuru
ef9f126cb2
fix: change get_all to get_list in employee leave balance summary report to hide descendants when hide descendants is selected in user permissions (#25599) 
Co-authored-by: nikhilponnuru <nikhil.kp@zerodha.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-05-07 10:06:29 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch (#25305) 2021-04-13 15:46:01 +05:30
Anurag Mishra
720f69caaf
fix: column width in Recruitment analytics report (#25003) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-03-31 11:23:34 +05:30
Michelle Alva
ab149f196e
fix: typo in Leave Balance Report 
Change Leaves to Leave
 2021-02-20 10:43:47 +05:30
Anurag Mishra
5164223b99
fix: error on group by filter (#24587) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-02-09 16:22:28 +05:30
bhavesh95863
d888a59bd1
fix: set company filter in condition 2020-08-26 12:44:20 +05:30