openerp-community-reviewer team mailing list archive

[GrupoCITEC <registros@xxxxxxxxxxxxxx>]

GrupoCITEC has proposed merging lp:~grupocitec/ocb-addons/report_webkit_custom_paper_size into lp:ocb-addons.

Requested reviews:
  OpenERP Community Backports Team (ocb)

For more details, see:
https://code.launchpad.net/~grupocitec/ocb-addons/report_webkit_custom_paper_size/+merge/195418

New option for defininf custom paper size in report_webkit headers
-- 
https://code.launchpad.net/~grupocitec/ocb-addons/report_webkit_custom_paper_size/+merge/195418
Your team OpenERP Community Backports Team is requested to review the proposed merge of lp:~grupocitec/ocb-addons/report_webkit_custom_paper_size into lp:ocb-addons.

=== modified file 'report_webkit/__openerp__.py'
--- report_webkit/__openerp__.py	2013-08-15 07:54:23 +0000
+++ report_webkit/__openerp__.py	2013-11-15 16:21:03 +0000
@@ -48,7 +48,7 @@
     - Raw HTML debugger
     - Book printing capabilities
     - Margins definition
-    - Paper size definition
+    - Paper size definition (event custom paper size)
 
 Multiple headers and logos can be defined per company. CSS style, header and
 footer body are defined per company.

=== modified file 'report_webkit/header.py'
--- report_webkit/header.py	2012-10-23 16:05:04 +0000
+++ report_webkit/header.py	2013-11-15 16:21:03 +0000
@@ -81,11 +81,14 @@
                 ('Legal', 'Legal    3   8.5 x 14 inches, 215.9 x 355.6 mm'),
                 ('Letter','Letter 2 8.5 x 11 inches, 215.9 x 279.4 mm'),
                 ('Tabloid', 'Tabloid 29 279.4 x 431.8 mm'),
+                ('custom', 'Custom Paper Size'),
                 ],
                 'Paper size',
                 required=True,
                 help="Select Proper Paper size"
-        )
+        ),
+        'paper_width': fields.integer('Paper Width (mm)'),
+        'paper_height': fields.integer('Paper Height (mm)'),
     }
 HeaderHTML()
 

=== modified file 'report_webkit/header_view.xml'
--- report_webkit/header_view.xml	2012-10-23 16:05:04 +0000
+++ report_webkit/header_view.xml	2013-11-15 16:21:03 +0000
@@ -26,6 +26,8 @@
                             <field name='company_id'/>
                             <field name="orientation"/>
                             <field name="format"/>
+                            <field name="paper_width" attrs="{'invisible': [('format', '!=', 'custom')], 'required': [('format', '=', 'custom')]}" />
+                            <field name="paper_height" attrs="{'invisible': [('format', '!=', 'custom')], 'required': [('format', '=', 'custom')]}" />
                         </group><group>
                             <field name="margin_top"/>
                             <field name="margin_bottom"/>

=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py	2012-10-23 16:05:04 +0000
+++ report_webkit/webkit_report.py	2013-11-15 16:21:03 +0000
@@ -149,7 +149,11 @@
         if webkit_header.orientation :
             command.extend(['--orientation', str(webkit_header.orientation).replace(',', '.')])
         if webkit_header.format :
-            command.extend(['--page-size', str(webkit_header.format).replace(',', '.')])
+            if webkit_header.format=='custom':
+                command.extend(['--page-width', str(webkit_header.paper_width).replace(',', '.')])
+                command.extend(['--page-height', str(webkit_header.paper_height).replace(',', '.')])
+            else:
+                command.extend(['--page-size', str(webkit_header.format).replace(',', '.')])
         count = 0
         for html in html_list :
             html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')