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: only group similar items in print format if group_same_items is checked in pick list (backport #33627) #33631

Merged
merged 1 commit into from
Jan 12, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2023

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

…checked in pick list (#33627)

* fix: only group similar items if group same items is checked in pick list

* test: non grouping of locations if group_same_items is false

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit cfb0bb1)
@s-aga-r s-aga-r merged commit 7dcf0f0 into version-13-hotfix Jan 12, 2023
@mergify mergify bot deleted the mergify/bp/version-13-hotfix/pr-33627 branch January 12, 2023 15:02
frappe-pr-bot pushed a commit that referenced this pull request Jan 17, 2023
## [13.43.2](v13.43.1...v13.43.2) (2023-01-17)

### Bug Fixes

* allow to create sales order from expired quotation ([#33582](#33582)) ([2f81f15](2f81f15))
* asset value in fixed asset register ([#33608](#33608)) ([42fe63d](42fe63d))
* better comparision of difference value between stock and account ([a450c8d](a450c8d))
* don't check other warehouse ledgers to calculate valuation rate ([66bf107](66bf107))
* handle post depr entries fail and fix asset repair link ([5f7dc8a](5f7dc8a))
* only group similar items in print format if group_same_items is checked in pick list (backport [#33627](#33627)) ([#33631](#33631)) ([7dcf0f0](7dcf0f0))
* Return against internal purchase invoice ([#33635](#33635)) ([eef0f45](eef0f45))
* Sales ORder Connections on Material Request ([97488ae](97488ae))
* Updating SO throws ordered_qty not allowed to change after submission ([a46aa80](a46aa80))

### Reverts

* Reverting changes done on 33495 ([#33662](#33662)) ([0f0a2b1](0f0a2b1))
@frappe-pr-bot
Copy link
Collaborator

🎉 This PR is included in version 13.43.2 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
…checked in pick list (backport frappe#33627) (frappe#33631)

fix: only group similar items in print format if group_same_items is checked in pick list (frappe#33627)

* fix: only group similar items if group same items is checked in pick list

* test: non grouping of locations if group_same_items is false

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit cfb0bb1)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
## [13.43.2](frappe/erpnext@v13.43.1...v13.43.2) (2023-01-17)

### Bug Fixes

* allow to create sales order from expired quotation ([frappe#33582](frappe#33582)) ([2f81f15](frappe@2f81f15))
* asset value in fixed asset register ([frappe#33608](frappe#33608)) ([42fe63d](frappe@42fe63d))
* better comparision of difference value between stock and account ([a450c8d](frappe@a450c8d))
* don't check other warehouse ledgers to calculate valuation rate ([66bf107](frappe@66bf107))
* handle post depr entries fail and fix asset repair link ([5f7dc8a](frappe@5f7dc8a))
* only group similar items in print format if group_same_items is checked in pick list (backport [frappe#33627](frappe#33627)) ([frappe#33631](frappe#33631)) ([7dcf0f0](frappe@7dcf0f0))
* Return against internal purchase invoice ([frappe#33635](frappe#33635)) ([eef0f45](frappe@eef0f45))
* Sales ORder Connections on Material Request ([97488ae](frappe@97488ae))
* Updating SO throws ordered_qty not allowed to change after submission ([a46aa80](frappe@a46aa80))

### Reverts

* Reverting changes done on 33495 ([frappe#33662](frappe#33662)) ([0f0a2b1](frappe@0f0a2b1))
SaiFi0102 pushed a commit to ServerManagementERPNext/erpnext that referenced this pull request Feb 22, 2023
…checked in pick list (backport frappe#33627) (frappe#33631)

fix: only group similar items in print format if group_same_items is checked in pick list (frappe#33627)

* fix: only group similar items if group same items is checked in pick list

* test: non grouping of locations if group_same_items is false

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
(cherry picked from commit cfb0bb1)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
SaiFi0102 pushed a commit to ServerManagementERPNext/erpnext that referenced this pull request Feb 22, 2023
## [13.43.2](frappe/erpnext@v13.43.1...v13.43.2) (2023-01-17)

### Bug Fixes

* allow to create sales order from expired quotation ([frappe#33582](frappe#33582)) ([2f81f15](frappe@2f81f15))
* asset value in fixed asset register ([frappe#33608](frappe#33608)) ([42fe63d](frappe@42fe63d))
* better comparision of difference value between stock and account ([a450c8d](frappe@a450c8d))
* don't check other warehouse ledgers to calculate valuation rate ([66bf107](frappe@66bf107))
* handle post depr entries fail and fix asset repair link ([5f7dc8a](frappe@5f7dc8a))
* only group similar items in print format if group_same_items is checked in pick list (backport [frappe#33627](frappe#33627)) ([frappe#33631](frappe#33631)) ([7dcf0f0](frappe@7dcf0f0))
* Return against internal purchase invoice ([frappe#33635](frappe#33635)) ([eef0f45](frappe@eef0f45))
* Sales ORder Connections on Material Request ([97488ae](frappe@97488ae))
* Updating SO throws ordered_qty not allowed to change after submission ([a46aa80](frappe@a46aa80))

### Reverts

* Reverting changes done on 33495 ([frappe#33662](frappe#33662)) ([0f0a2b1](frappe@0f0a2b1))
BevanTony1 pushed a commit to BevanTony1/eso-erpnext that referenced this pull request Mar 23, 2023
## [13.43.2](frappe/erpnext@v13.43.1...v13.43.2) (2023-01-17)

### Bug Fixes

* allow to create sales order from expired quotation ([frappe#33582](frappe#33582)) ([2f81f15](frappe@2f81f15))
* asset value in fixed asset register ([frappe#33608](frappe#33608)) ([42fe63d](frappe@42fe63d))
* better comparision of difference value between stock and account ([a450c8d](frappe@a450c8d))
* don't check other warehouse ledgers to calculate valuation rate ([66bf107](frappe@66bf107))
* handle post depr entries fail and fix asset repair link ([5f7dc8a](frappe@5f7dc8a))
* only group similar items in print format if group_same_items is checked in pick list (backport [frappe#33627](frappe#33627)) ([frappe#33631](frappe#33631)) ([7dcf0f0](frappe@7dcf0f0))
* Return against internal purchase invoice ([frappe#33635](frappe#33635)) ([eef0f45](frappe@eef0f45))
* Sales ORder Connections on Material Request ([97488ae](frappe@97488ae))
* Updating SO throws ordered_qty not allowed to change after submission ([a46aa80](frappe@a46aa80))

### Reverts

* Reverting changes done on 33495 ([frappe#33662](frappe#33662)) ([0f0a2b1](frappe@0f0a2b1))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants