feat: support product bundles in picklist (backport #30762) #30826
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
- 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 5c3f901)
(cherry picked from commit 7d56820) # Conflicts: # erpnext/stock/doctype/pick_list/test_pick_list.py
(cherry picked from commit 36c5e8a)
- rename badly named variables - support updated packed items (cherry picked from commit e64cc66) # Conflicts: # erpnext/stock/doctype/pick_list/pick_list.py
For each SO item the sales order picking status was being updated, this isn't required and wasteful. (cherry picked from commit c3fc0a4)
(cherry picked from commit 60bc26f)
(cherry picked from commit 3ddad68)
(cherry picked from commit 277b51b)
(cherry picked from commit f574121)
(cherry picked from commit 23cb0d6)
also remove misleading docstring (cherry picked from commit 25485ed)
This is to accomodate bundles that might allow floating point qty. (cherry picked from commit 41aa4b3)
(cherry picked from commit 1ac275c)
(cherry picked from commit ee54ece)
(cherry picked from commit 9e60acd) # Conflicts: # erpnext/stock/doctype/pick_list/test_pick_list.py
Other changes: - only allow whole number of bundles to get picked (cherry picked from commit 8207697)
Co-Authored-By: marination <maricadsouza221197@gmail.com> (cherry picked from commit 47e1a01)
[skip ci] (cherry picked from commit 9a8e3ef)
(cherry picked from commit ebd5f0b)
mergify
bot
requested review from
marination,
rohitwaghchaure,
ankush,
nextchamp-saqib and
deepeshgarg007
as code owners
ankush
force-pushed
the
mergify/bp/version-13-hotfix/pr-30762
branch
from
88fd0d5
to
bf0624e
Compare
|
Unrelated badly written test failing, will fix in separate PR |
frappe-pr-bot
pushed a commit
that referenced
this pull request
May 3, 2022
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03) ### Bug Fixes * Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058)) * convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e)) * Cost center filter on payment reconciliation ([22e7f03](22e7f03)) * filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65)) * Ignore custom field validation while setup ([ee54bf7](ee54bf7)) * **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d)) * Multi currency opening invoices ([2e62d51](2e62d51)) * payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813)) * Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b)) * **pos:** number pad translations ([b01f855](b01f855)) * **pos:** search field doesn't reset on checkout ([edbf551](edbf551)) * Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591)) * supply type for sez invoices with payment of tax ([cf08710](cf08710)) * Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3)) * **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0)) * **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3)) * Vat Audit report fixes ([d5319a4](d5319a4)) ### Features * Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8)) * support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d))
|
🎉 This PR is included in version 13.28.0 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
deepeshgarg007
pushed a commit
to deepeshgarg007/erpnext
that referenced
this pull request
May 13, 2022
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03) ### Bug Fixes * Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058)) * convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e)) * Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03)) * filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65)) * Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7)) * **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d)) * Multi currency opening invoices ([2e62d51](frappe@2e62d51)) * payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813)) * Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b)) * **pos:** number pad translations ([b01f855](frappe@b01f855)) * **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551)) * Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591)) * supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710)) * Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3)) * **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0)) * **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3)) * Vat Audit report fixes ([d5319a4](frappe@d5319a4)) ### Features * Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8)) * support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d))
mergify bot
pushed a commit
that referenced
this pull request
May 15, 2022
# [13.28.0](v13.27.1...v13.28.0) (2022-05-03) ### Bug Fixes * Consistent accounting dimensions across Sales and Purchase docs ([5df5058](5df5058)) * convert default_item_manufacturer to link field ([#30835](#30835)) ([#30866](#30866)) ([37fad7e](37fad7e)) * Cost center filter on payment reconciliation ([22e7f03](22e7f03)) * filters not working in Shift Assignment Calendar view ([#30822](#30822)) ([3cdbb65](3cdbb65)) * Ignore custom field validation while setup ([ee54bf7](ee54bf7)) * **india:** e-invoice generation for registered composition gst category type ([#30814](#30814)) ([#30877](#30877)) ([246869d](246869d)) * Multi currency opening invoices ([2e62d51](2e62d51)) * payment days calculation for employees joining/leaving mid-month ([#30863](#30863)) ([#30883](#30883)) ([a1b0813](a1b0813)) * Period Closing Voucher is considering GL entries with is_cancelled=1 ([#30865](#30865)) ([5a5b49b](5a5b49b)) * **pos:** number pad translations ([b01f855](b01f855)) * **pos:** search field doesn't reset on checkout ([edbf551](edbf551)) * Supply type for overseas invoices with payment of tax ([fdcc591](fdcc591)) * supply type for sez invoices with payment of tax ([cf08710](cf08710)) * Use `account_type == 'Stock'` to filter stock accounts ([93482f3](93482f3)) * **UX:** misleading stock entry lables ([#30870](#30870)) ([#30871](#30871)) ([57b03f0](57b03f0)) * **UX:** record reason for skipping attendance or marking absent for auto attendance ([#30846](#30846)) ([f7bf4a3](f7bf4a3)) * Vat Audit report fixes ([d5319a4](d5319a4)) ### Features * Copy task color from project template (backport [#30857](#30857)) ([#30859](#30859)) ([7ee18e8](7ee18e8)) * support product bundles in picklist (backport [#30762](#30762)) ([#30826](#30826)) ([645ee2d](645ee2d)) (cherry picked from commit 8cc2ea0) # Conflicts: # erpnext/__init__.py
hrwX
pushed a commit
to hrwX/erpnext
that referenced
this pull request
May 20, 2022
# [13.28.0](frappe/erpnext@v13.27.1...v13.28.0) (2022-05-03) ### Bug Fixes * Consistent accounting dimensions across Sales and Purchase docs ([5df5058](frappe@5df5058)) * convert default_item_manufacturer to link field ([frappe#30835](frappe#30835)) ([frappe#30866](frappe#30866)) ([37fad7e](frappe@37fad7e)) * Cost center filter on payment reconciliation ([22e7f03](frappe@22e7f03)) * filters not working in Shift Assignment Calendar view ([frappe#30822](frappe#30822)) ([3cdbb65](frappe@3cdbb65)) * Ignore custom field validation while setup ([ee54bf7](frappe@ee54bf7)) * **india:** e-invoice generation for registered composition gst category type ([frappe#30814](frappe#30814)) ([frappe#30877](frappe#30877)) ([246869d](frappe@246869d)) * Multi currency opening invoices ([2e62d51](frappe@2e62d51)) * payment days calculation for employees joining/leaving mid-month ([frappe#30863](frappe#30863)) ([frappe#30883](frappe#30883)) ([a1b0813](frappe@a1b0813)) * Period Closing Voucher is considering GL entries with is_cancelled=1 ([frappe#30865](frappe#30865)) ([5a5b49b](frappe@5a5b49b)) * **pos:** number pad translations ([b01f855](frappe@b01f855)) * **pos:** search field doesn't reset on checkout ([edbf551](frappe@edbf551)) * Supply type for overseas invoices with payment of tax ([fdcc591](frappe@fdcc591)) * supply type for sez invoices with payment of tax ([cf08710](frappe@cf08710)) * Use `account_type == 'Stock'` to filter stock accounts ([93482f3](frappe@93482f3)) * **UX:** misleading stock entry lables ([frappe#30870](frappe#30870)) ([frappe#30871](frappe#30871)) ([57b03f0](frappe@57b03f0)) * **UX:** record reason for skipping attendance or marking absent for auto attendance ([frappe#30846](frappe#30846)) ([f7bf4a3](frappe@f7bf4a3)) * Vat Audit report fixes ([d5319a4](frappe@d5319a4)) ### Features * Copy task color from project template (backport [frappe#30857](frappe#30857)) ([frappe#30859](frappe#30859)) ([7ee18e8](frappe@7ee18e8)) * support product bundles in picklist (backport [frappe#30762](frappe#30762)) ([frappe#30826](frappe#30826)) ([645ee2d](frappe@645ee2d)) (cherry picked from commit 8cc2ea0) # Conflicts: # erpnext/__init__.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a semi-automatic backport of pull request #30762 done by Mergify.