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: Remove RM Cost column as cost is not retrievable from Job card #28123

Merged
merged 5 commits into from
Nov 25, 2021

Conversation

marination
Copy link
Collaborator

@marination marination commented Oct 28, 2021

Issue:

  • In Report Cost of Poor Quality (for corrective Job Cards):
    pymysql.err.OperationalError: (1054, "Unknown column 'amount' in 'field list'")
  • This is because the Raw Material Cost column tries to fetch amount from a non-existent 'amount' field in Job card Item [This field was added and removed in the same PR, it did not historically exist]
  • To fix this we could add the amount field that computes amount = rate * required_qty. These values can be fetched from the Work Order required items table.
  • But Job Card Item is an editable table, users can add new items which will not have links to Work Order. These coukd not have a warehouse too, which makes it very hard to fetch the rate of the item.

Fix:

  • Removed the Raw Material Cost column, until a better solution is available.
    Screenshot 2021-10-28 at 4 51 57 PM

@marination
Copy link
Collaborator Author

marination commented Oct 28, 2021

@rohitwaghchaure Removing the column because this seems like it was broken from the time it was introduced, so no damage to existing users
2330c41#diff-8246f3f0e05ee19a9ff76a5486f898857f0dfb5ab77d91c66c49c24dc1b4cc1dR20

@codecov
Copy link

codecov bot commented Oct 28, 2021

Codecov Report

Merging #28123 (ffdf32b) into develop (8d2abc4) will decrease coverage by 0.01%.
The diff coverage is n/a.

@@             Coverage Diff             @@
##           develop   #28123      +/-   ##
===========================================
- Coverage    55.30%   55.29%   -0.02%     
===========================================
  Files         1119     1119              
  Lines        66636    66631       -5     
===========================================
- Hits         36855    36842      -13     
- Misses       29781    29789       +8     
Impacted Files Coverage Δ
...poor_quality_report/cost_of_poor_quality_report.py 53.33% <ø> (+4.76%) ⬆️
...wise_balance_history/batch_wise_balance_history.py 68.96% <0.00%> (-22.42%) ⬇️
erpnext/education/doctype/student/student.py 73.68% <0.00%> (-3.16%) ⬇️
...ion/doctype/course_enrollment/course_enrollment.py 44.00% <0.00%> (-2.00%) ⬇️
.../report/stock_projected_qty/stock_projected_qty.py 88.15% <0.00%> (-1.32%) ⬇️
erpnext/accounts/deferred_revenue.py 75.11% <0.00%> (-0.89%) ⬇️
...ype/account/chart_of_accounts/chart_of_accounts.py 77.24% <0.00%> (-0.69%) ⬇️
...next/accounts/doctype/subscription/subscription.py 81.74% <0.00%> (-0.57%) ⬇️
erpnext/accounts/doctype/pricing_rule/utils.py 70.02% <0.00%> (-0.54%) ⬇️
.../report/accounts_receivable/accounts_receivable.py 67.83% <0.00%> (-0.44%) ⬇️
... and 10 more

@marination marination changed the title fix: Remove RM Cost column as cost is not retrievable from Job card fix: [WIP] Remove RM Cost column as cost is not retrievable from Job card Oct 28, 2021
@stale
Copy link

stale bot commented Nov 12, 2021

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within a week 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 Nov 12, 2021
@stale stale bot closed this Nov 15, 2021
@marination marination reopened this Nov 16, 2021
@stale stale bot removed the inactive label Nov 16, 2021
@marination marination changed the title fix: [WIP] Remove RM Cost column as cost is not retrievable from Job card fix: Remove RM Cost column as cost is not retrievable from Job card Nov 25, 2021
@marination marination merged commit a369094 into frappe:develop Nov 25, 2021
@marination
Copy link
Collaborator Author

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Nov 25, 2021

backport version-13-hotfix

✅ Backports have been created

marination added a commit that referenced this pull request Nov 25, 2021
…-28123

fix: Remove RM Cost column as cost is not retrievable from Job card (backport #28123)
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant