diff --git a/patches/patch_list.py b/patches/patch_list.py index e0112377673..2751854ee09 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -16,7 +16,6 @@ from __future__ import unicode_literals patch_list = [ - "execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-03-07", "patches.mar_2012.so_rv_mapper_fix", "patches.mar_2012.clean_property_setter", "patches.april_2012.naming_series_patch", diff --git a/website/doctype/style_settings/style_settings.py b/website/doctype/style_settings/style_settings.py index 46aa9711506..0a1a2e02036 100644 --- a/website/doctype/style_settings/style_settings.py +++ b/website/doctype/style_settings/style_settings.py @@ -15,6 +15,8 @@ # along with this program. If not, see . from __future__ import unicode_literals +from webnotes.utils import cint, cstr + class DocType: def __init__(self, d, dl): self.doc, self.doclist = d, dl @@ -46,8 +48,8 @@ class DocType: if not self.doc.font_size: self.doc.font_size = '13px' - self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px' - self.doc.page_border = int(self.doc.page_border) + self.doc.small_font_size = cstr(cint(self.doc.font_size[:-2])-2) + 'px' + self.doc.page_border = cint(self.doc.page_border) fonts = [] if self.doc.google_web_font_for_heading: