Stephane Wirtel (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-wkhtmltopdf-stw into
lp:openobject-addons.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wkhtmltopdf-stw/+merge/92508
include webkittohtml
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-wkhtmltopdf-stw/+merge/92508
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-wkhtmltopdf-stw.
=== modified file 'report_webkit/company.py'
--- report_webkit/company.py 2011-12-19 16:54:40 +0000
+++ report_webkit/company.py 2012-02-10 16:28:21 +0000
@@ -50,12 +50,6 @@
'html_id',
'Available html',
),
- 'lib_path' : fields.char('Webkit Executable Path', size=264,
- help="Full path to the wkhtmltopdf executable file. "
- "Version 0.9.9 is required. Install a static version "
- "of the library if you experience missing header/footers "
- "on Linux."),
-
}
ResCompany()
=== modified file 'report_webkit/company_view.xml'
--- report_webkit/company_view.xml 2011-01-14 00:11:01 +0000
+++ report_webkit/company_view.xml 2012-02-10 16:28:21 +0000
@@ -8,7 +8,6 @@
<field name="arch" type="xml">
<notebook position="inside">
<page string="Webkit">
- <field name="lib_path" colspan="4"/>
<separator string="Images" colspan="4"/>
<field name="header_image" colspan="4" nolabel="1"/>
<separator string="Headers" colspan="4"/>
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2012-01-31 13:36:57 +0000
+++ report_webkit/webkit_report.py 2012-02-10 16:28:21 +0000
@@ -36,6 +36,7 @@
import tempfile
import time
import logging
+import sys
from mako.template import Template
from mako.lookup import TemplateLookup
@@ -71,35 +72,33 @@
report_sxw.__init__(self, name, table, rml, parser,
header, store)
- def get_lib(self, cursor, uid, company) :
+ def get_lib(self, cursor, uid):
"""Return the lib wkhtml path"""
- #TODO Detect lib in system first
- path = self.pool.get('res.company').read(cursor, uid, company, ['lib_path',])
- path = path['lib_path']
- if not path:
- raise except_osv(
- _('Wkhtmltopdf library path is not set in company'),
- _('Please install executable on your system'+
- ' (sudo apt-get install wkhtmltopdf) or download it from here:'+
- ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the'+
- ' path to the executable on the Company form.'+
- 'Minimal version is 0.9.9')
- )
- if os.path.isabs(path) :
- if (os.path.exists(path) and os.access(path, os.X_OK)\
- and os.path.basename(path).startswith('wkhtmltopdf')):
- return path
- else:
- raise except_osv(
- _('Wrong Wkhtmltopdf path set in company'+
- 'Given path is not executable or path is wrong'),
- 'for path %s'%(path)
- )
- else :
- raise except_osv(
- _('path to Wkhtmltopdf is not absolute'),
- 'for path %s'%(path)
- )
+
+ proxy = self.pool.get('ir.config_parameter')
+ webkit_path = proxy.get_param(cursor, uid, 'webkit_path')
+
+ if not webkit_path:
+ try:
+ defpath = os.environ.get('PATH', os.defpath).split(os.pathsep)
+ if hasattr(sys, 'frozen'):
+ defpath.append(os.getcwd())
+ webkit_path = tools.which('wkhtmltopdf', path=os.path.join(defpath))
+ except IOError:
+ webkit_path = None
+
+ if webkit_path:
+ return webkit_path
+
+ raise except_osv(
+ _('Wkhtmltopdf library path is not set'),
+ _('Please install executable on your system' \
+ ' (sudo apt-get install wkhtmltopdf) or download it from here:' \
+ ' http://code.google.com/p/wkhtmltopdf/downloads/list and set the' \
+ ' path in the ir.config_parameter with the webkit_path key.' \
+ 'Minimal version is 0.9.9')
+ )
+
def generate_pdf(self, comm_path, report_xml, header, footer, html_list, webkit_header=False):
"""Call webkit in order to generate pdf"""
if not webkit_header:
@@ -295,8 +294,8 @@
logger.error(msg)
raise except_osv(_('Webkit render'), msg)
return (deb, 'html')
- bin = self.get_lib(cursor, uid, company.id)
- pdf = self.generate_pdf(bin, report_xml, head, foot, htmls)
+ webkit_bin = self.get_lib(cursor, uid)
+ pdf = self.generate_pdf(webkit_bin, report_xml, head, foot, htmls)
return (pdf, 'pdf')
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
