- Since Batch cancellation SLEs do not set qtys (will fix separately), `merge_similar_entries` gets `actual_qty` as None
- This causes NoneType operation error on tests that cancel batch-serial reco
- Modified tests to avoid using commit and rollback explicitly
This is an automatic backport of pull request #30827 done by [Mergify](https://mergify.com).
---
<details>
<summary>Mergify commands and options</summary>
<br />
More conditions and actions can be found in the [documentation](https://docs.mergify.com/).
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](https://dashboard.mergify.com/) you can:
- look at your merge queues
- generate the Mergify configuration with the config editor.
Finally, you can contact us on https://mergify.com
</details>
* refactor: misc pick list refactors
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
(cherry picked from commit 5c3f9019cc)
* test: bundles in picklist
(cherry picked from commit 7d5682020a)
# Conflicts:
# erpnext/stock/doctype/pick_list/test_pick_list.py
* feat: Pick list from SO with Product Bundle
(cherry picked from commit 36c5e8a14f)
* refactor: sales order status update
- rename badly named variables
- support updated packed items
(cherry picked from commit e64cc66df7)
# Conflicts:
# erpnext/stock/doctype/pick_list/pick_list.py
* perf: single update per Sales Order.
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
(cherry picked from commit c3fc0a4f55)
* feat: back-update min picked qty for a bundle
(cherry picked from commit 60bc26fdbe)
* refactor: simplify needlessly complicated code
(cherry picked from commit 3ddad6891a)
* refactor: groupby using keys instead of int index
(cherry picked from commit 277b51b404)
* refactor: simpler check for non-SO items
(cherry picked from commit f574121741)
* feat: create DN from pick list with bundle items
(cherry picked from commit 23cb0d684d)
* refactor: remove unnecssary vars
also remove misleading docstring
(cherry picked from commit 25485edfd9)
* fix: round off bundle qty
This is to accomodate bundles that might allow floating point qty.
(cherry picked from commit 41aa4b3524)
* feat: transfer picklist stock info to packing list
(cherry picked from commit 1ac275ce61)
* test: product bundle fixture
(cherry picked from commit ee54ece8fd)
* test: test bundle - picklist behaviour
(cherry picked from commit 9e60acdf56)
# Conflicts:
# erpnext/stock/doctype/pick_list/test_pick_list.py
* fix: compare against stock qty while validating
Other changes:
- only allow whole number of bundles to get picked
(cherry picked from commit 8207697e43)
* fix: dont map picked qty and consider pick qty for new PL
Co-Authored-By: marination <maricadsouza221197@gmail.com>
(cherry picked from commit 47e1a0104c)
* fix(UX): only show pick list when picking is pending
[skip ci]
(cherry picked from commit 9a8e3ef235)
* chore: make picked qty read only
(cherry picked from commit ebd5f0b1bb)
* chore: conflicts and py3.7 compatibilty
Co-authored-by: Ankush Menat <ankush@frappe.io>
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
(cherry picked from commit 44331f4f1f)
