Odoo Addons (MOVED TO GITHUB)

Merge lp:~wowas18/openobject-addons/7.0_scale_report_webkit into lp:openobject-addons/7.0

  1. 7.0_scale_report_webkit
  2. Merge into 7.0
Proposed by wowas
Status: Needs review
Proposed branch: lp:~wowas18/openobject-addons/7.0_scale_report_webkit
Merge into: lp:openobject-addons/7.0
Diff against target: 46 lines (+7/-0)
3 files modified
report_webkit/header.py (+4/-0)
report_webkit/header_view.xml (+1/-0)
report_webkit/webkit_report.py (+2/-0)
To merge this branch: bzr merge lp:~wowas18/openobject-addons/7.0_scale_report_webkit
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+167599@code.launchpad.net

Description of the change

Add option for scale report from html to pdf (report_webkit)

To post a comment you must log in.

Unmerged revisions

9200. By wowas

[IMP] Add scale option to report_webkit (by --zoom for wkhtmltopdf utility)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'report_webkit/header.py'
2--- report_webkit/header.py 2013-05-14 14:28:37 +0000
3+++ report_webkit/header.py 2013-06-05 16:37:29 +0000
4@@ -41,6 +41,7 @@
5 'footer_html' : fields.text('webkit footer', help="Set Webkit Report Footer."),
6 'css' : fields.text('Header CSS'),
7 'name' : fields.char('Name', size=128, required=True),
8+ 'scale' : fields.float('Scale'),
9 'margin_top' : fields.float('Top Margin (mm)'),
10 'margin_bottom' : fields.float('Bottom Margin (mm)'),
11 'margin_left' : fields.float('Left Margin (mm)'),
12@@ -87,6 +88,9 @@
13 help="Select Proper Paper size"
14 )
15 }
16+ _defaults = {
17+ 'scale': 1,
18+ }
19 HeaderHTML()
20
21 class HeaderImage(osv.osv):
22
23=== modified file 'report_webkit/header_view.xml'
24--- report_webkit/header_view.xml 2012-11-29 22:26:45 +0000
25+++ report_webkit/header_view.xml 2013-06-05 16:37:29 +0000
26@@ -26,6 +26,7 @@
27 <field name='company_id'/>
28 <field name="orientation"/>
29 <field name="format"/>
30+ <field name="scale"/>
31 </group><group>
32 <field name="margin_top"/>
33 <field name="margin_bottom"/>
34
35=== modified file 'report_webkit/webkit_report.py'
36--- report_webkit/webkit_report.py 2013-06-04 08:46:31 +0000
37+++ report_webkit/webkit_report.py 2013-06-05 16:37:29 +0000
38@@ -138,6 +138,8 @@
39 file_to_del.append(foot_file.name)
40 command.extend(['--footer-html', foot_file.name])
41
42+ if webkit_header.scale :
43+ command.extend(['--zoom', str(webkit_header.scale).replace(',', '.')])
44 if webkit_header.margin_top :
45 command.extend(['--margin-top', str(webkit_header.margin_top).replace(',', '.')])
46 if webkit_header.margin_bottom :