Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui

erpnext/setup/doctype/company/company.py

@@ -442,7 +442,7 @@ def install_country_fixtures(company):
 			module_name = "erpnext.regional.{0}.setup.setup".format(frappe.scrub(company_doc.country))
 			frappe.get_attr(module_name)(company_doc, False)
 		except Exception as e:
-			frappe.log_error(str(e), frappe.get_traceback())
+			frappe.log_error()
 			frappe.throw(_("Failed to setup defaults for country {0}. Please contact support@erpnext.com").format(frappe.bold(company_doc.country)))
 
 

erpnext/setup/doctype/naming_series/naming_series.py

@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.utils import cstr
+from frappe.utils import cstr, cint
 from frappe import msgprint, throw, _
 
 from frappe.model.document import Document
@@ -159,7 +159,7 @@ class NamingSeries(Document):
 			prefix = self.parse_naming_series()
 			self.insert_series(prefix)
 			frappe.db.sql("update `tabSeries` set current = %s where name = %s",
-				(self.current_value, prefix))
+				(cint(self.current_value), prefix))
 			msgprint(_("Series Updated Successfully"))
 		else:
 			msgprint(_("Please select prefix first"))