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

revert: Reverting changes done on 33495 #33662

Merged
merged 1 commit into from
Jan 16, 2023

Conversation

ruthra-kumar
Copy link
Member

This is causing issues in Drop ship creation. #33495 (comment)

@github-actions github-actions bot added needs-tests This PR needs automated unit-tests. stock labels Jan 15, 2023
'ordered_qty' will not be fetched from `tabBin`
@codecov
Copy link

codecov bot commented Jan 15, 2023

Codecov Report

Merging #33662 (4e76794) into develop (525f054) will increase coverage by 0.06%.
The diff coverage is n/a.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #33662      +/-   ##
===========================================
+ Coverage    64.08%   64.14%   +0.06%     
===========================================
  Files          818      819       +1     
  Lines        58879    59095     +216     
===========================================
+ Hits         37733    37909     +176     
- Misses       21146    21186      +40     
Impacted Files Coverage Δ
erpnext/stock/get_item_details.py 80.61% <ø> (+0.05%) ⬆️
...nk_reconciliation_tool/bank_reconciliation_tool.py 44.12% <0.00%> (-6.62%) ⬇️
...rpnext/assets/doctype/asset_repair/asset_repair.py 66.04% <0.00%> (-0.83%) ⬇️
erpnext/assets/doctype/asset/asset.py 81.48% <0.00%> (-0.77%) ⬇️
...e/subcontracting_receipt/subcontracting_receipt.py 91.89% <0.00%> (-0.25%) ⬇️
erpnext/stock/stock_ledger.py 90.24% <0.00%> (-0.04%) ⬇️
erpnext/stock/doctype/item/item.py 85.45% <0.00%> (ø)
erpnext/stock/doctype/stock_entry/stock_entry.py 82.64% <0.00%> (ø)
...xt/buying/doctype/purchase_order/purchase_order.py 78.27% <0.00%> (ø)
...eport/fixed_asset_register/fixed_asset_register.py 0.00% <0.00%> (ø)
... and 17 more

@s-aga-r
Copy link
Contributor

s-aga-r commented Jan 15, 2023

@deepeshgarg007 deepeshgarg007 merged commit be38205 into frappe:develop Jan 16, 2023
@ruthra-kumar
Copy link
Member Author

ruthra-kumar commented Jan 16, 2023

@ruthra-kumar #33617 (comment)

@s-aga-r
A dynamic ordered_qty will break Purchase Order creation from Sales Order as mentioned in the description. A safer approach(without using onload()) to load dynamic quantities(projected, actual, reserved ) is needed. But, even that approach shouldn't fetch ordered_qty.

@ruthra-kumar
Copy link
Member Author

@Mergifyio backport version-13-hotfix version-14-hotfix

mergify bot pushed a commit that referenced this pull request Jan 16, 2023
'ordered_qty' will not be fetched from `tabBin`

(cherry picked from commit be38205)
@mergify
Copy link
Contributor

mergify bot commented Jan 16, 2023

backport version-13-hotfix version-14-hotfix

✅ Backports have been created

mergify bot pushed a commit that referenced this pull request Jan 16, 2023
'ordered_qty' will not be fetched from `tabBin`

(cherry picked from commit be38205)
ruthra-kumar added a commit that referenced this pull request Jan 16, 2023
…-33662

revert: Reverting changes done on 33495 (backport #33662)
ruthra-kumar added a commit that referenced this pull request Jan 16, 2023
…-33662

revert: Reverting changes done on 33495 (backport #33662)
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 pushed a commit that referenced this pull request Jan 17, 2023
# [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
'ordered_qty' will not be fetched from `tabBin`

(cherry picked from commit be38205)
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
'ordered_qty' will not be fetched from `tabBin`

(cherry picked from commit be38205)
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))
@barredterra barredterra mentioned this pull request Mar 7, 2023
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))
@ruthra-kumar ruthra-kumar deleted the revert_33495 branch June 14, 2023 16:05
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Feb 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs-tests This PR needs automated unit-tests. stock
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants