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: incorrect balance in "Warehouse Wise Item Balance and Age" report #28583

Merged
merged 1 commit into from
Nov 26, 2021

Conversation

noahjacob
Copy link
Contributor

Pre-requisite

  • Create a warehouse that is a substring of another warehouse.
  • I created a warehouse named "Progress - S" which is a substring of the "Work In Progress - S" warehouse.
Warehouses

image

image

Stock Balances

Work In Progress - S = 3107.00

Screenshot 2021-11-26 at 4 24 11 PM

Progress - S = 1003.00

Screenshot 2021-11-26 at 4 35 59 PM

Issue

  • When viewing the "Warehouse Wise Item Balance and Age" report, warehouses that are a substring of another warehouse would also have the qty values of other warehouses. Eg. In this case, Progress - S would display the sum of Progress - S + Work In Progress - S = 3107 + 1003 = 4110 instead of the expected value of 1003.

Screenshot 2021-11-26 at 4 41 15 PM

Fix

  • Updated condition if wh.name in warehouse else [0.00] to if wh.name == warehouse else [0.00]

After Fix

Screenshot 2021-11-26 at 4 47 26 PM

@noahjacob noahjacob changed the title fix: incorrect balance for warehouses fix: incorrect balance in "Warehouse Wise Item Balance and Age" report Nov 26, 2021
@codecov
Copy link

codecov bot commented Nov 26, 2021

Codecov Report

Merging #28583 (ec7e2d3) into develop (ca8dec0) will decrease coverage by 0.18%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #28583      +/-   ##
===========================================
- Coverage    55.36%   55.18%   -0.19%     
===========================================
  Files         1119     1120       +1     
  Lines        66673    66664       -9     
===========================================
- Hits         36915    36787     -128     
- Misses       29758    29877     +119     
Impacted Files Coverage Δ
...value/warehouse_wise_item_balance_age_and_value.py 92.40% <100.00%> (-2.54%) ⬇️
...eport/item_variant_details/item_variant_details.py 31.32% <0.00%> (-56.63%) ⬇️
...work_order_stock_report/work_order_stock_report.py 50.00% <0.00%> (-50.00%) ⬇️
erpnext/utilities/product.py 14.70% <0.00%> (-35.30%) ⬇️
erpnext/shopping_cart/product_info.py 30.30% <0.00%> (-21.22%) ⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py 89.05% <0.00%> (-4.38%) ⬇️
...ctype/woocommerce_settings/woocommerce_settings.py 80.00% <0.00%> (-4.00%) ⬇️
...xt/buying/doctype/purchase_order/purchase_order.py 78.30% <0.00%> (-3.39%) ⬇️
erpnext/stock/report/stock_ledger/stock_ledger.py 74.79% <0.00%> (-3.26%) ⬇️
erpnext/education/doctype/student/student.py 73.68% <0.00%> (-3.16%) ⬇️
... and 25 more

@ankush ankush merged commit 7ff30a4 into frappe:develop Nov 26, 2021
mergify bot pushed a commit that referenced this pull request Nov 26, 2021
mergify bot pushed a commit that referenced this pull request Nov 26, 2021
ankush pushed a commit that referenced this pull request Nov 26, 2021
(cherry picked from commit 7ff30a4)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
ankush pushed a commit that referenced this pull request Nov 26, 2021
(cherry picked from commit 7ff30a4)

Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022
fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 7, 2022
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Nov 17, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

# Conflicts:
#	erpnext/public/js/controllers/buying.js

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

# Conflicts:
#	erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
#	erpnext/public/js/controllers/transaction.js

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 13, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 13, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
fproldan added a commit to fproldan/erpnext that referenced this pull request Dec 13, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 15, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
ValentinaPruvost pushed a commit to fproldan/erpnext that referenced this pull request Dec 15, 2022
* feat: create party link from customer/supplier (backport frappe#28387)

* fix: Customer, Supplier heatmap data not rendering (backport frappe#28553)

* fix: Filter out cancelled and non-depreciable Assets in Asset Value Adjustment (backport frappe#28443)

* fix: allow creating Shift Assignment for same day (backport frappe#28613)

* fix: Taxes and Charges template not getting copied from Purchase Order/Receipt to Invoice

(cherry picked from commit 6a75e8d)

* fix: India utils code cleanup

(cherry picked from commit 56c626a)

* fix: dont requeue repost immediately and clear progress (backport frappe#28684)

* fix: Employee Advance paid amount not updated on PE cancellation (backport frappe#28572)

* fix: coa balance rendering bug (backport frappe#28468)

* fix(UX): combine_items checkbox to trigger get_items and sub_assembly button (backport frappe#28558)

* fix: added job_card_item link in material request (backport frappe#28222)

* fix: incorrect discount amount set when item is replaced (frappe#28556)

(cherry picked from commit c0cc72e)

* fix: cost center wise ledger posting for pcv (backport frappe#28477)

* fix(UX): Allocated Amount in Advances not updated on updating expense amount in Expense Claim (backport frappe#28497)

* fix: Employee link formatter showing incorrect value for Employee Name (backport frappe#28504)

* fix: Remove RM Cost column as cost is not retrievable from Job card (backport frappe#28123)

* fix: total stock summary UI glitch (backport frappe#28564)

* fix: (style) Warehouse Capacity Dashboard UI (backport frappe#28431)

* fix: incorrect balance in "Warehouse Wise Item Balance and Age" report (backport frappe#28583)

* refactor!: remove abbreviation renaming (backport frappe#27766)

* fix: POS Item cart only taxes with amount displayed (backport frappe#28501)

* refactor: (ux) Accepted/Rejected/Received Qty UX

(cherry picked from commit 5fb5a75)

* fix: Sider + Fields UX

- remove extra space (sider)
- PR: Bring rejected qty in grid view
- PI: Rename `Stock Qty` to `Accepted Qty in Stock UOM`
- PI: Move `Accepted Qty in Stock UOM` under Stock UOM

(cherry picked from commit afe1c45)

* test: Purchase Receipt Received Qty

(cherry picked from commit 05ec7cc)

* test: Purchase Invoice Received Qty

(cherry picked from commit e9c75d6)

* fix: Sider, Linter and Server Side Test

- Fix Server side PR test
- linter: re-arrange imports
- sider: avoid single line multi statement
- Code cleanup: Improve code readability and avoid horizontal scroll in test_purchase_receipt
- Removed unused variables in test_purchase_receipt

(cherry picked from commit 293f6cb)

* fix: Merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: (server test) Missing variable declaration

* refactor: item-wh wise reposting by default

(cherry picked from commit 6dc9b82)

* test: item-wh repost creation

(cherry picked from commit a36c249)

* refactor: reuse get_items_to_be_repost function

(cherry picked from commit d220e08)

* feat: option to select reposting method

In current implementation selecting Item-Warehouse based reposting is
better for few users, who don't use depenent SLEs but have frequent
transactions involving same items.

This change lets them switch to item-warehouse based reposting if
required.

Only use this if you understand technicalities of stock reposting. This
is experimental but will become mainstream in coming days.

(cherry picked from commit 45dd46b)

* perf: index for item-sh on repost item valuation

Item-WH based reposting requires querying existing similar repost.
Assuming there is only 1 max extra entry with same params just indexing
item-WH is sufficient to speed up the query.

(cherry picked from commit a5a8c91)

* fix: dont erase voucher_type and voucher_no for item_wh repost

kept for tracability.

(cherry picked from commit 1d3842f)

* perf: skip unnecessary item-wh reposts

Using basic idea that repost with older posting date will also take care
of subsequent posting dates...

When Item-WH reposts are queued:

1. If another repost with same item-wh but older posting date exists
    then skip current one.
2. If another repost with same item-wh but newer posting date exists
    then skip another one.

(cherry picked from commit 0d0e24a)

* test: item-wh deduplication in reposting

(cherry picked from commit 55631dd)

* refactor: deduplicate during repost background job

(cherry picked from commit ed94f0f)

* fix: ignore permissions while creating reposts

(cherry picked from commit 0a2964d)

* fix: Shipping Rule picking up old net_rate

(cherry picked from commit c78b8b7)

* fix: calling shipping rule method during net_total calculation in taxes_adn_totals.py

(cherry picked from commit 18ae03d)

* fix: check if shipping rule value exists

(cherry picked from commit af1fce0)

* fix: fixed tests, separated a  method for shipping charges

(cherry picked from commit a8e2c02)

* fix: sider issues

(cherry picked from commit e7b4204)

* fix: merge conflicts

* fix: fixes in work order doctype (backport frappe#28217)

* fix: abbr

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: marination <maricadsouza221197@gmail.com>
Co-authored-by: Ankush Menat <ankush@frappe.io>
Co-authored-by: Subin Tom <subintom2@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants