From 22aaf0cbd0a3a0b143314e412f644808247858cc Mon Sep 17 00:00:00 2001 From: mbauskar Date: Fri, 30 Jun 2017 16:41:16 +0530 Subject: [PATCH 1/3] [minor] fixed AttributeError: 'dict' object has no attribute 'company' in sales register --- .../report/item_wise_sales_register/item_wise_sales_register.py | 2 +- erpnext/accounts/report/sales_register/sales_register.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 19f74a6edf..7d10b19dce 100644 --- 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 index 49f6471a1d..c471b8b08f 100644 --- 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 = [] From 067991ee308b0445a1c8a357d82c9a6348a27d73 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 30 Jun 2017 16:42:26 +0530 Subject: [PATCH 2/3] [minor] fix autoname for GST HSN Code (#9536) --- erpnext/patches.txt | 1 + erpnext/regional/doctype/gst_hsn_code/gst_hsn_code.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 130554fe64..111bf88999 100644 --- 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 index 9aad1bf137..6f1221352e 100644 --- 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", From af9d3a4db6388056394c487afff6c9061a041e42 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Sat, 1 Jul 2017 14:46:46 +0600 Subject: [PATCH 3/3] bumped to version 8.2.3 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 71323d1320..95c5f8a858 100644 --- 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):