Merge branch 'hotfix'

frappe · Jul 1, 2017 · ea92682 · ea92682
2 parents 943637e + af9d3a4
commit ea92682
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe
 
-__version__ = '8.2.2'
+__version__ = '8.2.3'
 
 
 def get_default_company(user=None):

diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -24,7 +24,7 @@ def _execute(filters=None, additional_table_columns=None, additional_query_colum
 		"fieldtype": "Data",
 		"width": 80
 	})
-	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	company_currency = frappe.db.get_value("Company", filters.get("company"), "default_currency")
 	mode_of_payments = get_mode_of_payments(set([d.parent for d in item_list]))
 
 	data = []

diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
@@ -26,7 +26,7 @@ def _execute(filters, additional_table_columns=None, additional_query_columns=No
 	invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
 	customers = list(set([inv.customer for inv in invoice_list]))
 	customer_map = get_customer_details(customers)
-	company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
+	company_currency = frappe.db.get_value("Company", filters.get("company"), "default_currency")
 	mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list])
 
 	data = []

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
@@ -409,3 +409,4 @@ erpnext.patches.v8_0.update_sales_cost_in_project
 erpnext.patches.v8_0.save_system_settings
 erpnext.patches.v8_1.delete_deprecated_reports
 erpnext.patches.v8_1.setup_gst_india #2017-06-27
+execute:frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
diff --git a/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.json b/erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.json
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "fieldname:hsn_code", 
+ "autoname": "field:hsn_code", 
  "beta": 0, 
  "creation": "2017-06-21 10:48:56.422086", 
  "custom": 0, 
@@ -84,7 +84,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-06-21 13:27:59.149202", 
+ "modified": "2017-06-29 21:28:09.053351", 
  "modified_by": "Administrator", 
  "module": "Regional", 
  "name": "GST HSN Code",