From 7aceb2f37d7a1d59d4987d99be8874722d6855ae Mon Sep 17 00:00:00 2001 From: shreyas Date: Tue, 20 Sep 2016 16:57:09 +0530 Subject: [PATCH 1/3] [Minor] Added Civil contracting to app listing to allow installations --- .../app_listing/erpnext_civil_contracting.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 frappe/data/app_listing/erpnext_civil_contracting.json diff --git a/frappe/data/app_listing/erpnext_civil_contracting.json b/frappe/data/app_listing/erpnext_civil_contracting.json new file mode 100644 index 0000000000..2f00961002 --- /dev/null +++ b/frappe/data/app_listing/erpnext_civil_contracting.json @@ -0,0 +1,14 @@ +{ + "app_url": "https://github.com/revant/civil_contracting.git", + "app_name": "civil_contracting", + "app_icon": "octicon octicon-file-directory", + "app_color": "grey", + "app_description": "Civil Contracting App to manage workers, wages and measurements", + "app_publisher": "Revant Nandgaonkar", + "app_email": "revant@mntechnique.com", + "repo_url": "https://github.com/revant/civil_contracting.git", + "app_title": "Civil Contracting", + "app_version": "1.5.0", + "app_category": "Integrations", + "featured": 1 +} From 74c4cbdba8fa8b39e2639f3394e3c825f0cde117 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 20 Sep 2016 17:12:25 +0530 Subject: [PATCH 2/3] [minor] ignore load issues in wkhtmltopdf --- frappe/utils/pdf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index 07031864a7..3e3801006b 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -51,6 +51,7 @@ def prepare_options(html, options): 'quiet': None, # 'no-outline': None, 'encoding': "UTF-8", + 'load-error-handling': 'ignore', # defaults 'margin-right': '15mm', From b64adb704541f6451f7be3076ed1ff0b0a0c66c7 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 21 Sep 2016 13:38:39 +0600 Subject: [PATCH 3/3] bumped to version 7.0.33 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index f049c2e935..104dcbb243 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template -__version__ = "7.0.32" +__version__ = "7.0.33" local = Local()