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: journals as invoice throwing validation error (backport #1185) #1186

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 15, 2023

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

allocating payment entries against multi-currency journal entries as
invoice with the same exchange rate should not create gain_loss journals

(cherry picked from commit 50eaaca)
@codecov-commenter
Copy link

Codecov Report

Merging #1186 (6381393) into version-14-hotfix (06f784c) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files
@@                Coverage Diff                 @@
##           version-14-hotfix    #1186   +/-   ##
==================================================
  Coverage              74.30%   74.31%           
==================================================
  Files                    193      193           
  Lines                  10154    10154           
==================================================
+ Hits                    7545     7546    +1     
+ Misses                  2609     2608    -1     
Files Coverage Δ
hrms/overrides/employee_payment_entry.py 79.22% <100.00%> (+0.64%) ⬆️

@ruchamahabal ruchamahabal merged commit 71d134f into version-14-hotfix Dec 15, 2023
8 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-1185 branch December 15, 2023 09:00
frappe-pr-bot pushed a commit that referenced this pull request Dec 23, 2023
# [14.20.0](v14.19.0...v14.20.0) (2023-12-23)

### Bug Fixes

* consider previous Leave Applications while enforcing Maximum Consecutive Leaves Allowed ([d42500b](d42500b))
* dont consider holidays while checking for consecutive leaves ([baf4236](baf4236))
* Half Day Leave Application Link To Half Day Attendance (backport [#1147](#1147)) ([#1201](#1201)) ([28a840b](28a840b))
* journals as invoice throwing validation error (backport [#1185](#1185)) ([#1186](#1186)) ([71d134f](71d134f))
* permission sensitivity ([dad51de](dad51de))
* rewrite attendance query in qb ([75cec25](75cec25))
* translations ([93a5d36](93a5d36))

### Features

* better error msg ([4b0a0c7](4b0a0c7))

### Reverts

* Revert "fix: journals as invoice throwing validation error" (backport #1192) (#1193) ([177d957](177d957)), closes [#1192](#1192) [#1193](#1193)
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.20.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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants