Merge pull request #33193 from rohitwaghchaure/clear-repost-logs
fix: clear repost logs using Log Settings
This commit is contained in:
commit
295ce0e8e9
@ -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.create_accounting_dimensions_for_asset_capitalization
|
||||||
erpnext.patches.v14_0.update_partial_tds_fields
|
erpnext.patches.v14_0.update_partial_tds_fields
|
||||||
erpnext.patches.v14_0.create_incoterms_and_migrate_shipment
|
erpnext.patches.v14_0.create_incoterms_and_migrate_shipment
|
||||||
|
erpnext.patches.v14_0.setup_clear_repost_logs
|
8
erpnext/patches/v14_0/setup_clear_repost_logs.py
Normal file
8
erpnext/patches/v14_0/setup_clear_repost_logs.py
Normal file
@ -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()
|
@ -30,6 +30,7 @@ def after_install():
|
|||||||
add_company_to_session_defaults()
|
add_company_to_session_defaults()
|
||||||
add_standard_navbar_items()
|
add_standard_navbar_items()
|
||||||
add_app_name()
|
add_app_name()
|
||||||
|
setup_log_settings()
|
||||||
frappe.db.commit()
|
frappe.db.commit()
|
||||||
|
|
||||||
|
|
||||||
@ -197,3 +198,10 @@ def add_standard_navbar_items():
|
|||||||
|
|
||||||
def add_app_name():
|
def add_app_name():
|
||||||
frappe.db.set_value("System Settings", None, "app_name", "ERPNext")
|
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)
|
||||||
|
@ -5,6 +5,8 @@ import frappe
|
|||||||
from frappe import _
|
from frappe import _
|
||||||
from frappe.exceptions import QueryDeadlockError, QueryTimeoutError
|
from frappe.exceptions import QueryDeadlockError, QueryTimeoutError
|
||||||
from frappe.model.document import Document
|
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 import cint, get_link_to_form, get_weekday, getdate, now, nowtime
|
||||||
from frappe.utils.user import get_users_with_role
|
from frappe.utils.user import get_users_with_role
|
||||||
from rq.timeouts import JobTimeoutException
|
from rq.timeouts import JobTimeoutException
|
||||||
@ -21,6 +23,18 @@ RecoverableErrors = (JobTimeoutException, QueryDeadlockError, QueryTimeoutError)
|
|||||||
|
|
||||||
|
|
||||||
class RepostItemValuation(Document):
|
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):
|
def validate(self):
|
||||||
self.set_status(write=False)
|
self.set_status(write=False)
|
||||||
self.reset_field_values()
|
self.reset_field_values()
|
||||||
|
@ -6,8 +6,7 @@ from unittest.mock import MagicMock, call
|
|||||||
|
|
||||||
import frappe
|
import frappe
|
||||||
from frappe.tests.utils import FrappeTestCase
|
from frappe.tests.utils import FrappeTestCase
|
||||||
from frappe.utils import nowdate
|
from frappe.utils import add_days, add_to_date, now, nowdate, today
|
||||||
from frappe.utils.data import add_to_date, today
|
|
||||||
|
|
||||||
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
|
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
|
||||||
from erpnext.accounts.utils import repost_gle_for_stock_vouchers
|
from erpnext.accounts.utils import repost_gle_for_stock_vouchers
|
||||||
@ -86,6 +85,33 @@ class TestRepostItemValuation(FrappeTestCase, StockTestMixin):
|
|||||||
msg=f"Exepcted false from : {case}",
|
msg=f"Exepcted false from : {case}",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_clear_old_logs(self):
|
||||||
|
# create 10 logs
|
||||||
|
for i in range(1, 20):
|
||||||
|
repost_doc = frappe.get_doc(
|
||||||
|
doctype="Repost Item Valuation",
|
||||||
|
item_code="_Test Item",
|
||||||
|
warehouse="_Test Warehouse - _TC",
|
||||||
|
based_on="Item and Warehouse",
|
||||||
|
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)
|
||||||
|
|
||||||
|
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):
|
def test_create_item_wise_repost_item_valuation_entries(self):
|
||||||
pr = make_purchase_receipt(
|
pr = make_purchase_receipt(
|
||||||
company="_Test Company with perpetual inventory",
|
company="_Test Company with perpetual inventory",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user