Merge branch 'develop'
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index a14017d..3448dbc 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):
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
Binary files differ
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 58526c4..97f016d 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 @@
To send GSTIN Reminders, you can either open the Customer / Supplier record or **GST Settings**
-<img class="screenshot" alt="GST Settings" src="{{docs_base_url}}/assets/img/regional/india/gstin-settings.png">
+<img class="screenshot" alt="GST Settings" src="{{docs_base_url}}/assets/img/regional/india/gst-settings.png">
Here you can click on the "Send GSTIN Update Reminders" button to send email reminders to all your customers
diff --git a/erpnext/patches/v8_1/delete_deprecated_reports.py b/erpnext/patches/v8_1/delete_deprecated_reports.py
index 2cb84a9..7e86131 100644
--- a/erpnext/patches/v8_1/delete_deprecated_reports.py
+++ b/erpnext/patches/v8_1/delete_deprecated_reports.py
@@ -7,9 +7,25 @@
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()
diff --git a/erpnext/patches/v8_1/setup_gst_india.py b/erpnext/patches/v8_1/setup_gst_india.py
index efdb9c5..374c738 100644
--- a/erpnext/patches/v8_1/setup_gst_india.py
+++ b/erpnext/patches/v8_1/setup_gst_india.py
@@ -12,9 +12,16 @@
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,
