nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Python 3 fixes [merge asap] (#12884)

Browse Source 
* Python 3 fixes

* fixed compare
This commit is contained in:
Achilles Rasquinha
2018-02-13 14:42:40 +05:30
committed by Nabin Hait
parent ecc6f86c7c
commit 56b2e12af8
10 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/controllers/item_variant.py
View File

@@ -7,6 +7,8 @@ from frappe import _
from frappe.utils import cstr, flt
import json, copy
from six import string_types
class ItemVariantExistsError(frappe.ValidationError): pass
class InvalidItemAttributeValueError(frappe.ValidationError): pass
class ItemTemplateCannotHaveStock(frappe.ValidationError): pass
@@ -26,7 +28,7 @@ def get_variant(template, args=None, variant=None, manufacturer=None,
return make_variant_based_on_manufacturer(item_template, manufacturer,
manufacturer_part_no)
else:
if isinstance(args, basestring):
if isinstance(args, string_types):
args = json.loads(args)
if not args:
@@ -150,7 +152,7 @@ def find_variant(template, args, variant_item_code=None):
@frappe.whitelist()
def create_variant(item, args):
if isinstance(args, basestring):
if isinstance(args, string_types):
args = json.loads(args)
template = frappe.get_doc("Item", item)
@@ -177,7 +179,7 @@ def enqueue_multiple_variant_creation(item, args):
item=item, args=args, now=frappe.flags.in_test);
def create_multiple_variants(item, args):
if isinstance(args, basestring):
if isinstance(args, string_types):
args = json.loads(args)
args_set = generate_keyed_value_combinations(args)