diff --git a/erpnext/__init__.py b/erpnext/__init__.py index cb3af762b04..6137307f21a 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '12.4.1' +__version__ = '12.4.2' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 512bcf9f4fb..8870d75e39a 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -968,7 +968,7 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ qty: function(doc, cdt, cdn) { let item = frappe.get_doc(cdt, cdn); - this.conversion_factor(doc, cdt, cdn, false); + this.conversion_factor(doc, cdt, cdn, true); this.apply_pricing_rule(item, true); },