Merge branch 'master' into develop

erpnext/__init__.py

@@ -4,7 +4,7 @@ import inspect
 import frappe
 from erpnext.hooks import regional_overrides
 
-__version__ = '8.7.2'
+__version__ = '8.7.3'
 
 def get_default_company(user=None):
 	'''Get default company for user'''

erpnext/accounts/report/financial_statements.py

@@ -234,7 +234,7 @@ def add_total_row(out, root_type, balance_must_be, period_list, company_currency
 			for period in period_list:
 				total_row.setdefault(period.key, 0.0)
 				total_row[period.key] += row.get(period.key, 0.0)
-				row[period.key] = ""
+				row[period.key] = 0.0
 
 			total_row.setdefault("total", 0.0)
 			total_row["total"] += flt(row["total"])

erpnext/patches.txt

@@ -334,6 +334,7 @@ execute:frappe.reload_doctype('Employee') #2016-10-18
 execute:frappe.db.sql("update `tabEmployee` set prefered_contact_email = IFNULL(prefered_contact_email,'') ")
 execute:frappe.reload_doctype("Salary Slip")
 execute:frappe.db.sql("update `tabSalary Slip` set posting_date=creation")
+erpnext.patches.v8_0.create_domain_docs	#16-05-2017
 erpnext.patches.v7_1.update_portal_roles
 erpnext.patches.v7_1.set_total_amount_currency_in_je
 finally:erpnext.patches.v7_0.update_timesheet_communications
@@ -404,7 +405,6 @@ erpnext.patches.v8_0.delete_bin_indexes
 erpnext.patches.v8_0.move_account_head_from_account_to_warehouse_for_inventory
 erpnext.patches.v8_0.change_in_words_varchar_length
 erpnext.patches.v8_0.update_stock_qty_value_in_bom_item
-erpnext.patches.v8_0.create_domain_docs	#16-05-2017
 erpnext.patches.v8_0.update_sales_cost_in_project
 erpnext.patches.v8_0.save_system_settings
 erpnext.patches.v8_1.delete_deprecated_reports

erpnext/regional/report/gst_itemised_purchase_register/gst_itemised_purchase_register.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2017-06-22 15:25:04.101930", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2017-06-22 15:25:10.749203", 
+ "modified": "2017-08-04 15:39:41.671851", 
  "modified_by": "Administrator", 
  "module": "Regional", 
  "name": "GST Itemised Purchase Register", 

erpnext/regional/report/gst_itemised_sales_register/gst_itemised_sales_register.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2017-06-22 15:24:43.083217", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2017-06-22 15:24:50.611910", 
+ "modified": "2017-08-04 15:39:46.998093", 
  "modified_by": "Administrator", 
  "module": "Regional", 
  "name": "GST Itemised Sales Register", 

erpnext/regional/report/gst_purchase_register/gst_purchase_register.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2017-06-22 11:06:40.836073", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2017-06-22 12:17:15.487392", 
+ "modified": "2017-08-04 15:39:53.123814", 
  "modified_by": "Administrator", 
  "module": "Regional", 
  "name": "GST Purchase Register", 

erpnext/regional/report/gst_sales_register/gst_sales_register.json

@@ -1,5 +1,5 @@
 {
- "add_total_row": 0, 
+ "add_total_row": 1, 
  "apply_user_permissions": 1, 
  "creation": "2017-06-21 16:44:41.621260", 
  "disabled": 0, 
@@ -7,7 +7,7 @@
  "doctype": "Report", 
  "idx": 0, 
  "is_standard": "Yes", 
- "modified": "2017-06-22 11:39:24.609998", 
+ "modified": "2017-08-04 15:39:33.401936", 
  "modified_by": "Administrator", 
  "module": "Regional", 
  "name": "GST Sales Register",