fix: added job_card_item link in material request #28222

noahjacob · 2021-11-03T09:50:29Z

Issue

When trying to create a Material Transfer using the workflow Job Card > Material Request > Material Transfer, the
"Transferred Qty" is not updated in the Job Card Item.
Material Request does not have any field that can store the Job Card Item reference. Hence when creating the Material Transfer via Material Request the reference is empty.

Changes

Added a Job Card Item reference in Material Request Item too.
Updated mapping for Job Card > Material Request & Material Request > Material Transfer.

codecov · 2021-11-03T10:14:44Z

Codecov Report

Merging #28222 (7a7c3fb) into develop (a5902fa) will decrease coverage by 0.08%.
The diff coverage is n/a.

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

@@             Coverage Diff             @@
##           develop   #28222      +/-   ##
===========================================
- Coverage    55.45%   55.37%   -0.09%     
===========================================
  Files         1248     1248              
  Lines        67756    67756              
===========================================
- Hits         37577    37521      -56     
- Misses       30179    30235      +56

Impacted Files	Coverage Δ
erpnext/manufacturing/doctype/job_card/job_card.py	`64.45% <ø> (ø)`
...stock/doctype/material_request/material_request.py	`70.32% <ø> (ø)`
erpnext/utilities/product.py	`15.94% <0.00%> (-34.79%)`	⬇️
...tch_item_expiry_status/batch_item_expiry_status.py	`69.81% <0.00%> (-24.53%)`	⬇️
erpnext/shopping_cart/product_info.py	`32.35% <0.00%> (-20.59%)`	⬇️
...ctype/woocommerce_settings/woocommerce_settings.py	`80.39% <0.00%> (-3.93%)`	⬇️
...xt/stock/report/stock_analytics/stock_analytics.py	`91.08% <0.00%> (-2.98%)`	⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py	`87.76% <0.00%> (-2.88%)`	⬇️
.../report/stock_projected_qty/stock_projected_qty.py	`87.01% <0.00%> (-2.60%)`	⬇️
...value/warehouse_wise_item_balance_age_and_value.py	`92.59% <0.00%> (-2.47%)`	⬇️
... and 22 more

erpnext/stock/doctype/material_request_item/material_request_item.json

* fix: added job_card_item links in material request * fix: add no copy to row references (cherry picked from commit cb064b0)

* fix: added job_card_item links in material request * fix: add no copy to row references (cherry picked from commit cb064b0) Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>

* fix: added job_card_item links in material request * fix: add no copy to row references

)

* 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>

* 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>

* 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>

fix: added job_card_item links in material request

7a7c3fb

noahjacob requested review from ankush, marination and rohitwaghchaure as code owners November 3, 2021 09:50

noahjacob changed the title ~~fix: added job_card_item links in material request~~ fix: added job_card_item link in material request Nov 3, 2021

ankush reviewed Nov 3, 2021

View reviewed changes

erpnext/stock/doctype/material_request_item/material_request_item.json Show resolved Hide resolved

fix: add no copy to row references

f99afec

ankush previously approved these changes Nov 3, 2021

View reviewed changes

Merge branch 'develop' into job_card_item_link

ccdfd04

ankush dismissed their stale review via ccdfd04 November 3, 2021 11:47

ankush enabled auto-merge (squash) November 3, 2021 11:47

ankush approved these changes Nov 3, 2021

View reviewed changes

ankush merged commit cb064b0 into frappe:develop Nov 3, 2021

noahjacob added the backport version-13-hotfix label Nov 17, 2021

mergify bot mentioned this pull request Nov 17, 2021

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

Merged

mergify bot pushed a commit that referenced this pull request Nov 17, 2021

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

27e1e60

* fix: added job_card_item links in material request * fix: add no copy to row references (cherry picked from commit cb064b0)

noahjacob added the backport version-13-pre-release label Nov 17, 2021

mergify bot pushed a commit that referenced this pull request Nov 17, 2021

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

9cea404

* fix: added job_card_item links in material request * fix: add no copy to row references (cherry picked from commit cb064b0)

mergify bot mentioned this pull request Nov 17, 2021

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

Merged

rohitwaghchaure mentioned this pull request Dec 5, 2021

chore: change log for v13.16.0 #28737

Merged

commit-lint bot mentioned this pull request Dec 6, 2021

Merge from upstream v13 ParsimonyGit/erpnext#46

Merged

conncampbell pushed a commit to conncampbell/erpnext that referenced this pull request Jan 9, 2022

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

5a66a67

* fix: added job_card_item links in material request * fix: add no copy to row references

fproldan added a commit to fproldan/erpnext that referenced this pull request Oct 7, 2022

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

d5bb2c4

)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: added job_card_item link in material request #28222

fix: added job_card_item link in material request #28222

noahjacob commented Nov 3, 2021 •

edited

codecov bot commented Nov 3, 2021 •

edited

fix: added job_card_item link in material request #28222

fix: added job_card_item link in material request #28222

Conversation

noahjacob commented Nov 3, 2021 • edited

Issue

Changes

codecov bot commented Nov 3, 2021 • edited

Codecov Report

noahjacob commented Nov 3, 2021 •

edited

codecov bot commented Nov 3, 2021 •

edited