diff --git a/erpnext/venue/doctype/booking_credit/booking_credit.py b/erpnext/venue/doctype/booking_credit/booking_credit.py index cd88354123931a40df12fb01bcafe2abcf2622ca..a628e5c64e3e219732b895020dc88aaa4cfed428 100644 --- a/erpnext/venue/doctype/booking_credit/booking_credit.py +++ b/erpnext/venue/doctype/booking_credit/booking_credit.py @@ -305,9 +305,9 @@ def get_booking_credits_for_customer(customer, booking_credit_type=None, date=No return sum(frappe.db.get_all("Booking Credit", filters=filters, pluck="balance")) -def get_converted_qty(booking_credit_type, item): +def get_converted_qty(booking_credit_type, item, uom): return frappe.db.get_value( - "Booking Credit Type Conversions", {"parent": booking_credit_type, "item": item}, "credits" + "Booking Credit Type Conversions", {"parent": booking_credit_type, "item": item, "uom": uom}, "credits" ) diff --git a/erpnext/venue/doctype/booking_credit_usage/booking_credit_usage.py b/erpnext/venue/doctype/booking_credit_usage/booking_credit_usage.py index 7b92102e6fc157e66c8fe71c1fdd7d8d32f5e95f..cd547496437eb4fd9963d5eb03dc9535b53b7261 100644 --- a/erpnext/venue/doctype/booking_credit_usage/booking_credit_usage.py +++ b/erpnext/venue/doctype/booking_credit_usage/booking_credit_usage.py @@ -61,7 +61,7 @@ def add_booking_credit_usage(doc, method): bct = get_booking_credit_types_for_item(doc.item, doc.uom) for bc in bct: credits = get_booking_credits_for_customer(doc.party_name, bc) - quantity = get_converted_qty(bc, doc.item) + quantity = get_converted_qty(bc, doc.item, doc.uom) if credits and credits >= quantity: usage = frappe.get_doc( {