Merge branch 'hotfix'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 1df3c7d..3eaf994 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.32'
+__version__ = '10.1.33'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py b/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
index 5dbcb1d..083b7f4 100644
--- a/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
+++ b/erpnext/patches/v10_0/set_qty_in_transactions_based_on_serial_no_input.py
@@ -9,4 +9,13 @@
ss = frappe.get_doc("Stock Settings")
ss.set_qty_in_transactions_based_on_serial_no_input = 1
+
+ if ss.default_warehouse \
+ and not frappe.db.exists("Warehouse", ss.default_warehouse):
+ ss.default_warehouse = None
+
+ if ss.stock_uom and not frappe.db.exists("UOM", ss.stock_uom):
+ ss.stock_uom = None
+
+ ss.flags.ignore_mandatory = True
ss.save()
\ No newline at end of file