Merge pull request #12710 from achillesrasquinha/12704

Python 3 Compatible Fixes.

erpnext/education/doctype/guardian/guardian.py

@@ -37,7 +37,6 @@ def invite_guardian(guardian):
 		frappe.throw(_("Please set Email Address"))
 	else:
 		guardian_as_user = frappe.get_value('User', dict(email=guardian_doc.email_address))
-		print guardian_as_user
 		if guardian_as_user:
 			frappe.msgprint(_("User {0} already exists").format(getlink("User", guardian_as_user)))
 			return guardian_as_user

erpnext/healthcare/doctype/healthcare_settings/healthcare_settings.py

@@ -9,60 +9,60 @@ from frappe.core.doctype.sms_settings.sms_settings import send_sms
 import json
 
 class HealthcareSettings(Document):
-	def validate(self):
+    def validate(self):
-		for key in ["collect_registration_fee","manage_customer","patient_master_name",
+        for key in ["collect_registration_fee","manage_customer","patient_master_name",
-		"require_test_result_approval","require_sample_collection", "default_medical_code_standard"]:
+        "require_test_result_approval","require_sample_collection", "default_medical_code_standard"]:
-			frappe.db.set_default(key, self.get(key, ""))
+            frappe.db.set_default(key, self.get(key, ""))
-		if(self.collect_registration_fee):
+        if(self.collect_registration_fee):
-			if self.registration_fee <= 0 :
+            if self.registration_fee <= 0 :
-				frappe.throw("Registration fee can not be Zero")
+                frappe.throw("Registration fee can not be Zero")
 
 @frappe.whitelist()
 def get_sms_text(doc):
-	sms_text = {}
+    sms_text = {}
-	doc = frappe.get_doc("Lab Test",doc)
+    doc = frappe.get_doc("Lab Test",doc)
-	#doc = json.loads(doc)
+    #doc = json.loads(doc)
-	context = {"doc": doc, "alert": doc, "comments": None}
+    context = {"doc": doc, "alert": doc, "comments": None}
-	emailed = frappe.db.get_value("Healthcare Settings", None, "sms_emailed")
+    emailed = frappe.db.get_value("Healthcare Settings", None, "sms_emailed")
-	sms_text['emailed'] = frappe.render_template(emailed, context)
+    sms_text['emailed'] = frappe.render_template(emailed, context)
- 	printed = frappe.db.get_value("Healthcare Settings", None, "sms_printed")
+    printed = frappe.db.get_value("Healthcare Settings", None, "sms_printed")
-	sms_text['printed'] = frappe.render_template(printed, context)
+    sms_text['printed'] = frappe.render_template(printed, context)
-	return sms_text
+    return sms_text
 
 def send_registration_sms(doc):
-	if (frappe.db.get_value("Healthcare Settings", None, "reg_sms")=='1'):
+    if (frappe.db.get_value("Healthcare Settings", None, "reg_sms")=='1'):
-		if doc.mobile:
+        if doc.mobile:
-			context = {"doc": doc, "alert": doc, "comments": None}
+            context = {"doc": doc, "alert": doc, "comments": None}
-			if doc.get("_comments"):
+            if doc.get("_comments"):
-				context["comments"] = json.loads(doc.get("_comments"))
+                context["comments"] = json.loads(doc.get("_comments"))
-			messages = frappe.db.get_value("Healthcare Settings", None, "reg_msg")
+            messages = frappe.db.get_value("Healthcare Settings", None, "reg_msg")
-			messages = frappe.render_template(messages, context)
+            messages = frappe.render_template(messages, context)
-			number = [doc.mobile]
+            number = [doc.mobile]
-			send_sms(number,messages)
+            send_sms(number,messages)
-		else:
+        else:
-			frappe.msgprint(doc.name + " Has no mobile number to send registration SMS", alert=True)
+            frappe.msgprint(doc.name + " Has no mobile number to send registration SMS", alert=True)
 
 
 def get_receivable_account(company):
-	receivable_account = get_account(None, "receivable_account", "Healthcare Settings", company)
+    receivable_account = get_account(None, "receivable_account", "Healthcare Settings", company)
-	if receivable_account:
+    if receivable_account:
-		return receivable_account
+        return receivable_account
-	return frappe.db.get_value("Company", company, "default_receivable_account")
+    return frappe.db.get_value("Company", company, "default_receivable_account")
 
 def get_income_account(physician, company):
-	if(physician):
+    if(physician):
-		income_account = get_account("Physician", None, physician, company)
+        income_account = get_account("Physician", None, physician, company)
-		if income_account:
+        if income_account:
-			return income_account
+            return income_account
-	income_account = get_account(None, "income_account", "Healthcare Settings", company)
+    income_account = get_account(None, "income_account", "Healthcare Settings", company)
-	if income_account:
+    if income_account:
-		return income_account
+        return income_account
-	return frappe.db.get_value("Company", company, "default_income_account")
+    return frappe.db.get_value("Company", company, "default_income_account")
 
 def get_account(parent_type, parent_field, parent, company):
-	if(parent_type):
+    if(parent_type):
-		return frappe.db.get_value("Party Account",
+        return frappe.db.get_value("Party Account",
-			{"parenttype": parent_type, "parent": parent, "company": company}, "account")
+            {"parenttype": parent_type, "parent": parent, "company": company}, "account")
-	if(parent_field):
+    if(parent_field):
-		return frappe.db.get_value("Party Account",
+        return frappe.db.get_value("Party Account",
-			{"parentfield": parent_field, "parent": parent, "company": company}, "account")
+            {"parentfield": parent_field, "parent": parent, "company": company}, "account")

erpnext/setup/setup_wizard/setup_wizard.py

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
 
 import frappe
 from frappe import _
-from operations import install_fixtures, taxes_setup, defaults_setup, company_setup, sample_data
+from .operations import install_fixtures, taxes_setup, defaults_setup, company_setup, sample_data
 
 def get_setup_stages(args=None):
 	if frappe.db.sql("select name from tabCompany"):