Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12710 from achillesrasquinha/12704

Browse Source 
Python 3 Compatible Fixes.
This commit is contained in:
Achilles Rasquinha 2018-01-31 11:23:05 +05:30 committed by GitHub
commit 6ceffbd2f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/education/doctype/guardian/guardian.py
View File

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

2
erpnext/setup/setup_wizard/setup_wizard.py
View File

@ -5,7 +5,7 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe import _ 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): def get_setup_stages(args=None):
if frappe.db.sql("select name from tabCompany"): if frappe.db.sql("select name from tabCompany"):