* refactor: shows opening balance from filtered from_date
* refactor: opening balance considered from filtered from_date in stock ledger
* fix: check if stock reco is opening and misc cleanups
(cherry picked from commit fdaf93f76c)
Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
* ci: move semgrep rules out of repo (#28067)
Moving semgrep rules out of repos as it's unnecessary to maintain
same ruleset for different repos and different branches.
(cherry picked from commit cc1baae5eb)
# Conflicts:
# .github/helper/semgrep_rules/frappe_correctness.py
# .github/helper/semgrep_rules/frappe_correctness.yml
# .github/helper/semgrep_rules/report.py
# .github/helper/semgrep_rules/ux.py
# .github/workflows/linters.yml
* fix: resolve conflicts
Co-authored-by: Ankush Menat <ankush@frappe.io>
- SO Portal: fixed missing images issue
- SO Portal: fallback state when no images
- SO Portal: code indentation in `order_macros.html`
- SO Portal: Actions and indicator font size
- Recommendations: fixed space between image and title
- Recommendations: give empty image state min height
* refactor: move process loss report to manufacturing
* test: fix process loss report test
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
(cherry picked from commit 2849297471)
Co-authored-by: Alan <2.alan.tom@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>
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
(cherry picked from commit 348a961b53)
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
