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: Blanket Order Ordered Quantity #39725

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Conversation

s-aga-r
Copy link
Contributor

@s-aga-r s-aga-r commented Feb 5, 2024

Issues:

  • Blanket Order didn't get copied to duplicated PO.
  • Ordered Quantity didn't get updated on PO Close/Open.

Copy link

codecov bot commented Feb 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (617d923) 60.13% compared to head (fc0f965) 60.13%.
Report is 11 commits behind head on develop.

❗ Current head fc0f965 differs from pull request most recent head 27d6c8b. Consider uploading reports for the commit 27d6c8b to get more accurate results

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #39725   +/-   ##
========================================
  Coverage    60.13%   60.13%           
========================================
  Files          758      758           
  Lines        70978    71002   +24     
========================================
+ Hits         42680    42697   +17     
- Misses       28298    28305    +7     
Files Coverage Δ
...xt/buying/doctype/purchase_order/purchase_order.py 60.78% <100.00%> (+0.08%) ⬆️

... and 6 files with indirect coverage changes

@s-aga-r s-aga-r marked this pull request as ready for review February 5, 2024 10:37
@s-aga-r s-aga-r merged commit 3b671d5 into frappe:develop Feb 5, 2024
11 of 12 checks passed
s-aga-r added a commit that referenced this pull request Feb 5, 2024
* fix: disable no-copy for blanket order in PO

(cherry picked from commit 5ce5c35)

* fix: update BO Ordered Quantity on PO Close/Open

(cherry picked from commit 61ded69)

* test: BO on PO Close/Open

(cherry picked from commit 27d6c8b)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
s-aga-r added a commit that referenced this pull request Feb 5, 2024
* fix: disable no-copy for blanket order in PO

(cherry picked from commit 5ce5c35)

# Conflicts:
#	erpnext/buying/doctype/purchase_order_item/purchase_order_item.json

* fix: update BO Ordered Quantity on PO Close/Open

(cherry picked from commit 61ded69)

# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.py

* test: BO on PO Close/Open

(cherry picked from commit 27d6c8b)

* chore: `conflicts`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
frappe-pr-bot pushed a commit that referenced this pull request Feb 6, 2024
# [14.62.0](v14.61.4...v14.62.0) (2024-02-06)

### Bug Fixes

* Blanket Order Ordered Quantity (backport [#39725](#39725)) ([#39738](#39738)) ([44c09de](44c09de))
* correctly calculate diff amount for included taxes ([#39655](#39655)) ([350b2cd](350b2cd))
* don't overwrite existing terms in transaction ([#39519](#39519)) ([e49f8d5](e49f8d5))
* Exchange rate on MR to PO creation for muticurrency POs ([#39646](#39646)) ([4dc5d9a](4dc5d9a))
* incorrect landed cost voucher amount ([4a609d8](4a609d8))
* remove applied pricing rule on qty change (backport [#39688](#39688)) ([#39736](#39736)) ([46ac4f4](46ac4f4))
* show warehouse title field in sales docs (backport [#39746](#39746)) ([#39754](#39754)) ([a6067c6](a6067c6))

### Features

* copy emails from lead to customer ([#38647](#38647)) ([7952bf4](7952bf4))
* New financial views - Growth and margin views for P&L and balance sheet (backport [#39588](#39588)) ([#39601](#39601)) ([3808ddb](3808ddb))

### Performance Improvements

* memory consumption for the stock balance report ([#39626](#39626)) ([b32848d](b32848d))
* Move dimension validation out of GL Entry doctype ([#39730](#39730)) ([7691256](7691256))
* timeout for auto material request through reorder level ([85e6b39](85e6b39))
* timeout while submitting the purchase receipt entry ([a1a70bb](a1a70bb))

### Reverts

* Revert "feat: New financial views - Growth and margin views for P&L and balance sheet (#39588)"  ([f01308b](f01308b)), closes [#39588](#39588)
frappe-pr-bot pushed a commit that referenced this pull request Feb 6, 2024
# [15.12.0](v15.11.1...v15.12.0) (2024-02-06)

### Bug Fixes

* Blanket Order Ordered Quantity (backport [#39725](#39725)) ([#39739](#39739)) ([b126720](b126720))
* conditionally display show btn setting ([e931432](e931432))
* correctly calculate diff amount for included taxes ([#39655](#39655)) ([7f4cd3c](7f4cd3c))
* do not throw validation for cancelled sle ([02f56ee](02f56ee))
* don't overwrite existing terms in transaction ([dcdd3e8](dcdd3e8))
* Exchange rate on MR to PO creation for muticurrency POs ([#39646](#39646)) ([29eb090](29eb090))
* fetch/change tax template on basis of base_net_rate instead of net_rate ([#39448](#39448)) ([d7c7748](d7c7748))
* incorrect landed cost voucher amount ([a40864d](a40864d))
* out of range for valuation_rate column in SE (backport [#39687](#39687)) ([#39691](#39691)) ([41e4632](41e4632))
* Percentage handling in queries ([#39692](#39692)) ([e76f598](e76f598))
* **portal:** show PO pay button if payments installed ([cea4ed6](cea4ed6))
* Pricing rule application/removal on qty change ([#39084](#39084)) ([f310707](f310707))
* production plan date filters for orders (backport [#39702](#39702)) ([#39720](#39720)) ([3eac436](3eac436))
* remove applied pricing rule on qty change (backport [#39688](#39688)) ([#39737](#39737)) ([f246684](f246684))
* remove file from the disk after the completion of reposting ([b582e9c](b582e9c))
* show warehouse title field in sales docs (backport [#39746](#39746)) ([#39755](#39755)) ([53992de](53992de))
* update company in serial no doc (backport [#39733](#39733)) ([#39747](#39747)) ([00e86bf](00e86bf))
* use old serial / batch fields to make serial batch bundle ([282c19e](282c19e))
* **work order:** resolve type error during job card creation (backport [#39713](#39713)) ([#39714](#39714)) ([5fe40ac](5fe40ac))

### Features

* copy emails from lead to customer ([#38647](#38647)) ([986273b](986273b))
* make material request for job card from workstation dashboard ([3bef12c](3bef12c))
* Period-wise closing entries for TB ([#39712](#39712)) ([1822325](1822325))
* reference for POS SI payments ([#39523](#39523)) ([4ee8cf3](4ee8cf3))
* visual plant floor ([75bd1e6](75bd1e6))

### Performance Improvements

* memory consumption for the stock balance report ([#39626](#39626)) ([5e29aab](5e29aab))
* Move dimension validation out of GL Entry doctype ([#39730](#39730)) ([451c288](451c288))
* timeout for auto material request through reorder level ([1b2831b](1b2831b))
* timeout while submitting the purchase receipt entry ([55a8326](55a8326))
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant