From 4856e750f96f3e135f2a9efffb309d1b4d72502f Mon Sep 17 00:00:00 2001 From: ruthra kumar Date: Thu, 1 Dec 2022 18:08:32 +0530 Subject: [PATCH 1/4] fix: type error on Sales Pipeline Analytics --- .../report/sales_pipeline_analytics/sales_pipeline_analytics.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py index d23a22ac46..dea3f2dd36 100644 --- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py +++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py @@ -217,7 +217,7 @@ class SalesPipelineAnalytics(object): def check_for_assigned_to(self, period, value, count_or_amount, assigned_to, info): if self.filters.get("assigned_to"): - for data in json.loads(info.get("opportunity_owner")): + for data in json.loads(info.get("opportunity_owner") or "[]"): if data == self.filters.get("assigned_to"): self.set_formatted_data(period, data, count_or_amount, assigned_to) else: From 3ce8386ca3d29b42e16ab6345e6659909ab34aaa Mon Sep 17 00:00:00 2001 From: s-aga-r Date: Thu, 1 Dec 2022 19:44:49 +0530 Subject: [PATCH 2/4] refactor: remove `balance` from `Warehouse Tree` --- erpnext/stock/doctype/warehouse/warehouse.py | 59 +------------------ .../stock/doctype/warehouse/warehouse_tree.js | 7 --- 2 files changed, 2 insertions(+), 64 deletions(-) diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py index 6e06d23617..430a8d17e0 100644 --- a/erpnext/stock/doctype/warehouse/warehouse.py +++ b/erpnext/stock/doctype/warehouse/warehouse.py @@ -2,12 +2,10 @@ # License: GNU General Public License v3. See license.txt -from collections import defaultdict - import frappe from frappe import _, throw from frappe.contacts.address_and_contact import load_address_and_contact -from frappe.utils import cint, flt +from frappe.utils import cint from frappe.utils.nestedset import NestedSet from pypika.terms import ExistsCriterion @@ -166,60 +164,7 @@ def get_children(doctype, parent=None, company=None, is_root=False): ["company", "in", (company, None, "")], ] - warehouses = frappe.get_list(doctype, fields=fields, filters=filters, order_by="name") - - company_currency = "" - if company: - company_currency = frappe.get_cached_value("Company", company, "default_currency") - - warehouse_wise_value = get_warehouse_wise_stock_value(company) - - # return warehouses - for wh in warehouses: - wh["balance"] = warehouse_wise_value.get(wh.value) - if company_currency: - wh["company_currency"] = company_currency - return warehouses - - -def get_warehouse_wise_stock_value(company): - warehouses = frappe.get_all( - "Warehouse", fields=["name", "parent_warehouse"], filters={"company": company} - ) - parent_warehouse = {d.name: d.parent_warehouse for d in warehouses} - - filters = {"warehouse": ("in", [data.name for data in warehouses])} - bin_data = frappe.get_all( - "Bin", - fields=["sum(stock_value) as stock_value", "warehouse"], - filters=filters, - group_by="warehouse", - ) - - warehouse_wise_stock_value = defaultdict(float) - for row in bin_data: - if not row.stock_value: - continue - - warehouse_wise_stock_value[row.warehouse] = row.stock_value - update_value_in_parent_warehouse( - warehouse_wise_stock_value, parent_warehouse, row.warehouse, row.stock_value - ) - - return warehouse_wise_stock_value - - -def update_value_in_parent_warehouse( - warehouse_wise_stock_value, parent_warehouse_dict, warehouse, stock_value -): - parent_warehouse = parent_warehouse_dict.get(warehouse) - if not parent_warehouse: - return - - warehouse_wise_stock_value[parent_warehouse] += flt(stock_value) - update_value_in_parent_warehouse( - warehouse_wise_stock_value, parent_warehouse_dict, parent_warehouse, stock_value - ) + return frappe.get_list(doctype, fields=fields, filters=filters, order_by="name") @frappe.whitelist() diff --git a/erpnext/stock/doctype/warehouse/warehouse_tree.js b/erpnext/stock/doctype/warehouse/warehouse_tree.js index e9e14c7246..eb635e6757 100644 --- a/erpnext/stock/doctype/warehouse/warehouse_tree.js +++ b/erpnext/stock/doctype/warehouse/warehouse_tree.js @@ -17,11 +17,4 @@ frappe.treeview_settings['Warehouse'] = { description: __("Child nodes can be only created under 'Group' type nodes")} ], ignore_fields:["parent_warehouse"], - onrender: function(node) { - if (node.data && node.data.balance!==undefined) { - $('' - + format_currency((node.data.balance), node.data.company_currency) - + '').insertBefore(node.$ul); - } - } } From 5949a7ecff0020bb07de586892cc5d1dec44b904 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 1 Dec 2022 15:59:42 +0530 Subject: [PATCH 3/4] fix: default clear repost logs --- erpnext/patches.txt | 1 + .../patches/v14_0/setup_clear_repost_logs.py | 8 ++++++ erpnext/setup/install.py | 8 ++++++ .../repost_item_valuation.py | 14 +++++++++++ .../test_repost_item_valuation.py | 25 +++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 erpnext/patches/v14_0/setup_clear_repost_logs.py diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 166faf9c18..0aad1d34e5 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -318,3 +318,4 @@ erpnext.patches.v13_0.update_schedule_type_in_loans erpnext.patches.v14_0.create_accounting_dimensions_for_asset_capitalization erpnext.patches.v14_0.update_partial_tds_fields erpnext.patches.v14_0.create_incoterms_and_migrate_shipment +erpnext.patches.v14_0.setup_clear_repost_logs \ No newline at end of file diff --git a/erpnext/patches/v14_0/setup_clear_repost_logs.py b/erpnext/patches/v14_0/setup_clear_repost_logs.py new file mode 100644 index 0000000000..be9ddcab7a --- /dev/null +++ b/erpnext/patches/v14_0/setup_clear_repost_logs.py @@ -0,0 +1,8 @@ +# Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors +# License: MIT. See LICENSE + +from erpnext.setup.install import setup_log_settings + + +def execute(): + setup_log_settings() diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py index d3b47f985d..1f7dddfb95 100644 --- a/erpnext/setup/install.py +++ b/erpnext/setup/install.py @@ -30,6 +30,7 @@ def after_install(): add_company_to_session_defaults() add_standard_navbar_items() add_app_name() + setup_log_settings() frappe.db.commit() @@ -197,3 +198,10 @@ def add_standard_navbar_items(): def add_app_name(): frappe.db.set_value("System Settings", None, "app_name", "ERPNext") + + +def setup_log_settings(): + log_settings = frappe.get_single("Log Settings") + log_settings.append("logs_to_clear", {"ref_doctype": "Repost Item Valuation", "days": 60}) + + log_settings.save(ignore_permissions=True) diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py index 8e914e6b80..bbed099da9 100644 --- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py @@ -5,6 +5,8 @@ import frappe from frappe import _ from frappe.exceptions import QueryDeadlockError, QueryTimeoutError from frappe.model.document import Document +from frappe.query_builder import DocType, Interval +from frappe.query_builder.functions import Now from frappe.utils import cint, get_link_to_form, get_weekday, getdate, now, nowtime from frappe.utils.user import get_users_with_role from rq.timeouts import JobTimeoutException @@ -21,6 +23,18 @@ RecoverableErrors = (JobTimeoutException, QueryDeadlockError, QueryTimeoutError) class RepostItemValuation(Document): + @staticmethod + def clear_old_logs(days=None): + days = days or 90 + table = DocType("Repost Item Valuation") + frappe.db.delete( + table, + filters=( + (table.modified < (Now() - Interval(days=days))) + & (table.status.isin(["Completed", "Skipped"])) + ), + ) + def validate(self): self.set_status(write=False) self.reset_field_values() diff --git a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py index f1667757a7..d212693bed 100644 --- a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py @@ -86,6 +86,31 @@ class TestRepostItemValuation(FrappeTestCase, StockTestMixin): msg=f"Exepcted false from : {case}", ) + def test_clear_old_logs(self): + # create 10 logs + for i in range(1, 20): + frappe.get_doc( + doctype="Repost Item Valuation", + item_code="_Test Item", + warehouse="_Test Warehouse - _TC", + based_on="Item and Warehouse", + creation=add_to_date(today(), days=-i * 10), + modified=add_to_date(today(), days=-i * 10), + posting_date=nowdate(), + status="Skipped", + posting_time="00:01:00", + ).insert(ignore_permissions=True) + + logs = frappe.get_all("Repost Item Valuation", filters={"status": "Skipped"}) + self.assertTrue(len(logs) > 10) + + from erpnext.stock.doctype.repost_item_valuation.repost_item_valuation import RepostItemValuation + + RepostItemValuation.clear_old_logs(days=1) + + logs = frappe.get_all("Repost Item Valuation", filters={"status": "Skipped"}) + self.assertTrue(len(logs) == 0) + def test_create_item_wise_repost_item_valuation_entries(self): pr = make_purchase_receipt( company="_Test Company with perpetual inventory", From 2cce6f2a340ba7d052b79b79fc676fb0c575b79c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Fri, 2 Dec 2022 10:58:32 +0530 Subject: [PATCH 4/4] fix: test case --- .../test_repost_item_valuation.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py index d212693bed..96ac4352dc 100644 --- a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py +++ b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py @@ -6,8 +6,7 @@ from unittest.mock import MagicMock, call import frappe from frappe.tests.utils import FrappeTestCase -from frappe.utils import nowdate -from frappe.utils.data import add_to_date, today +from frappe.utils import add_days, add_to_date, now, nowdate, today from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice from erpnext.accounts.utils import repost_gle_for_stock_vouchers @@ -89,18 +88,20 @@ class TestRepostItemValuation(FrappeTestCase, StockTestMixin): def test_clear_old_logs(self): # create 10 logs for i in range(1, 20): - frappe.get_doc( + repost_doc = frappe.get_doc( doctype="Repost Item Valuation", item_code="_Test Item", warehouse="_Test Warehouse - _TC", based_on="Item and Warehouse", - creation=add_to_date(today(), days=-i * 10), - modified=add_to_date(today(), days=-i * 10), posting_date=nowdate(), status="Skipped", posting_time="00:01:00", ).insert(ignore_permissions=True) + repost_doc.load_from_db() + repost_doc.modified = add_days(now(), days=-i * 10) + repost_doc.db_update_all() + logs = frappe.get_all("Repost Item Valuation", filters={"status": "Skipped"}) self.assertTrue(len(logs) > 10)