Merge branch 'hotfix'

bumped to version 8.2.3
Merge pull request #9562 from mbauskar/gst-hsn-code
2017-07-01 14:16:46 +05:30 · 2017-07-01 14:46:46 +06:00 · 2017-07-01 14:15:18 +05:30 · 2017-07-01 14:14:14 +05:30 · 2017-06-30 16:48:10 +05:30 · 2017-06-30 16:43:25 +05:30
6 changed files with 7 additions and 5 deletions
--- a/erpnext/init.py
+++ b/erpnext/init.py
@@ -2,7 +2,7 @@
 from __future__ import unicode_literals
 import frappe

-__version__ = '8.2.1'
+__version__ = '8.2.3'


 def get_default_company(user=None):
--- 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 = []
--- 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 = []
--- 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')
--- a/erpnext/patches/v8_1/setup_gst_india.py
+++ b/erpnext/patches/v8_1/setup_gst_india.py
@@ -4,6 +4,7 @@ from frappe.email import sendmail_to_system_managers
 def execute():
 	frappe.reload_doc('regional', 'doctype', 'gst_settings')
 	frappe.reload_doc('regional', 'doctype', 'gst_hsn_code')
+	frappe.reload_doc('stock', 'doctype', 'item')

 	for report_name in ('GST Sales Register', 'GST Purchase Register',
 		'GST Itemised Sales Register', 'GST Itemised Purchase Register'):
--- 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",
Author	SHA1	Message	Date
mbauskar	ea92682cfd	Merge branch 'hotfix'	2017-07-01 14:16:46 +05:30
mbauskar	af9d3a4db6	bumped to version 8.2.3	2017-07-01 14:46:46 +06:00
Makarand Bauskar	f39a9f1c5b	Merge pull request #9562 from mbauskar/gst-hsn-code [minor] fix autoname for GST HSN Code (#9536)	2017-07-01 14:15:18 +05:30
Sagar Vora	067991ee30	[minor] fix autoname for GST HSN Code (#9536 )	2017-07-01 14:14:14 +05:30
rohitwaghchaure	6691856d08	Merge pull request #9554 from mbauskar/sales-register [minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register	2017-06-30 16:48:10 +05:30
mbauskar	22aaf0cbd0	[minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register	2017-06-30 16:43:25 +05:30
mbauskar	943637e06c	Merge branch 'hotfix'	2017-06-30 12:00:23 +05:30
mbauskar	0407cb0d92	bumped to version 8.2.2	2017-06-30 12:30:22 +06:00
Makarand Bauskar	d192a420d1	Merge pull request #9549 from rohitwaghchaure/patch_fix_gst [Fix] Options must be a valid DocType for field Customs Tariff Number	2017-06-30 11:59:47 +05:30
Rohit Waghchaure	3856d14ae6	[Fix] Options must be a valid DocType for field Customs Tariff Number	2017-06-30 11:57:41 +05:30