Merge branch 'master' into develop
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index e852de2..9589a9f 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.0'
+__version__ = '10.1.1'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py b/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py
index 185e20d..d48c288 100644
--- a/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py
+++ b/erpnext/patches/v10_0/added_extra_gst_custom_field_in_gstr2.py
@@ -13,6 +13,7 @@
set reqd = 0, `default` = ''
where fieldname = 'reason_for_issuing_document'
""")
-
- frappe.db.sql("""delete from `tabCustom Field` where dt = 'Purchase Invoice'
- and fieldname in ('port_code', 'shipping_bill_number', 'shipping_bill_date')""")
\ No newline at end of file
+
+ for doctype in ["Sales Invoice", "Delivery Note", "Purchase Invoice"]:
+ frappe.db.sql("""delete from `tabCustom Field` where dt = %s
+ and fieldname in ('port_code', 'shipping_bill_number', 'shipping_bill_date')""", doctype)
\ No newline at end of file
diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py
index 415056d..b0cfbae 100644
--- a/erpnext/utilities/product.py
+++ b/erpnext/utilities/product.py
@@ -28,9 +28,6 @@
if stock_qty:
in_stock = stock_qty[0][0] > 0 and 1 or 0
- if stock_qty:
- in_stock = stock_qty[0][0] > 0 and 1 or 0
-
return frappe._dict({"in_stock": in_stock, "stock_qty": stock_qty, "is_stock_item": is_stock_item})