Merge branch 'hotfix' into plaid_reconciliation

erpnext/erpnext_integrations/data_migration_mapping/issue_to_task/__init__.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 
 def pre_process(issue):

erpnext/erpnext_integrations/data_migration_mapping/milestone_to_project/__init__.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 def pre_process(milestone):
 	return {
 		'title': milestone.title,

erpnext/erpnext_integrations/doctype/amazon_mws_settings/amazon_mws_api.py

@@ -4,6 +4,7 @@
 # Basic interface to Amazon MWS
 # Based on http://code.google.com/p/amazon-mws-python
 # Extended to include finances object
+from __future__ import unicode_literals
 
 import urllib
 import hashlib

erpnext/erpnext_integrations/doctype/amazon_mws_settings/xml_utils.py

@@ -6,6 +6,7 @@ Borrowed from https://github.com/timotheus/ebaysdk-python
 
 @author: pierre
 """
+from __future__ import unicode_literals
 
 import xml.etree.ElementTree as ET
 import re

erpnext/erpnext_integrations/doctype/shopify_settings/sync_customer.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe import _
 

erpnext/erpnext_integrations/doctype/shopify_settings/sync_product.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe import _
 from frappe.utils import cstr, cint, get_request_session

erpnext/erpnext_integrations/doctype/woocommerce_settings/woocommerce_settings.py

@@ -28,7 +28,7 @@ class WoocommerceSettings(Document):
 
 				if not frappe.get_value("Custom Field",{"name":i[0]}) or not frappe.get_value("Custom Field",{"name":i[1]}):
 					create_custom_field_id_and_check_status = True
-					break;
+					break
 
 
 			if create_custom_field_id_and_check_status:

erpnext/erpnext_integrations/utils.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals
 import frappe
 from frappe import _
 import base64, hashlib, hmac