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: GL Entries not getting created for PR Return (backport #37513) #37516

Merged
merged 3 commits into from
Oct 15, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 15, 2023

This is an automatic backport of pull request #37513 done by Mergify.
Cherry-pick of 253d478 has failed:

On branch mergify/bp/version-14-hotfix/pr-37513
Your branch is ahead of 'origin/version-14-hotfix' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 253d4782c6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

(cherry picked from commit 253d478)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@mergify mergify bot added the conflicts label Oct 15, 2023
@s-aga-r s-aga-r force-pushed the mergify/bp/version-14-hotfix/pr-37513 branch from e25a412 to 3adcbe1 Compare October 15, 2023 19:11
@s-aga-r s-aga-r force-pushed the mergify/bp/version-14-hotfix/pr-37513 branch from 3adcbe1 to 0a368b7 Compare October 15, 2023 19:15
@s-aga-r s-aga-r removed the conflicts label Oct 15, 2023
@s-aga-r s-aga-r merged commit c32258e into version-14-hotfix Oct 15, 2023
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-37513 branch October 15, 2023 19:54
frappe-pr-bot pushed a commit that referenced this pull request Oct 19, 2023
## [14.44.1](v14.44.0...v14.44.1) (2023-10-19)

### Bug Fixes

* billed_qty to show a sum of all invoiced qty from the purchase order item. (backport [#37539](#37539)) ([#37558](#37558)) ([ac7d6d6](ac7d6d6))
* consider received qty while creating SO -> MR (backport [#37414](#37414)) ([#37514](#37514)) ([1b94510](1b94510))
* don't set finance books if gross_purchase_amount is not set (backport [#37480](#37480)) ([#37482](#37482)) ([0590f21](0590f21))
* e-commerce permissions for address ([#37554](#37554)) ([022f85d](022f85d))
* german tranlations of "Is Return" ([f9b2355](f9b2355))
* GL Entries not getting created for PR Return (backport [#37513](#37513)) ([#37516](#37516)) ([c32258e](c32258e))
* **gp:** wrong `allocated_amount` on multi sales person invoice ([d266423](d266423))
* Incorrect vat amount in KSA VAT report ([44f7de0](44f7de0))
* inflated total amt in TDS report using back calculation ([78e22af](78e22af))
* Issues related to RFQ and Supplier Quotation on Portal (backport [#37565](#37565)) ([#37577](#37577)) ([e1504ef](e1504ef))
* keep customer/supplier website role by default ([76ef61c](76ef61c))
* keyerror on gl and pl comparision report ([6f143d3](6f143d3))
* payment entry count on supplier dashboard (backport [#37571](#37571)) ([#37575](#37575)) ([95abd79](95abd79))
* same Serial No get mapped while creating SO -> DN ([#37527](#37527)) ([5025850](5025850))
* serial and batch no get removed on save of return DN ([#37476](#37476)) ([f1814a1](f1814a1))
* Stock Reconciliation Insufficient Stock Error ([#37494](#37494)) ([9406ddb](9406ddb))
* **test:** project test case (backport [#37541](#37541)) ([#37543](#37543)) ([e23710b](e23710b))
* use `flt` to ignore TypeError ([#37481](#37481)) ([d2b22db](d2b22db))

### Performance Improvements

* index `dn_detail` in `Delivery Note Item` (backport [#37528](#37528)) ([#37530](#37530)) ([001c230](001c230))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant