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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 3 commits into from
Jan 12, 2023
Merged

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

merged 3 commits into from
Jan 12, 2023

Conversation

phot0n
Copy link
Contributor

@phot0n phot0n commented Jan 12, 2023 •
edited
Loading

5c3f901 removed the condition which considered the print setting option of disabling grouping of same items.

This pr adds that back again.

@phot0n phot0n changed the title fix: only group similar items if group same items is checked in pick list fix: only group similar items if group_same_items is checked in pick list Jan 12, 2023
@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jan 12, 2023
@phot0n phot0n added backport version-13-hotfix backport version-14-hotfix backport to version 14 and removed needs-tests This PR needs automated unit-tests. labels Jan 12, 2023
@codecov
Copy link

codecov bot commented Jan 12, 2023 •
edited
Loading

Codecov Report

Merging #33627 (0409e8b) into develop (e0db267) will increase coverage by 0.00%.
The diff coverage is 100.00%.

Additional details and impacted files 
@@           Coverage Diff            @@
##           develop   #33627   +/-   ##
========================================
  Coverage    64.19%   64.19%           
========================================
  Files          819      819           
  Lines        59038    59039    +1     
========================================
+ Hits         37898    37899    +1     
  Misses       21140    21140
Impacted Files Coverage Δ
erpnext/stock/doctype/pick_list/pick_list.py 76.59% <100.00%> (+0.05%) ⬆️

@s-aga-r s-aga-r marked this pull request as ready for review January 12, 2023 11:30
@phot0n phot0n changed the title fix: only group similar items if group_same_items is checked in pick list fix: only group similar items in print format if group_same_items is checked in pick list Jan 12, 2023
@phot0n phot0n added the squash Meant to tell reviewers that this PR should be squashed into a single commit while merging. label Jan 12, 2023
@s-aga-r s-aga-r merged commit cfb0bb1 into frappe:develop Jan 12, 2023
mergify bot pushed a commit that referenced this pull request Jan 12, 2023
@phot0n @mergify
fix: only group similar items in print format if group_same_items is …
8f6033c 
…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)
This was referenced Jan 12, 2023
Merged
Merged
mergify bot pushed a commit that referenced this pull request Jan 12, 2023
@phot0n @mergify
fix: only group similar items in print format if group_same_items is …
ef7c7ef 
…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)
@phot0n phot0n deleted the picklist-print-grouping branch January 12, 2023 12:00
s-aga-r pushed a commit that referenced this pull request Jan 12, 2023
@mergify @phot0n
fix: only group similar items in print format if group_same_items is …
7dcf0f0 
…checked in pick list (backport #33627) (#33631)

fix: only group similar items in print format if group_same_items is 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)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
s-aga-r added a commit that referenced this pull request Jan 12, 2023
@mergify @phot0n @s-aga-r
fix: only group similar items in print format if group_same_items is …
28f2d35 
…checked in pick list (backport #33627) (#33630)

fix: only group similar items in print format if group_same_items is 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)

Co-authored-by: Ritwik Puri <ritwikpuri5678@gmail.com>
Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
@phot0n phot0n mentioned this pull request Jan 12, 2023
Merged
frappe-pr-bot pushed a commit that referenced this pull request Jan 17, 2023
@frappe-bot
chore(release): Bumped to Version 13.43.2
550daf2 
## [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 pushed a commit that referenced this pull request Jan 17, 2023
@frappe-bot
chore(release): Bumped to Version 14.13.0
e910c94 
# [14.13.0](v14.12.1...v14.13.0) (2023-01-17)

### Bug Fixes

* allow to create sales order from expired quotation ([#33582](#33582)) ([fe51343](fe51343))
* asset repair link ([bc55f44](bc55f44))
* asset value in fixed asset register ([#33608](#33608)) ([4d2497f](4d2497f))
* attribute error while submitting Repost PLE ([0431a57](0431a57))
* better comparision of difference value between stock and account ([5869fcb](5869fcb))
* minor filter issue while reconciliation tool from bench console ([bddf330](bddf330))
* Missing constructor args in Bank Reco Tool ([#33705](#33705)) ([f88c8c4](f88c8c4))
* only group similar items in print format if group_same_items is checked in pick list (backport [#33627](#33627)) ([#33630](#33630)) ([28f2d35](28f2d35))
* patch item_reposting_for_incorrect_sl_and_gl ([1928195](1928195))
* Rate from LDC in TDS reports (backport [#33699](#33699)) ([#33700](#33700)) ([9fa4c1a](9fa4c1a))
* Return against internal purchase invoice (backport [#33635](#33635)) ([#33658](#33658)) ([35fbd67](35fbd67))
* Sales ORder Connections on Material Request ([8a04031](8a04031))
* Updating SO throws ordered_qty not allowed to change after submission ([f915c18](f915c18))
* zero rm-cost in SCR ([2dfbc6e](2dfbc6e))

### Features

* Date filters on bank reconciliation tool ([#33271](#33271)) ([91b08f1](91b08f1))
* provision to select date type based on filter ([4d65d6f](4d65d6f))

### Performance Improvements

* improve reconciliation speed on JE's with 1000's of rows ([8a498ed](8a498ed))

### Reverts

* Reverting changes done on 33495 ([#33662](#33662)) ([23b9f66](23b9f66))
developmentforpeople pushed a commit to Ayuda-Efectiva/erpnext that referenced this pull request Jan 26, 2023
@mergify @phot0n @developmentforpeople
fix: only group similar items in print format if group_same_items is …
a459f41 
…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
@frappe-bot @developmentforpeople
chore(release): Bumped to Version 13.43.2
cc65328 
## [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
@mergify @phot0n @SaiFi0102
fix: only group similar items in print format if group_same_items is …
6db2afa 
…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
@frappe-bot @SaiFi0102
chore(release): Bumped to Version 13.43.2
3597ef0 
## [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))
@barredterra barredterra mentioned this pull request Mar 7, 2023
Closed
BevanTony1 pushed a commit to BevanTony1/eso-erpnext that referenced this pull request Mar 23, 2023
@frappe-bot @BevanTony1
chore(release): Bumped to Version 13.43.2
cf628dd 
## [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))
@ankush ankush mentioned this pull request Oct 20, 2023
Closed
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@s-aga-r s-aga-r s-aga-r approved these changes

@rohitwaghchaure rohitwaghchaure Awaiting requested review from rohitwaghchaure rohitwaghchaure is a code owner

Assignees
No one assigned
Labels
backport version-13-hotfix backport version-14-hotfix backport to version 14 squash Meant to tell reviewers that this PR should be squashed into a single commit while merging.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@phot0n @s-aga-r