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: don't reset rate if greater than zero in standalone debit note (backport #37935) #37940

Merged
merged 2 commits into from
Nov 6, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

This is an automatic backport of pull request #37935 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

@mergify mergify bot assigned s-aga-r Nov 6, 2023
@github-actions github-actions bot added the buying label Nov 6, 2023
@s-aga-r s-aga-r merged commit 64658fc into version-14-hotfix Nov 6, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37935 branch November 6, 2023 13:57
@s-aga-r
Copy link
Contributor

s-aga-r commented Nov 6, 2023

@Mergifyio backport version-14

Copy link
Contributor Author

mergify bot commented Nov 6, 2023

backport version-14

✅ Backports have been created

mergify bot added a commit that referenced this pull request Nov 6, 2023
…backport #37935) (#37940)

* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 64658fc)
s-aga-r pushed a commit that referenced this pull request Nov 6, 2023
…backport #37935) (backport #37940) (#37945)

fix: don't reset rate if greater than zero in standalone debit note (backport #37935) (#37940)

* fix: don't reset rate if greater than zero in standalone debit note

(cherry picked from commit 5cce522)

* fix(test): `test_gl_entries_for_standalone_debit_note`

(cherry picked from commit f9fc6c9)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit 64658fc)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
frappe-pr-bot pushed a commit that referenced this pull request Nov 6, 2023
## [14.46.6](v14.46.5...v14.46.6) (2023-11-06)

### Bug Fixes

* don't reset rate if greater than zero in standalone debit note (backport [#37935](#37935)) (backport [#37940](#37940)) ([#37945](#37945)) ([235f166](235f166))
frappe-pr-bot pushed a commit that referenced this pull request Nov 8, 2023
# [14.47.0](v14.46.7...v14.47.0) (2023-11-08)

### Bug Fixes

* `TypeError` in PR for non-stock item ([ef4471f](ef4471f))
* add missing disbursement account in update_old_loans patch ([ad64065](ad64065))
* add translation wrapper (backport [#37911](#37911)) ([#37946](#37946)) ([c53d281](c53d281))
* don't reset rate if greater than zero in standalone debit note (backport [#37935](#37935)) ([#37940](#37940)) ([64658fc](64658fc))
* fetch asset received but not billed account only when needed ([7df4009](7df4009))
* gov compliance for tax withholding report ([#37590](#37590)) ([273cc35](273cc35))
* In-Transit Warehouse company filter (backport [#37796](#37796)) ([#37797](#37797)) ([0b1da08](0b1da08))
* link between parent and child procedure (backport [#37903](#37903)) ([#37943](#37943)) ([24da29a](24da29a))
* list index out of range ([#37880](#37880)) ([05fed9e](05fed9e))
* make `Material Request Item` required if `Material Request` is set in PO (backport [#37928](#37928)) ([#37936](#37936)) ([c870120](c870120))
* permission error while creating Supplier Quotation from Portal (backport [#37864](#37864)) ([#37870](#37870)) ([1a3dae0](1a3dae0))
* **plaid:** Do not sync pending transactions ([ffdc11b](ffdc11b))
* POS change amount gl entry with no amount ([#37799](#37799)) ([5e1a89b](5e1a89b))
* Quality Inspection Parameter migration - DuplicateEntryError due to case sensitivity (backport [#37499](#37499)) ([#37916](#37916)) ([eb3630b](eb3630b))
* remove voucher type and no for Item and Warehouse based reposting (backport [#37849](#37849)) ([#37850](#37850)) ([e19cade](e19cade))
* standard submit perm in repost ledger for editable invoices (backport [#37826](#37826)) ([#37854](#37854)) ([69b569d](69b569d))
* status for over delivery or billing ([d8e7430](d8e7430))
* type error on new payment entry ([38184f7](38184f7))
* typo in AR report ([3d72ec7](3d72ec7))
* validate so item with qtn ([4a225b0](4a225b0))

### Features

* reserved production plan sub assembly items (backport [#37884](#37884)) ([#37926](#37926)) ([4de97a4](4de97a4))
* settings page for repost ([09cde5d](09cde5d))
* **Stock Balance:** add filters from route (backport [#37836](#37836)) ([#37839](#37839)) ([e8a706a](e8a706a))

### Performance Improvements

* Add index to supplier invoice field (backport [#37861](#37861)) ([#37862](#37862)) ([2c93f81](2c93f81))
* index return against for purchase invoice (backport [#37881](#37881)) ([#37882](#37882)) ([fed25fa](fed25fa))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.47.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants