Merge pull request #5491 from codingCoffee/decimal_fix
added handler for decimal object in response
This commit is contained in:
commit
c1a338f8c0
1 changed files with 4 additions and 0 deletions
|
|
@ -20,6 +20,7 @@ from frappe.core.doctype.file.file import check_file_permission
|
|||
from frappe.website.render import render
|
||||
from frappe.utils import cint
|
||||
from six import text_type
|
||||
import decimal
|
||||
|
||||
def report_error(status_code):
|
||||
'''Build error. Show traceback in developer mode'''
|
||||
|
|
@ -106,6 +107,9 @@ def json_handler(obj):
|
|||
if isinstance(obj, (datetime.date, datetime.timedelta, datetime.datetime)):
|
||||
return text_type(obj)
|
||||
|
||||
elif isinstance(obj, decimal.Decimal):
|
||||
return float(obj)
|
||||
|
||||
elif isinstance(obj, LocalProxy):
|
||||
return text_type(obj)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue