fix: Customer, Supplier heatmap data not rendering #28553

shariquerik · 2021-11-24T16:27:48Z

Caused by #27302

Issue:
The data of heatmap for customer and supplier is not rendered.

Reason:
To get the timeline_data to display on heatmap get_timeline_data method should be in the customer.py and supplier.py
which was removed since it was considered an unused import.

Before:

After:

To test this, test with any Customer or Supplier with some transaction history.

shariquerik · 2021-11-24T16:29:26Z

pre-commit isort will not allow this, suggest how to bypass it? or any better solution

def get_timeline_data(self):
	return get_timeline_data

can this be considered as a better solution?

ChillarAnand · 2021-11-25T03:03:39Z

To ignore any line, you can add # noqa and it should ignore it.

from erpnext.accounts.party import get_dashboard_info, validate_party_accounts, get_timeline_data  # noqa

shariquerik · 2021-11-25T05:34:06Z

To ignore any line, you can add # noqa and it should ignore it.
from erpnext.accounts.party import get_dashboard_info, validate_party_accounts, get_timeline_data  # noqa

Still failing

ChillarAnand · 2021-11-25T05:49:56Z

from erpnext.accounts.party import (  # noqa
	get_dashboard_info,
	get_timeline_data,
	validate_party_accounts,
)

This seems to be working. Can you try this?

codecov · 2021-11-25T05:53:31Z

Codecov Report

Merging #28553 (e57264e) into develop (9c913c9) will decrease coverage by 0.09%.
The diff coverage is 100.00%.

@@             Coverage Diff             @@
##           develop   #28553      +/-   ##
===========================================
- Coverage    55.26%   55.17%   -0.10%     
===========================================
  Files         1119     1119              
  Lines        66672    66672              
===========================================
- Hits         36847    36784      -63     
- Misses       29825    29888      +63

Impacted Files	Coverage Δ
erpnext/buying/doctype/supplier/supplier.py	`63.54% <100.00%> (ø)`
erpnext/selling/doctype/customer/customer.py	`68.82% <100.00%> (ø)`
...eport/item_variant_details/item_variant_details.py	`31.32% <0.00%> (-53.02%)`	⬇️
...tch_item_expiry_status/batch_item_expiry_status.py	`69.23% <0.00%> (-25.00%)`	⬇️
...payroll/doctype/income_tax_slab/income_tax_slab.py	`83.33% <0.00%> (-16.67%)`	⬇️
...t/payroll/doctype/payroll_period/payroll_period.py	`64.81% <0.00%> (-5.56%)`	⬇️
erpnext/education/doctype/student/student.py	`73.68% <0.00%> (-3.16%)`	⬇️
...xt/stock/report/stock_analytics/stock_analytics.py	`91.08% <0.00%> (-2.98%)`	⬇️
...value/warehouse_wise_item_balance_age_and_value.py	`92.40% <0.00%> (-2.54%)`	⬇️
erpnext/stock/report/stock_ageing/stock_ageing.py	`87.59% <0.00%> (-2.19%)`	⬇️
... and 19 more

shariquerik · 2021-11-25T06:12:07Z

@ChillarAnand I found this

it is more descriptive

shariquerik · 2021-11-25T06:17:19Z

@ChillarAnand still failing
will try this

from erpnext.accounts.party import (  # noqa
	get_dashboard_info,
	get_timeline_data,
	validate_party_accounts,
)

* fix: adding get_timeline_data import on supplier.py, customer.py (cherry picked from commit 2a5f663)

* fix: adding get_timeline_data import on supplier.py, customer.py (cherry picked from commit 2a5f663) Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>

* fix: adding get_timeline_data import on supplier.py, customer.py

…8553)

* 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: adding get_timeline_data import on supplier.py, customer.py

df6dd22

shariquerik requested review from ankush, deepeshgarg007, marination, nextchamp-saqib and rohitwaghchaure as code owners November 24, 2021 16:27

shariquerik requested a review from ChillarAnand November 24, 2021 16:28

fix: ignore linter

81f13f5

fix: ignore linter

57088b4

ChillarAnand previously approved these changes Nov 25, 2021

View reviewed changes

fix: ignore linter

1f6ef6d

shariquerik dismissed ChillarAnand’s stale review via 1f6ef6d November 25, 2021 06:19

fix: ignore linter

632e063

shariquerik self-assigned this Nov 25, 2021

shariquerik requested a review from ChillarAnand November 26, 2021 05:35

ChillarAnand approved these changes Nov 26, 2021

View reviewed changes

shariquerik added 2 commits November 26, 2021 11:48

Merge branch 'develop' into heatmap-data-not-rendering

283f4bb

Merge branch 'develop' into heatmap-data-not-rendering

e57264e

ankush merged commit 2a5f663 into frappe:develop Nov 26, 2021

ankush added the backport version-13-hotfix label Nov 26, 2021

mergify bot mentioned this pull request Nov 26, 2021

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

Merged

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

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

510f7d6

* fix: adding get_timeline_data import on supplier.py, customer.py (cherry picked from commit 2a5f663)

rohitwaghchaure mentioned this pull request Dec 5, 2021

chore: change log for v13.16.0 #28737

Merged

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

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

fa91292

* fix: adding get_timeline_data import on supplier.py, customer.py

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

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

c3a0802

* fix: adding get_timeline_data import on supplier.py, customer.py

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

fix: Customer, Supplier heatmap data not rendering (backport frappe#2…

eabd6d1

…8553)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Customer, Supplier heatmap data not rendering #28553

fix: Customer, Supplier heatmap data not rendering #28553

shariquerik commented Nov 24, 2021 •

edited

shariquerik commented Nov 24, 2021 •

edited

ChillarAnand commented Nov 25, 2021

shariquerik commented Nov 25, 2021

ChillarAnand commented Nov 25, 2021

codecov bot commented Nov 25, 2021 •

edited

shariquerik commented Nov 25, 2021 •

edited

shariquerik commented Nov 25, 2021 •

edited

fix: Customer, Supplier heatmap data not rendering #28553

fix: Customer, Supplier heatmap data not rendering #28553

Conversation

shariquerik commented Nov 24, 2021 • edited

shariquerik commented Nov 24, 2021 • edited

ChillarAnand commented Nov 25, 2021

shariquerik commented Nov 25, 2021

ChillarAnand commented Nov 25, 2021

codecov bot commented Nov 25, 2021 • edited

Codecov Report

shariquerik commented Nov 25, 2021 • edited

shariquerik commented Nov 25, 2021 • edited

shariquerik commented Nov 24, 2021 •

edited

shariquerik commented Nov 24, 2021 •

edited

codecov bot commented Nov 25, 2021 •

edited

shariquerik commented Nov 25, 2021 •

edited

shariquerik commented Nov 25, 2021 •

edited