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: Multiple rows for same warehouse and batches in pick list (backport #33456) #33458

Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 27, 2022

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

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Dec 27, 2022
@deepeshgarg007 deepeshgarg007 merged commit a166a76 into version-14-hotfix Dec 27, 2022
@mergify mergify bot deleted the mergify/bp/version-14-hotfix/pr-33456 branch December 27, 2022 12:19
deepeshgarg007 added a commit that referenced this pull request Dec 27, 2022
* fix: typerror on multi warehouse in Packed Items

DN(with bundled item with varying warehouses)-> Sales Invoice.

(cherry picked from commit e684eb3)

* test: type error on bundled products with different warehouses

(cherry picked from commit 5918bb0)

* fix: payment terms and sales partner filter issue in AR/AP report

(cherry picked from commit 13c4420)

* fix: timeout error while submitting stock entry

Co-authored-by: Ankush Menat <ankush@frappe.io>
(cherry picked from commit a05c47e)

* fix: `shipping_address` in PO

(cherry picked from commit 7e1b6b3)

* refactor: Customer and Supplier Ledger summary will have hidden fields for better handling of user permission (#33433)

* feat: Accounting Dimension updation in Payment Request and Entry (#33411)

* fix: `shipping_address` for non-drop shipping item

(cherry picked from commit 67a7ccf)

* fix: Random behaviour while picking items using picklist (backport #33449) (#33450)

fix: Random behaviour while picking items using picklist (#33449)

(cherry picked from commit 8263bf9)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

* fix: Multiple rows for same warehouse and batches in pick list (backport #33456) (#33458)

fix: Multiple rows for same warehouse and batches in pick list (#33456)

(cherry picked from commit d2686ce)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

* fix: Default dimensions on fetching items from BOM (backport #33439) (#33459)

fix: Default dimensions on fetching items from BOM (#33439)

(cherry picked from commit 0b75aa5)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>

Co-authored-by: ruthra kumar <ruthra@erpnext.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Jan 4, 2023
# [14.12.0](v14.11.1...v14.12.0) (2023-01-04)

### Bug Fixes

* [concurrency issue] incorrect picked qty in sales order ([e7254fd](e7254fd))
* `fg_item_qty` in non-subcontracted PO ([6e15331](6e15331))
* `shipping_address` for non-drop shipping item ([a7a3654](a7a3654))
* `shipping_address` in PO ([448fbe5](448fbe5))
* add missing 'ordered_qty' to get_bin_details ([55e8e45](55e8e45))
* consider child nodes while getting bin details ([e296408](e296408))
* Conversion factor error for invoices without item code (petty expenses) ([#32714](#32714)) ([ba5a149](ba5a149))
* Customer Primary Contact (backport [#33424](#33424)) ([#33440](#33440)) ([73c9820](73c9820))
* Default dimensions on fetching items from BOM (backport [#33439](#33439)) ([#33459](#33459)) ([a332b22](a332b22))
* Deferred revenue date comparison ([#33515](#33515)) ([027510b](027510b))
* ERR journals reported in AR/AP ([823b352](823b352))
* Get payment entry button not visible in Bank Clearance doc (backport [#33518](#33518)) ([#33525](#33525)) ([fcf052d](fcf052d))
* Missing opening entry in general ledger (backport [#33519](#33519)) ([#33526](#33526)) ([8e375db](8e375db))
* Multi-currency issues in Bank Reconciliation Tool ([#33488](#33488)) ([d030852](d030852))
* Multiple rows for same warehouse and batches in pick list (backport [#33456](#33456)) ([#33458](#33458)) ([a166a76](a166a76))
* payment terms and sales partner filter issue in AR/AP report ([0f6790b](0f6790b))
* **pricing rule:** consider child tables in condition (backport [#33469](#33469)) ([#33470](#33470)) ([3bceb47](3bceb47))
* Random behaviour while picking items using picklist (backport [#33449](#33449)) ([#33450](#33450)) ([1edde9c](1edde9c))
* set `supplier` details while mapping SE(Send to Subcontractor) ([06e13b6](06e13b6))
* timeout error while submitting stock entry ([f30f77c](f30f77c))
* typerror on multi warehouse in Packed Items ([9b24940](9b24940))
* use base_net_amount in case of missing stock qty ([#33457](#33457)) ([88ca780](88ca780))

### Features

* Accounting Dimension updation in Payment Request and Entry ([#33411](#33411)) ([e7704b2](e7704b2))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 14.12.0 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

@barredterra barredterra mentioned this pull request Mar 7, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jul 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants