* fix: Employee Transfer testcases
* fix: Project Profitability test case
(cherry picked from commit d0f4f03b66)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: employee advance paid amount not updated on PE cancellation
* fix: convert raw sql queries to qb
* test: Employee Advance Paid Amount on PE cancellation
* chore: disable no copy for sanctioned amount in Expense Claim
(cherry picked from commit baf41fdc9c)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* feat: employee initial work history updated when transfer is performed
* fix: sider
* fix: remove commit statement
* fix: tests and code formatting
* fix: tests
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 03bfc77940)
Co-authored-by: Mohammed Yusuf Shaikh <49878143+mohammedyusufshaikh@users.noreply.github.com>
* feat: Tax for recurring additional salary (#27459)
* fix: Logic for tax calculation on recurring additional salary
* fix: Get actual amount always in case of overwritten additional salary even if based on payment days
* feat: Test case added for recurring additional salary
* fix: use query builder to get additional salaries instead of raw SQL
* fix: query formatting and remove trailing spaces
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
(cherry picked from commit 2ef4844a3c)
# Conflicts:
# erpnext/payroll/doctype/salary_slip/salary_slip.py
# erpnext/payroll/doctype/salary_slip/test_salary_slip.py
* fix: conflicts
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
Tax rate could be different for different expenses.
Therefore, rate is kept as 0.00 and tax amount entered manually.
But fetching used to override the rate(upon saving) and mess up the amount.
(cherry picked from commit 5ce6a4c107)
* fix: wrong company selected when marking attendance for all employees
* fix: enable caching for repeated queries of the same employee
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* chore: remove deprecated and empty QUnit tests
* ci: fix UI test config
Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
(cherry picked from commit ae55eab599)
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
* test: fix test due to rename change
* test: fix attendance request tests
- Use `frappe.db.get_value` instead of `get_doc` for asserting values
- Get values after cancellation as reloading attendance doc breaks due to stale doc (primary key changed after cancel of attendance request)
- rollback everything on tearDown
* test: fix Shift Request test
- Use `get_value` instead of `get_doc`
- Remove unnecessary loop, only one shift assignment is made against a shift request
- Get value after cancel again. Get doc is not reliable since primary key changed after cancel
* test: fix POS Closing Entry Test
- Separated into two tests, one checks if SI cancelling is blocked, the other checks PCE cancel impact
- This is done because after cancel via assertRaises, damage done by cancel still exists or is partially comitted
- Dont use this partially cancelled doc for any assertions further, end test at exception assertion
- Use `get_value` to check SI docstatus, as its primary key changes after cancel
* test: fixed asset movement tests
- set cwip account in company to avoid value missing
- removed unused statement
- removed trailing spaces
* Revert "test: fix POS Closing Entry Test"
This reverts commit 8f1a3aef2e.
Co-authored-by: marination <maricadsouza221197@gmail.com>
* fix: training event employee status not updated on feedback submission
* feat: update attendees status on training event status update
* test: Training Event and Feedback
* chore: remove unused import
(cherry picked from commit bf75ea70fb)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
* fix: add z-index to filter to avoid svg wrapper overlapping
* fix: expand all nodes not working when there are only 2 levels
- added dom freeze while expanding all nodes and exporting
(cherry picked from commit 67e3971c3b)
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
