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

unicode error in python3 (#14192)

Browse Source
This commit is contained in:
neckos 2018-05-23 17:13:53 +03:00 committed by Nabin Hait
parent 5f861756a2
commit 225af4a4cb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/manufacturing/doctype/work_order/work_order.py
View File

@ -24,6 +24,8 @@ class StockOverProductionError(frappe.ValidationError): pass
class OperationTooLongError(frappe.ValidationError): pass class OperationTooLongError(frappe.ValidationError): pass
class ItemHasVariantError(frappe.ValidationError): pass class ItemHasVariantError(frappe.ValidationError): pass
from six import string_types
form_grid_templates = { form_grid_templates = {
"operations": "templates/form_grid/work_order_grid.html" "operations": "templates/form_grid/work_order_grid.html"
} }
@ -660,10 +662,10 @@ def make_timesheet(work_order, company):
@frappe.whitelist() @frappe.whitelist()
def add_timesheet_detail(timesheet, args): def add_timesheet_detail(timesheet, args):
if isinstance(timesheet, unicode): if isinstance(timesheet, string_types):
timesheet = frappe.get_doc('Timesheet', timesheet) timesheet = frappe.get_doc('Timesheet', timesheet)
if isinstance(args, unicode): if isinstance(args, string_types):
args = json.loads(args) args = json.loads(args)
timesheet.append('time_logs', args) timesheet.append('time_logs', args)