Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use reference name while updating exc rate (backport #1623) #1635

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 5, 2024

continues: #1553
parent change in ERPNext: frappe/erpnext#40856
Previous fix wasn't working as expected.


This is an automatic backport of pull request #1623 done by Mergify.

@codecov-commenter
Copy link

Codecov Report

Attention: Patch coverage is 50.00000% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 72.86%. Comparing base (d4eb090) to head (3d2c20d).
Report is 25 commits behind head on version-15-hotfix.

Additional details and impacted files
@@                  Coverage Diff                  @@
##           version-15-hotfix    #1635      +/-   ##
=====================================================
+ Coverage              72.84%   72.86%   +0.02%     
=====================================================
  Files                    202      202              
  Lines                  11168    11191      +23     
=====================================================
+ Hits                    8135     8154      +19     
- Misses                  3033     3037       +4     
Files Coverage Δ
hrms/overrides/employee_payment_entry.py 78.20% <50.00%> (ø)

@ruchamahabal ruchamahabal merged commit d5a45f2 into version-15-hotfix Apr 5, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-15-hotfix/pr-1623 branch April 5, 2024 15:47
frappe-pr-bot pushed a commit that referenced this pull request Apr 10, 2024
# [15.17.0](v15.16.0...v15.17.0) (2024-04-10)

### Bug Fixes

* assignment link in tax slab validation ([fc23a21](fc23a21))
* employee filter in list view of shift assignment (backport [#1624](#1624)) ([#1627](#1627)) ([38030b5](38030b5))
* shift type filter in list view of shift assignment (backport [#1625](#1625)) ([#1629](#1629)) ([e8fc0f0](e8fc0f0))
* use reference name while updating exc rate (backport [#1623](#1623)) ([#1635](#1635)) ([d5a45f2](d5a45f2))
* validate/warn overwriting tax in additional salary ([fa833e0](fa833e0))

### Features

* add total row for single employee & leave type ([7d8a3c5](7d8a3c5))
* add transaction type & name filter ([bb967ae](bb967ae))
* add View Ledger buttons to leave transactions ([6f630ac](6f630ac))
* Leave Ledger Report ([9be6701](9be6701))
* **Payroll:** allow overwriting tax component through additional salary ([ac23771](ac23771))
* show holidays and colour code in attendance calendar ([75c1e16](75c1e16))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 15.17.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants