diff --git a/addons/account/views/report_vat.xml b/addons/account/views/report_vat.xml
index d3a3d28bf58..4ef1fb54aec 100644
--- a/addons/account/views/report_vat.xml
+++ b/addons/account/views/report_vat.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_vat">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-call="report.internal_layout">
             <div class="page">
                 <h2>Tax Statement</h2>
diff --git a/addons/lunch/views/report_lunchorder.xml b/addons/lunch/views/report_lunchorder.xml
index d67ce98a7df..93d43f6521d 100644
--- a/addons/lunch/views/report_lunchorder.xml
+++ b/addons/lunch/views/report_lunchorder.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_lunchorder">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
             <t t-call="report.external_layout">
                 <div class="page">
                     <div class="oe_structure"/>
diff --git a/addons/mrp/views/report_mrporder.xml b/addons/mrp/views/report_mrporder.xml
index 52390f095d3..3aa77ba1222 100644
--- a/addons/mrp/views/report_mrporder.xml
+++ b/addons/mrp/views/report_mrporder.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_mrporder">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.internal_layout">
                 <div class="page">
diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/views/report_mrprepairorder.xml
index 6ff7e7a5e92..0ea3f22167c 100644
--- a/addons/mrp_repair/views/report_mrprepairorder.xml
+++ b/addons/mrp_repair/views/report_mrprepairorder.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_mrprepairorder">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.external_layout">
                 <div class="page">
diff --git a/addons/purchase/views/report_purchaseorder.xml b/addons/purchase/views/report_purchaseorder.xml
index 4cad5285245..c03e535ff75 100644
--- a/addons/purchase/views/report_purchaseorder.xml
+++ b/addons/purchase/views/report_purchaseorder.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_purchaseorder">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.external_layout">
                 <div class="page">
diff --git a/addons/purchase/views/report_purchasequotation.xml b/addons/purchase/views/report_purchasequotation.xml
index 1a07da64dfc..68e8995ddd8 100644
--- a/addons/purchase/views/report_purchasequotation.xml
+++ b/addons/purchase/views/report_purchasequotation.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_purchasequotation">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.external_layout">
                 <div class="page">
diff --git a/addons/purchase_requisition/views/report_purchaserequisition.xml b/addons/purchase_requisition/views/report_purchaserequisition.xml
index 9568762b589..249558fbdb6 100644
--- a/addons/purchase_requisition/views/report_purchaserequisition.xml
+++ b/addons/purchase_requisition/views/report_purchaserequisition.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_purchaserequisitions">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.external_layout">
                 <div class="page">
diff --git a/addons/report/__openerp__.py b/addons/report/__openerp__.py
index 3da0d914476..199360e28c5 100644
--- a/addons/report/__openerp__.py
+++ b/addons/report/__openerp__.py
@@ -12,7 +12,7 @@ Report
         'views/layouts.xml',
         'views/paperformat_view.xml',
         'views/res_company_view.xml',
-        'data/paperformat_defaults.xml',
+        'data/report_paperformat.xml',
         'security/ir.model.access.csv',
     ],
     'js': [
diff --git a/addons/report/controllers/main.py b/addons/report/controllers/main.py
index e1ef6ba2b67..f5a16747cdf 100644
--- a/addons/report/controllers/main.py
+++ b/addons/report/controllers/main.py
@@ -36,7 +36,6 @@ try:
 except ImportError:
     import StringIO
 
-
 from pyPdf import PdfFileWriter, PdfFileReader
 from werkzeug.test import Client
 from werkzeug.wrappers import BaseResponse
diff --git a/addons/report/data/paperformat_defaults.xml b/addons/report/data/report_paperformat.xml
similarity index 90%
rename from addons/report/data/paperformat_defaults.xml
rename to addons/report/data/report_paperformat.xml
index 15d80ddc3fe..6b37c07d3b0 100644
--- a/addons/report/data/paperformat_defaults.xml
+++ b/addons/report/data/report_paperformat.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-        <record id="paperformat_euro" model="ir.actions.report.paperformat">
+        <record id="paperformat_euro" model="report.paperformat">
             <field name="name">European A4</field>
             <field name="default" eval="True" />
             <field name="format">A4</field>
@@ -17,7 +17,7 @@
             <field name="dpi">90</field>
         </record>
 
-        <record id="paperformat_us" model="ir.actions.report.paperformat">
+        <record id="paperformat_us" model="report.paperformat">
             <field name="name">US Letter</field>
             <field name="default" eval="True" />
             <field name="format">Letter</field>
diff --git a/addons/report/models/__init__.py b/addons/report/models/__init__.py
index 9a4a3ad87fc..7ffc9fe506a 100644
--- a/addons/report/models/__init__.py
+++ b/addons/report/models/__init__.py
@@ -1,3 +1,3 @@
 import report
-import paperformat
+import report_paperformat
 
diff --git a/addons/report/models/report.py b/addons/report/models/report.py
index 8bf6e779199..402fc63c840 100644
--- a/addons/report/models/report.py
+++ b/addons/report/models/report.py
@@ -62,6 +62,20 @@ class report(osv.Model):
                 d = obj._field.digits[1] or DEFAULT_DIGITS
         return d
 
+    def _get_lang_dict(self):
+        pool_lang = self.pool['res.lang']
+        lang = self.localcontext.get('lang', 'en_US') or 'en_US'
+        lang_ids = pool_lang.search(request.cr, request.uid, [('code', '=', lang)])[0]
+        lang_obj = pool_lang.browse(request.cr, request.uid, lang_ids)
+        lang_dict = {
+            'lang_obj': lang_obj,
+            'date_format': lang_obj.date_format,
+            'time_format': lang_obj.time_format
+        }
+        self.lang_dict.update(lang_dict)
+        self.default_lang[lang] = self.lang_dict.copy()
+        return True
+
     def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False, dp=False, currency_obj=False):
         """
             Assuming 'Account' decimal.precision=3:
@@ -116,20 +130,6 @@ class report(osv.Model):
                 res = '%s %s' % (currency_obj.symbol, res)
         return res
 
-    def _get_lang_dict(self):
-        pool_lang = self.pool['res.lang']
-        lang = self.localcontext.get('lang', 'en_US') or 'en_US'
-        lang_ids = pool_lang.search(request.cr, request.uid, [('code', '=', lang)])[0]
-        lang_obj = pool_lang.browse(request.cr, request.uid, lang_ids)
-        lang_dict = {
-            'lang_obj': lang_obj,
-            'date_format': lang_obj.date_format,
-            'time_format': lang_obj.time_format
-        }
-        self.lang_dict.update(lang_dict)
-        self.default_lang[lang] = self.lang_dict.copy()
-        return True
-
     def render(self, cr, uid, ids, template, values=None, context=None):
         if values is None:
             values = {}
@@ -228,8 +228,8 @@ class report(osv.Model):
         return action
 
     def eval_params(self, dict_param):
-        """Parse a dictionary generated from the webclient into a dictionary understandable by a
-        wizard controller.
+        """Parse a dictionary generated by the webclient (javascript) into a dictionary
+        understandable by a wizard controller (python).
         """
         for key, value in dict_param.iteritems():
             if value.lower() == 'false':
diff --git a/addons/report/models/paperformat.py b/addons/report/models/report_paperformat.py
similarity index 95%
rename from addons/report/models/paperformat.py
rename to addons/report/models/report_paperformat.py
index ea8cc4e921c..188de726f48 100644
--- a/addons/report/models/paperformat.py
+++ b/addons/report/models/report_paperformat.py
@@ -22,8 +22,8 @@
 from openerp.osv import osv, fields
 
 
-class actions_report_paperformat(osv.Model):
-    _name = "ir.actions.report.paperformat"
+class report_paperformat(osv.Model):
+    _name = "report.paperformat"
     _description = "Allows customization of a report."
 
     _columns = {'name': fields.char('Name', required=True),
@@ -98,10 +98,10 @@ class actions_report_paperformat(osv.Model):
 class res_company(osv.Model):
     _inherit = 'res.company'
 
-    _columns = {'paperformat_id': fields.many2one('ir.actions.report.paperformat', 'Paper format')}
+    _columns = {'paperformat_id': fields.many2one('report.paperformat', 'Paper format')}
 
 
 class ir_actions_report(osv.Model):
     _inherit = 'ir.actions.report.xml'
 
-    _columns = {'paperformat_id': fields.many2one('ir.actions.report.paperformat', 'Paper format')}
+    _columns = {'paperformat_id': fields.many2one('report.paperformat', 'Paper format')}
diff --git a/addons/report/security/ir.model.access.csv b/addons/report/security/ir.model.access.csv
index 2b0cf167b29..3e46d58154c 100644
--- a/addons/report/security/ir.model.access.csv
+++ b/addons/report/security/ir.model.access.csv
@@ -1,4 +1,4 @@
 "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"paperformat_access_portal","ir_actions_report_paperformat group_portal","model_ir_actions_report_paperformat",,1,0,0,0
-"paperformat_access_employee","ir_actions_report_paperformat group_hr_user","model_ir_actions_report_paperformat",,1,0,1,0
+"paperformat_access_portal","ir_actions_report_paperformat group_portal","model_report_paperformat",,1,0,0,0
+"paperformat_access_employee","ir_actions_report_paperformat group_hr_user","model_report_paperformat",,1,0,1,0
 "access_report","access_report","model_report",,1,1,1,1
diff --git a/addons/report/views/layouts.xml b/addons/report/views/layouts.xml
index 835d91fda12..5782359d389 100644
--- a/addons/report/views/layouts.xml
+++ b/addons/report/views/layouts.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
 <data>
-<template id="html_skeleton">
+<template id="html_container">
     &lt;!DOCTYPE html&gt;
     <html t-att-lang="lang and lang.replace('_', '-')"
           t-att-data-website-id="website.id if editable else None"
@@ -170,7 +170,7 @@
     <t t-raw="0" />
 </template>
 
-<template id="editor_head" inherit_id="report.html_skeleton" name="Editor" groups="base.group_website_publisher">
+<template id="editor_head" inherit_id="report.html_container" name="Editor" groups="base.group_website_publisher">
     <xpath expr="//body" position="attributes">
         <attribute name="style">padding-top: 51px;</attribute>
     </xpath>
diff --git a/addons/report/views/paperformat_view.xml b/addons/report/views/paperformat_view.xml
index dba1d433d92..67456f62032 100644
--- a/addons/report/views/paperformat_view.xml
+++ b/addons/report/views/paperformat_view.xml
@@ -18,7 +18,7 @@
 
         <record id="paperformat_view_tree" model="ir.ui.view">
             <field name="name">paper_format_view_tree</field>
-            <field name="model">ir.actions.report.paperformat</field>
+            <field name="model">report.paperformat</field>
             <field name="arch" type="xml">
                 <tree string="Paper format configuration">
                     <field name="name" />
@@ -28,7 +28,7 @@
         
         <record id="paperformat_view_form" model="ir.ui.view">
             <field name="name">paper_format_view_form</field>
-            <field name="model">ir.actions.report.paperformat</field>
+            <field name="model">report.paperformat</field>
             <field name="arch" type="xml">
                 <form string="Paper format configuration" version="7.0">
                     <group>
@@ -53,7 +53,7 @@
 
         <record id="paper_format_action" model="ir.actions.act_window">
             <field name="name">Paper Format General Configuration</field>
-            <field name="res_model">ir.actions.report.paperformat</field>
+            <field name="res_model">report.paperformat</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
         </record>
diff --git a/addons/sale/views/report_saleorder.xml b/addons/sale/views/report_saleorder.xml
index 2e7a47a98ab..c6f237e3ac3 100644
--- a/addons/sale/views/report_saleorder.xml
+++ b/addons/sale/views/report_saleorder.xml
@@ -2,7 +2,7 @@
 <openerp>
 <data>
 <template id="report_saleorder">
-    <t t-call="report.html_skeleton">
+    <t t-call="report.html_container">
         <t t-foreach="docs" t-as="o">
             <t t-call="report.external_layout">
                 <div class="page">
@@ -53,46 +53,42 @@
                         </div>
                     </div>
 
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <table class="table table-condensed">
-                                <thead>
-                                    <tr>
-                                        <th>Description</th>
-                                        <th>Taxes</th>
-                                        <th class="text-right">Quantity</th>
-                                        <th class="text-right">Unit Price</th>
-                                        <th groups="sale.group_discount_per_so_line">Disc.(%)</th>
-                                        <th class="text-right">Price</th>
-                                    </tr>
-                               </thead>
-                               <tbody>
-                                    <tr t-foreach="o.order_line" t-as="l">
-                                        <td>
-                                           <span  t-field="l.name"/>
-                                        </td>
-                                        <td>
-                                            <span t-esc="', '.join(map(lambda x: x.name, l.tax_id))"/>
-                                        </td>
-                                        <td class="text-right">
-                                            <span t-field="l.product_uom_qty"/>
-                                            <span groups="product.group_uom" t-field="l.product_uom"/>
-                                        </td>
-                                        <td class="text-right">
-                                            <span t-field="l.price_unit"/>
-                                        </td>
-                                        <td groups="sale.group_discount_per_so_line">
-                                            <span t-field="l.discount"/>
-                                        </td>
-                                        <td class="text-right">
-                                            <span t-field="l.price_subtotal"
-                                                t-field-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
-                                        </td>
-                                    </tr>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
+                    <table class="table table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Description</th>
+                                <th>Taxes</th>
+                                <th class="text-right">Quantity</th>
+                                <th class="text-right">Unit Price</th>
+                                <th groups="sale.group_discount_per_so_line">Disc.(%)</th>
+                                <th class="text-right">Price</th>
+                            </tr>
+                       </thead>
+                       <tbody>
+                            <tr t-foreach="o.order_line" t-as="l">
+                                <td>
+                                   <span  t-field="l.name"/>
+                                </td>
+                                <td>
+                                    <span t-esc="', '.join(map(lambda x: x.name, l.tax_id))"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="l.product_uom_qty"/>
+                                    <span groups="product.group_uom" t-field="l.product_uom"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="l.price_unit"/>
+                                </td>
+                                <td groups="sale.group_discount_per_so_line">
+                                    <span t-field="l.discount"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="l.price_subtotal"
+                                        t-field-options='{"widget": "monetary", "display_currency": "o.pricelist_id.currency_id"}'/>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
 
                     <div class="row">
                         <div class="col-xs-4 pull-right">