nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove all six compat code

Browse Source
This commit is contained in:
Ankush Menat
2021-11-04 19:48:32 +05:30
parent 56a25a0c4f
commit 8fe5feb6a4
420 changed files with 179 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
erpnext/stock/get_item_details.py
View File

@@ -8,7 +8,6 @@ import frappe
from frappe import _, throw
from frappe.model.meta import get_field_precision
from frappe.utils import add_days, add_months, cint, cstr, flt, getdate
from six import iteritems, string_types
from erpnext import get_company_currency
from erpnext.accounts.doctype.pricing_rule.pricing_rule import (
@@ -58,7 +57,7 @@ def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=Tru
out = get_basic_details(args, item, overwrite_warehouse)
if isinstance(doc, string_types):
if isinstance(doc, str):
doc = json.loads(doc)
if doc and doc.get('doctype') == 'Purchase Invoice':
@@ -97,7 +96,7 @@ def get_item_details(args, doc=None, for_validate=False, overwrite_warehouse=Tru
out.update(bin_details)
# update args with out, if key or value not exists
for key, value in iteritems(out):
for key, value in out.items():
if args.get(key) is None:
args[key] = value
@@ -162,7 +161,7 @@ def set_valuation_rate(out, args):
def process_args(args):
if isinstance(args, string_types):
if isinstance(args, str):
args = json.loads(args)
args = frappe._dict(args)
@@ -179,7 +178,7 @@ def process_args(args):
return args
def process_string_args(args):
if isinstance(args, string_types):
if isinstance(args, str):
args = json.loads(args)
return args
@@ -1173,7 +1172,7 @@ def get_gross_profit(out):
@frappe.whitelist()
def get_serial_no(args, serial_nos=None, sales_order=None):
serial_no = None
if isinstance(args, string_types):
if isinstance(args, str):
args = json.loads(args)
args = frappe._dict(args)
if args.get('doctype') == 'Sales Invoice' and not args.get('update_stock'):
@@ -1202,7 +1201,7 @@ def update_party_blanket_order(args, out):
@frappe.whitelist()
def get_blanket_order_details(args):
if isinstance(args, string_types):
if isinstance(args, str):
args = frappe._dict(json.loads(args))
blanket_order_details = None