From 3b0e6cecd6a80a223531c50006950c64e85015f0 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 28 Jun 2017 12:27:05 +0530 Subject: [PATCH 1/4] [minor] fixed broken image url in gst documentation --- ...-reminder-email.png => gstin-reminder-email.png} | Bin .../user/manual/en/regional/india/gst-remimders.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename erpnext/docs/assets/img/regional/india/{gst-reminder-email.png => gstin-reminder-email.png} (100%) diff --git a/erpnext/docs/assets/img/regional/india/gst-reminder-email.png b/erpnext/docs/assets/img/regional/india/gstin-reminder-email.png similarity index 100% rename from erpnext/docs/assets/img/regional/india/gst-reminder-email.png rename to erpnext/docs/assets/img/regional/india/gstin-reminder-email.png diff --git a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md index 58526c41358..97f016d234d 100644 --- a/erpnext/docs/user/manual/en/regional/india/gst-remimders.md +++ b/erpnext/docs/user/manual/en/regional/india/gst-remimders.md @@ -4,7 +4,7 @@ You can send email reminders to your Customers and Suppliers so that they can di To send GSTIN Reminders, you can either open the Customer / Supplier record or **GST Settings** -GST Settings +GST Settings Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers From 07913c3ff26ef9d711920b8d298ef7718d1d45a2 Mon Sep 17 00:00:00 2001 From: Saurabh Date: Wed, 28 Jun 2017 13:16:42 +0530 Subject: [PATCH 2/4] [fix] delete custom field tax_id if exists in trasaction Sales Order, Sales Invoice and Delivery Note --- erpnext/patches/v8_1/setup_gst_india.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/erpnext/patches/v8_1/setup_gst_india.py b/erpnext/patches/v8_1/setup_gst_india.py index efdb9c5e9f6..374c738f13a 100644 --- a/erpnext/patches/v8_1/setup_gst_india.py +++ b/erpnext/patches/v8_1/setup_gst_india.py @@ -12,9 +12,16 @@ def execute(): if frappe.db.get_single_value('System Settings', 'country')=='India': from erpnext.regional.india.setup import setup + delete_custom_field_tax_id_if_exists() setup(patch=True) send_gst_update_email() +def delete_custom_field_tax_id_if_exists(): + for field in frappe.db.sql_list("""select name from `tabCustom Field` where fieldname='tax_id' + and dt in ('Sales Order', 'Salse Invoice', 'Delivery Note')"""): + frappe.delete_doc("Custom Field", field, ignore_permissions=True) + frappe.db.commit() + def send_gst_update_email(): message = """Hello, From 6daa6e422e2f8ee7b06203c656a3f550d4a7c335 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 28 Jun 2017 13:24:44 +0530 Subject: [PATCH 3/4] [fix] delete/update desktop icon for deprecated report --- .../patches/v8_1/delete_deprecated_reports.py | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/erpnext/patches/v8_1/delete_deprecated_reports.py b/erpnext/patches/v8_1/delete_deprecated_reports.py index 2cb84a9a5fa..7e861319bf8 100644 --- a/erpnext/patches/v8_1/delete_deprecated_reports.py +++ b/erpnext/patches/v8_1/delete_deprecated_reports.py @@ -7,9 +7,25 @@ import frappe def execute(): """ delete deprecated reports """ - reports = ["Monthly Salary Register", "Customer Addresses And Contacts", - "Supplier Addresses And Contacts"] + reports = [ + "Monthly Salary Register", "Customer Addresses And Contacts", + "Supplier Addresses And Contacts" + ] for report in reports: if frappe.db.exists("Report", report): - frappe.delete_doc("Report", report, ignore_permissions=True) \ No newline at end of file + check_and_update_desktop_icon_for_report(report) + frappe.delete_doc("Report", report, ignore_permissions=True) + +def check_and_update_desktop_icon_for_report(report): + """ delete desktop icon for deprecated desktop icon and update the _report for Addresses And Contacts""" + + if report == "Monthly Salary Register": + frappe.delete_doc("Desktop Icon", report) + + elif report in ["Customer Addresses And Contacts", "Supplier Addresses And Contacts"]: + name = frappe.db.get_value("Desktop Icon", {"_report": report}) + if name: + frappe.db.set_value("Desktop Icon", name, "_report", "Addresses And Contacts") + + frappe.db.commit() From e9a4f4e70d528ecebb63ee3e2fc3e643bc8a4500 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Wed, 28 Jun 2017 14:02:29 +0600 Subject: [PATCH 4/4] bumped to version 8.1.6 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a14017d056d..3448dbcf015 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '8.1.5' +__version__ = '8.1.6' def get_default_company(user=None):