merge #1

Merged
christian merged 2 commits from develop into version-14 2023-09-07 08:32:17 +02:00
3 changed files with 15 additions and 9 deletions
Showing only changes of commit ea83e3e1ac - Show all commits

View File

@@ -1,2 +1,2 @@
__version__ = '14.1.0' __version__ = '14.38.0'

View File

@@ -2,9 +2,9 @@ import frappe
from functools import reduce from functools import reduce
from datetime import date from datetime import date
# frappe.utils.logger.set_log_level("DEBUG") frappe.utils.logger.set_log_level("DEBUG")
# logger = frappe.logger("manufacturing_overview", logger = frappe.logger("manufacturing_overview",
# allow_site=True, file_count=10000) allow_site=True, file_count=10000)
def getDueInDays(d): def getDueInDays(d):
@@ -33,7 +33,8 @@ def shortenCustomerName(customer):
return customer return customer
def generateProductionOverviewCache(): def generateProductionOverviewCacheData():
logger.debug(f"Generating")
salesOrderItems = frappe.db.sql( salesOrderItems = frappe.db.sql(
""" """
SELECT SELECT
@@ -78,7 +79,7 @@ def generateProductionOverviewCache():
soItem.qty = soItem.qty - soItem.delivered_qty soItem.qty = soItem.qty - soItem.delivered_qty
soItem.link = '/app/sales-order/' + soItem.parent soItem.link = '/app/sales-order/' + soItem.parent
frappe.cache().set_value("production_overview", salesOrderItems) return salesOrderItems
def calculateCurrentWarehouseQty(item_code, qty, currentWarehouseQtyList): def calculateCurrentWarehouseQty(item_code, qty, currentWarehouseQtyList):
@@ -117,7 +118,12 @@ def calculateStatus(item):
@frappe.whitelist() @frappe.whitelist()
def getSalesorderOverviewList(): def getSalesorderOverviewList():
salesOrderItems = frappe.cache().get_value( logger.debug(f"Fetching Cache")
"production_overview", generateProductionOverviewCache()) salesOrderItems = frappe.cache().get_value('production_overview')
if salesOrderItems is None:
logger.debug(f"Cache not found")
salesOrderItems = generateProductionOverviewCacheData()
frappe.cache().set_value('production_overview', salesOrderItems, expires_in_sec=120)
return salesOrderItems return salesOrderItems

View File

@@ -58,7 +58,7 @@ export default {
}, },
created() { created() {
this.fetchEventsList(); this.fetchEventsList();
this.timer = setInterval(this.fetchEventsList, 30000); this.timer = setInterval(this.fetchEventsList, 60000);
}, },
methods: { methods: {
fetchEventsList() { fetchEventsList() {