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: group item reorder by (warehouse, material_request_type) #35818

Merged
merged 6 commits into from
Jul 31, 2023

Conversation

dj12djdjs
Copy link
Collaborator

This allows you to reorder via purchase and transfer at the same time.
image

Use Case:
You order 10pc from supplier. Lead time is 2 weeks.
You have a primary warehouse containing majority of stock, you will get two material requests. You can transfer from main warehouse or wait for purchase.

@github-actions github-actions bot added the needs-tests This PR needs automated unit-tests. label Jun 20, 2023
@codecov
Copy link

codecov bot commented Jun 20, 2023

Codecov Report

Merging #35818 (24ac9b2) into develop (55d5469) will increase coverage by 0.00%.
Report is 224 commits behind head on develop.
The diff coverage is 100.00%.

❗ Current head 24ac9b2 differs from pull request most recent head 7d445dd. Consider uploading reports for the commit 7d445dd to get more accurate results

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #35818   +/-   ##
========================================
  Coverage    64.08%   64.08%           
========================================
  Files          783      783           
  Lines        60668    60668           
========================================
+ Hits         38878    38879    +1     
+ Misses       21790    21789    -1     
Files Changed Coverage Δ
erpnext/stock/doctype/item/item.py 85.66% <100.00%> (ø)

... and 1 file with indirect coverage changes

@stale
Copy link

stale bot commented Jul 13, 2023

This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Jul 13, 2023
@stale stale bot closed this Jul 16, 2023
@dj12djdjs dj12djdjs reopened this Jul 17, 2023
@stale stale bot removed the inactive label Jul 17, 2023
erpnext/stock/doctype/item/item.py Outdated Show resolved Hide resolved
@s-aga-r s-aga-r self-assigned this Jul 28, 2023
dj12djdjs and others added 2 commits July 28, 2023 09:33
Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
@s-aga-r s-aga-r added the backport version-14-hotfix backport to version 14 label Jul 31, 2023
@s-aga-r s-aga-r enabled auto-merge (squash) July 31, 2023 12:41
@s-aga-r s-aga-r merged commit e8eeeb1 into frappe:develop Jul 31, 2023
11 checks passed
mergify bot pushed a commit that referenced this pull request Jul 31, 2023
* fix: group item reorder by (warehouse, material_request_type)

* fix: update reorder error message

* chore: linter

* fix: correct error message

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit e8eeeb1)
s-aga-r pushed a commit that referenced this pull request Jul 31, 2023
#35818) (#36425)

fix: group item reorder by (warehouse, material_request_type) (#35818)

* fix: group item reorder by (warehouse, material_request_type)

* fix: update reorder error message

* chore: linter

* fix: correct error message

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>

* chore: linter

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
(cherry picked from commit e8eeeb1)

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Aug 1, 2023
# [14.33.0](v14.32.1...v14.33.0) (2023-08-01)

### Bug Fixes

* allow fully depreciated existing assets ([#36378](#36378)) ([43b85c5](43b85c5))
* change fieldtype from Currency to Float for the valuation rate in the stock report ([93bd4c7](93bd4c7))
* cost center filter for fetching payments ([c9daa85](c9daa85))
* Defined "Open" Status as default (backport [#36421](#36421)) ([#36424](#36424)) ([33a9477](33a9477))
* filter by cost center in trial balance ([02428b4](02428b4))
* german translations ([9c8e2a3](9c8e2a3))
* GL Entries should not be splitted based on cost center allocation in PCV ([ade13e6](ade13e6))
* group item reorder by (warehouse, material_request_type) (backport [#35818](#35818)) ([#36425](#36425)) ([516191b](516191b))
* Ignore account closing balance for financial statement ([800417e](800417e))
* in payment_entry 'Unallocated Amount' cal is broken ([#36369](#36369)) ([cd3b85c](cd3b85c))
* incorrect `idx` on JE's after reconciliation ([80eb875](80eb875))
* incorrect qty set in the serial no picker ([57b19a5](57b19a5))
* incorrect usage `get_cached_value` on single doctypes ([8f72a68](8f72a68))
* **Item Group:** allow root deletion ([1a6be5e](1a6be5e))
* job card suggest holiday as start date (backport [#35958](#35958)) ([#36423](#36423)) ([29ddd26](29ddd26))
* Job Card validation fixed when displaying total completed quantity ([7b3bcd3](7b3bcd3))
* multiple issues related to Production Plan (backport [#36377](#36377)) ([#36381](#36381)) ([a799e1b](a799e1b))
* not able to make material request (backport [#36416](#36416)) ([#36426](#36426)) ([99e7406](99e7406))
* only publish repost progress to doc subscriber (backport [#36400](#36400)) ([#36402](#36402)) ([32bdb7c](32bdb7c))
* overallocation validation misfire on normal invoices ([#36349](#36349)) ([09af485](09af485))
* paid_amount when the group is mode of payment ([50ef358](50ef358))
* process_owner is not link User (backport [#36420](#36420)) ([#36422](#36422)) ([289dc36](289dc36))
* removed "fetch_from" (backport [#36365](#36365)) ([#36386](#36386)) ([6d051f5](6d051f5))
* root type in account map for balance sheet ([#36303](#36303)) ([5b56296](5b56296))
* show invoices name instead of object address ([e802f0c](e802f0c))
* show tds & tcs separately ([619b0fe](619b0fe))
* test with None conditon in PE ([479cab0](479cab0))
* typo in loyalty program throw message ([#36432](#36432)) ([782a4d1](782a4d1))

### Features

* add party type filter ([32fea64](32fea64))

### Performance Improvements

* avoid full table scan in sle count check ([#36428](#36428)) ([04f9915](04f9915))
* move project status reminder to hourly (backport [#36372](#36372)) ([#36373](#36373)) ([4ac60cd](4ac60cd))
* use `LEFT JOIN` instead of `NOT EXISTS` (backport [#36221](#36221)) ([#36383](#36383)) ([26a0b3b](26a0b3b))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 12, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport version-14-hotfix backport to version 14 needs-tests This PR needs automated unit-tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants