nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Rushabh Mehta
2013-03-08 11:01:07 +05:30
parent 1dd330177d 9e04766ed4
commit 6008f96540
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -16,7 +16,6 @@
from __future__ import unicode_literals from __future__ import unicode_literals
patch_list = [ patch_list = [
"execute:webnotes.reload_doc('core', 'doctype', 'report') # 2013-03-07",
"patches.mar_2012.so_rv_mapper_fix", "patches.mar_2012.so_rv_mapper_fix",
"patches.mar_2012.clean_property_setter", "patches.mar_2012.clean_property_setter",
"patches.april_2012.naming_series_patch", "patches.april_2012.naming_series_patch",

6
website/doctype/style_settings/style_settings.py
View File

@@ -15,6 +15,8 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
from __future__ import unicode_literals from __future__ import unicode_literals
from webnotes.utils import cint, cstr
class DocType: class DocType:
def __init__(self, d, dl): def __init__(self, d, dl):
self.doc, self.doclist = d, dl self.doc, self.doclist = d, dl
@@ -46,8 +48,8 @@ class DocType:
if not self.doc.font_size: if not self.doc.font_size:
self.doc.font_size = '13px' self.doc.font_size = '13px'
self.doc.small_font_size = str(int(self.doc.font_size[:-2])-2) + 'px' self.doc.small_font_size = cstr(cint(self.doc.font_size[:-2])-2) + 'px'
self.doc.page_border = int(self.doc.page_border) self.doc.page_border = cint(self.doc.page_border)
fonts = [] fonts = []
if self.doc.google_web_font_for_heading: if self.doc.google_web_font_for_heading: