diff --git a/erpnext/venue/doctype/item_booking/item_booking.py b/erpnext/venue/doctype/item_booking/item_booking.py index d5c526e5b75f737d568a6e4271a859b41b515569..53f9a51a0bc3b306691d9f837e3c052e4304f297 100644 --- a/erpnext/venue/doctype/item_booking/item_booking.py +++ b/erpnext/venue/doctype/item_booking/item_booking.py @@ -1220,8 +1220,8 @@ def get_item_calendar(item: str | None = None, uom: str | None = None) -> "item_ return {"type": "Daily", "calendar": [], "name": None} -def get_uom_in_minutes(uom=None): - minute_uom = frappe.db.get_single_value("Venue Settings", "minute_uom") +def get_uom_in_minutes(uom=None, minute_uom=None): + minute_uom = minute_uom or frappe.db.get_single_value("Venue Settings", "minute_uom") if uom == minute_uom: return 1 diff --git a/erpnext/venue/doctype/venue_settings/venue_settings.js b/erpnext/venue/doctype/venue_settings/venue_settings.js index afa5e2d9f2c8f8924c435bb225f175637dd80eed..b9edb3e8f897d9ec7723a11ccff275ef0320c20e 100644 --- a/erpnext/venue/doctype/venue_settings/venue_settings.js +++ b/erpnext/venue/doctype/venue_settings/venue_settings.js @@ -66,7 +66,9 @@ frappe.ui.form.on('Venue Units of Measure', { minute_uom: frm.doc.minute_uom } }).then(r => { - frappe.model.set_value(cdt, cdn, "duration", r.message); + if (r.message) { + frappe.model.set_value(cdt, cdn, "duration", r.message); + } }) } } diff --git a/erpnext/venue/doctype/venue_settings/venue_settings.py b/erpnext/venue/doctype/venue_settings/venue_settings.py index ba59a1963afe0897769b911dc43fda3e2153491d..acdfbcf6cb45a1fc0d3a5f8c504d2fbdfabe1f15 100644 --- a/erpnext/venue/doctype/venue_settings/venue_settings.py +++ b/erpnext/venue/doctype/venue_settings/venue_settings.py @@ -73,9 +73,9 @@ def create_role_profile_fields(): @frappe.whitelist() def get_duration_for_uom(uom, minute_uom): - return ( - frappe.db.get_value("UOM Conversion Factor", dict(from_uom=uom, to_uom=minute_uom), "value") * 60 - ) + from erpnext.venue.doctype.item_booking.item_booking import get_uom_in_minutes + + return get_uom_in_minutes(uom, minute_uom) * 60 @frappe.whitelist()