feat: Leave Ledger Report by ruchamahabal [frappe] PR#1381
From: https://github.com/frappe/hrms/pull/1381
Date: 2024-04-07 15:01:34+05:30
- chore: fix linter
- test: total row in ledger report
- test: leave ledger
- ci: bump up semgrep & pre-commit
- refactor: utils structuring & imports
- chore: fix linter
- feat: add View Ledger buttons to leave transactions
- feat: add transaction type & name filter
- feat: add total row for single employee & leave type
- feat: Leave Ledger Report
Diagnostics
Conflicts detected for source commit: dbc0bb375407c0d8032122ce29b6f309a9fde412
- DU .github/workflows/linters.yml
Cleaning files from denylist:
.github/workflows/linters.yml | 49 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
pre-commit failed for source commit: 7b713480b2d9670c1eb751f4b098af85e129d2c2
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
hrms/hr/doctype/leave_allocation/test_earned_leaves.py:3:1: F401 'frappe.utils.date_diff' imported but unused
hrms/hr/doctype/leave_allocation/test_earned_leaves.py:402:2: F811 redefinition of unused 'test_backdated_pro_rated_allocation' from line 380
hrms/hr/report/leave_ledger/test_leave_ledger.py:3:1: F401 'frappe.utils.flt' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:6:1: F401 'erpnext.setup.doctype.holiday_list.test_holiday_list.set_holiday_list' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:8:1: F401 'hrms.hr.doctype.leave_allocation.test_earned_leaves.create_earned_leave_type' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:15:1: F401 'hrms.hr.doctype.leave_type.test_leave_type.create_leave_type' imported but unused
pre-commit failed for source commit: 6939dc7660b85b9d043a507b7d35d3ac24018c10
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
hrms/hr/report/leave_ledger/test_leave_ledger.py:3:1: F401 'frappe.utils.flt' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:6:1: F401 'erpnext.setup.doctype.holiday_list.test_holiday_list.set_holiday_list' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:8:1: F401 'hrms.hr.doctype.leave_allocation.test_earned_leaves.create_earned_leave_type' imported but unused
hrms/hr/report/leave_ledger/test_leave_ledger.py:15:1: F401 'hrms.hr.doctype.leave_type.test_leave_type.create_leave_type' imported but unused
pre-commit failed for source commit: 99e274aab25079dc99ef5b2ccdc33813e7bec805
flake8...................................................................Failed
- hook id: flake8
- exit code: 1
hrms/hr/doctype/leave_allocation/test_earned_leaves.py:3:1: F401 'frappe.utils.date_diff' imported but unused
hrms/hr/doctype/leave_allocation/test_earned_leaves.py:402:2: F811 redefinition of unused 'test_backdated_pro_rated_allocation' from line 380
Conflicts detected for source commit: 72aa69ee612481092422dd62125fe3663788e99a
- DU .github/workflows/linters.yml
Cleaning files from denylist:
.github/workflows/linters.yml | 49 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 49 insertions(+)
Checkout instructions
# Checkout locally
git fetch upstream
git switch ft-pr-1381
# Alternatively, re-take the changes
git switch develop
ft take ft-pr-1381
# Make changes then rebase
git rebase -i develop
# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue
# Force-push changes
git push --force-with-lease