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

Merge pull request #13227 from achillesrasquinha/py3

Browse Source 
[FIX] use text_type instead of unicode, use cmp from past.builtins
This commit is contained in:
Achilles Rasquinha 2018-03-08 12:58:21 +05:30 committed by GitHub
commit 11241044b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/doctype/tax_rule/tax_rule.py
View File

@ -3,6 +3,7 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
from past.builtins import cmp
import frappe import frappe
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document

2
erpnext/accounts/report/financial_statements.py
View File

@ -4,7 +4,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re import re
from past.builtins import cmp
import functools import functools
import frappe import frappe

3
erpnext/controllers/accounts_controller.py
View File

@ -11,6 +11,7 @@ from erpnext.utilities.transaction_base import TransactionBase
from erpnext.controllers.sales_and_purchase_return import validate_return from erpnext.controllers.sales_and_purchase_return import validate_return
from erpnext.accounts.party import get_party_account_currency, validate_party_frozen_disabled from erpnext.accounts.party import get_party_account_currency, validate_party_frozen_disabled
from erpnext.exceptions import InvalidCurrency from erpnext.exceptions import InvalidCurrency
from six import text_type
force_item_fields = ("item_group", "brand", "stock_uom") force_item_fields = ("item_group", "brand", "stock_uom")
@ -932,7 +933,7 @@ def get_payment_terms(terms_template, posting_date=None, grand_total=None, bill_
@frappe.whitelist() @frappe.whitelist()
def get_payment_term_details(term, posting_date=None, grand_total=None, bill_date=None): def get_payment_term_details(term, posting_date=None, grand_total=None, bill_date=None):
term_details = frappe._dict() term_details = frappe._dict()
if isinstance(term, unicode): if isinstance(term, text_type):
term = frappe.get_doc("Payment Term", term) term = frappe.get_doc("Payment Term", term)
else: else:
term_details.payment_term = term.payment_term term_details.payment_term = term.payment_term