From 7f49b57aaa170116f5a773100e0f25e1e1158019 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 22 Feb 2018 18:17:57 +0530 Subject: [PATCH 1/2] Update added_extra_gst_custom_field_in_gstr2.py --- .../v10_0/added_extra_gst_custom_field_in_gstr2.py | 8 +++++--- 1 file changed, 5 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 d48c28897f..7b65a6510c 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 @@ -6,6 +6,10 @@ def execute(): if not company: return + 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) + make_custom_fields() frappe.db.sql(""" @@ -14,6 +18,4 @@ def execute(): where fieldname = 'reason_for_issuing_document' """) - 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 2b2cf1340838a90bd94b471e14d39f8669661c44 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 22 Feb 2018 18:48:34 +0600 Subject: [PATCH 2/2] bumped to version 10.1.2 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 9589a9fb64..3c7b9f346a 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.1' +__version__ = '10.1.2' def get_default_company(user=None): '''Get default company for user'''