From c15978fca0ef9b26575b403ca0a22192e0b82ccb Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Thu, 22 Feb 2018 09:50:49 +0100 Subject: [PATCH 1/3] fix indentation --- erpnext/utilities/product.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py index 415056d80b..b0cfbae80a 100644 --- a/erpnext/utilities/product.py +++ b/erpnext/utilities/product.py @@ -28,9 +28,6 @@ def get_qty_in_stock(item_code, item_warehouse_field, warehouse=None): 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}) From d8cd54dfd0ec154c3718d31b65ae4d2433e8fb7c Mon Sep 17 00:00:00 2001 From: Saurabh Date: Thu, 22 Feb 2018 18:05:40 +0530 Subject: [PATCH 2/3] [fix] remove gstr2 fields from Sales Invoice and Delivery Note too (#13047) --- .../patches/v10_0/added_extra_gst_custom_field_in_gstr2.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 185e20d42e..d48c28897f 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 @@ def execute(): 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 From 6b69fc7e5d4fa5c81c526723743b07359c9f56cf Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 22 Feb 2018 18:40:37 +0600 Subject: [PATCH 3/3] bumped to version 10.1.1 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index e852de2d7b..9589a9fb64 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__ = '10.1.0' +__version__ = '10.1.1' def get_default_company(user=None): '''Get default company for user'''