[MERGE] from trunk

bzr revid: chm@openerp.com-20140423154852-gzegxqrzb2sj01zl

53 files changed, 191 insertions, 444 deletions

diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py
index f149bc0c7c6..873da978165 100644
--- a/addons/hr_expense/__openerp__.py
+++ b/addons/hr_expense/__openerp__.py
@@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'],
-    'depends': ['hr', 'account_accountant'],
+    'depends': ['hr', 'account_accountant', 'report'],
     'data': [
         'security/ir.model.access.csv',
         'hr_expense_data.xml',
@@ -59,6 +59,7 @@ This module also uses analytic accounting and is compatible with the invoice on
         'report/hr_expense_report_view.xml',
         'board_hr_expense_view.xml',
         'hr_expense_installer_view.xml',
+        'views/report_expense.xml',
     ],
     'demo': ['hr_expense_demo.xml'],
     'test': [
@@ -69,4 +70,5 @@ This module also uses analytic accounting and is compatible with the invoice on
     'auto_install': False,
     'application': True,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_expense/hr_expense_report.xml b/addons/hr_expense/hr_expense_report.xml
index 5defbfec330..ab3200e5a54 100644
--- a/addons/hr_expense/hr_expense_report.xml
+++ b/addons/hr_expense/hr_expense_report.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <report auto="False" id="hr_expenses" model="hr.expense.expense" name="hr.expense" rml="hr_expense/report/expense.rml" string="HR expenses"/>
-
+        <report
+            id="action_report_hr_expense"
+            string="HR Expense"
+            model="hr.expense.expense"
+            report_type="qweb-pdf"
+            name="hr_expense.report_expense"
+            file="hr_expense.report_expense"
+        />
     </data>
 </openerp>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 33f737aa66e..457d8f33a07 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -203,7 +203,7 @@
         </record>
 
         <record id="hr_expense_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
+            <field name="name">Expense Categories</field>
             <field name="res_model">product.product</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
diff --git a/addons/hr_expense/i18n/ar.po b/addons/hr_expense/i18n/ar.po
index 4de114c7d1a..544780a5f4c 100644
--- a/addons/hr_expense/i18n/ar.po
+++ b/addons/hr_expense/i18n/ar.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:06+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/bg.po b/addons/hr_expense/i18n/bg.po
index 4a3e42cf024..77fc16fc656 100644
--- a/addons/hr_expense/i18n/bg.po
+++ b/addons/hr_expense/i18n/bg.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:06+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/bs.po b/addons/hr_expense/i18n/bs.po
index e383d665097..9d0ac25317d 100644
--- a/addons/hr_expense/i18n/bs.po
+++ b/addons/hr_expense/i18n/bs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:06+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/ca.po b/addons/hr_expense/i18n/ca.po
index af4256a0497..26062976b93 100644
--- a/addons/hr_expense/i18n/ca.po
+++ b/addons/hr_expense/i18n/ca.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po
index 16153e3903a..c2d1b05ba21 100644
--- a/addons/hr_expense/i18n/cs.po
+++ b/addons/hr_expense/i18n/cs.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/da.po b/addons/hr_expense/i18n/da.po
index 99e25f2b2d3..6013b21021e 100644
--- a/addons/hr_expense/i18n/da.po
+++ b/addons/hr_expense/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/de.po b/addons/hr_expense/i18n/de.po
index 9fb94eabe85..40efc86cd41 100644
--- a/addons/hr_expense/i18n/de.po
+++ b/addons/hr_expense/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/el.po b/addons/hr_expense/i18n/el.po
index 3ba908df17c..04ab3fc67be 100644
--- a/addons/hr_expense/i18n/el.po
+++ b/addons/hr_expense/i18n/el.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Language: Greek\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff --git a/addons/hr_expense/i18n/es.po b/addons/hr_expense/i18n/es.po
index 063a429ada3..23c0dcb38c1 100644
--- a/addons/hr_expense/i18n/es.po
+++ b/addons/hr_expense/i18n/es.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es_AR.po b/addons/hr_expense/i18n/es_AR.po
index d23f59aaba0..7a8c72cc8a8 100644
--- a/addons/hr_expense/i18n/es_AR.po
+++ b/addons/hr_expense/i18n/es_AR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es_CR.po b/addons/hr_expense/i18n/es_CR.po
index da34f2284fa..b16ce035090 100644
--- a/addons/hr_expense/i18n/es_CR.po
+++ b/addons/hr_expense/i18n/es_CR.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/es_EC.po b/addons/hr_expense/i18n/es_EC.po
index 5699f9212f1..e48d9970df4 100644
--- a/addons/hr_expense/i18n/es_EC.po
+++ b/addons/hr_expense/i18n/es_EC.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/et.po b/addons/hr_expense/i18n/et.po
index a019b1e959e..6c13a9d9dfa 100644
--- a/addons/hr_expense/i18n/et.po
+++ b/addons/hr_expense/i18n/et.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/fi.po b/addons/hr_expense/i18n/fi.po
index cd5a6fe3e2f..8db999d087b 100644
--- a/addons/hr_expense/i18n/fi.po
+++ b/addons/hr_expense/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/fr.po b/addons/hr_expense/i18n/fr.po
index f1734c09795..1e2bdca70e0 100644
--- a/addons/hr_expense/i18n/fr.po
+++ b/addons/hr_expense/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/hr.po b/addons/hr_expense/i18n/hr.po
index b5fe22c26c6..150d83c7d02 100644
--- a/addons/hr_expense/i18n/hr.po
+++ b/addons/hr_expense/i18n/hr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/hu.po b/addons/hr_expense/i18n/hu.po
index f13c63f1cc8..0847fe77a9e 100644
--- a/addons/hr_expense/i18n/hu.po
+++ b/addons/hr_expense/i18n/hu.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/id.po b/addons/hr_expense/i18n/id.po
index 56da1429ca4..82a5a2dc74b 100644
--- a/addons/hr_expense/i18n/id.po
+++ b/addons/hr_expense/i18n/id.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/it.po b/addons/hr_expense/i18n/it.po
index 03976d2cabf..c2cd97b8edf 100644
--- a/addons/hr_expense/i18n/it.po
+++ b/addons/hr_expense/i18n/it.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/ja.po b/addons/hr_expense/i18n/ja.po
index bc30e6598b2..5dcd0eafbe9 100644
--- a/addons/hr_expense/i18n/ja.po
+++ b/addons/hr_expense/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/ko.po b/addons/hr_expense/i18n/ko.po
index d748170ea70..f138b35c839 100644
--- a/addons/hr_expense/i18n/ko.po
+++ b/addons/hr_expense/i18n/ko.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/lt.po b/addons/hr_expense/i18n/lt.po
index ab2940c4bc8..c5c5f28e5e1 100644
--- a/addons/hr_expense/i18n/lt.po
+++ b/addons/hr_expense/i18n/lt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/lv.po b/addons/hr_expense/i18n/lv.po
index b03b0ffc133..a15780965e6 100644
--- a/addons/hr_expense/i18n/lv.po
+++ b/addons/hr_expense/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/mk.po b/addons/hr_expense/i18n/mk.po
index db547f6ca27..bbb479be7c2 100644
--- a/addons/hr_expense/i18n/mk.po
+++ b/addons/hr_expense/i18n/mk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po
index 131c6f9ff0c..8fada861433 100644
--- a/addons/hr_expense/i18n/mn.po
+++ b/addons/hr_expense/i18n/mn.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/nb.po b/addons/hr_expense/i18n/nb.po
index 543113db1d2..8e5d378edf3 100644
--- a/addons/hr_expense/i18n/nb.po
+++ b/addons/hr_expense/i18n/nb.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/nl.po b/addons/hr_expense/i18n/nl.po
index 8792b65d880..6e0c5e57576 100644
--- a/addons/hr_expense/i18n/nl.po
+++ b/addons/hr_expense/i18n/nl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/nl_BE.po b/addons/hr_expense/i18n/nl_BE.po
index 1c885ff2be8..67282a31b2e 100644
--- a/addons/hr_expense/i18n/nl_BE.po
+++ b/addons/hr_expense/i18n/nl_BE.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/pl.po b/addons/hr_expense/i18n/pl.po
index d72a2546257..9c6c804dc7c 100644
--- a/addons/hr_expense/i18n/pl.po
+++ b/addons/hr_expense/i18n/pl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/pt.po b/addons/hr_expense/i18n/pt.po
index 2dd432e16b5..d8b4edc358c 100644
--- a/addons/hr_expense/i18n/pt.po
+++ b/addons/hr_expense/i18n/pt.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/pt_BR.po b/addons/hr_expense/i18n/pt_BR.po
index 62b76accde4..e531793c6f1 100644
--- a/addons/hr_expense/i18n/pt_BR.po
+++ b/addons/hr_expense/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/ro.po b/addons/hr_expense/i18n/ro.po
index 69dd17c2de7..12e9f7e1fa0 100644
--- a/addons/hr_expense/i18n/ro.po
+++ b/addons/hr_expense/i18n/ro.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/ru.po b/addons/hr_expense/i18n/ru.po
index a73a4f2b67c..1c1567cd328 100644
--- a/addons/hr_expense/i18n/ru.po
+++ b/addons/hr_expense/i18n/ru.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/sl.po b/addons/hr_expense/i18n/sl.po
index 14d7e92a381..b9ed618eae5 100644
--- a/addons/hr_expense/i18n/sl.po
+++ b/addons/hr_expense/i18n/sl.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/sq.po b/addons/hr_expense/i18n/sq.po
index 1e34875fa2a..8c6f9cd886a 100644
--- a/addons/hr_expense/i18n/sq.po
+++ b/addons/hr_expense/i18n/sq.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:41+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:06+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/sr.po b/addons/hr_expense/i18n/sr.po
index a65da5191b0..13d1a3b5139 100644
--- a/addons/hr_expense/i18n/sr.po
+++ b/addons/hr_expense/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/sr@latin.po b/addons/hr_expense/i18n/sr@latin.po
index bec1932616b..0affd3a8b38 100644
--- a/addons/hr_expense/i18n/sr@latin.po
+++ b/addons/hr_expense/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:08+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/sv.po b/addons/hr_expense/i18n/sv.po
index e75a4a35e72..1eb66900a30 100644
--- a/addons/hr_expense/i18n/sv.po
+++ b/addons/hr_expense/i18n/sv.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/th.po b/addons/hr_expense/i18n/th.po
index cb8a642f7a3..60064c8be9a 100644
--- a/addons/hr_expense/i18n/th.po
+++ b/addons/hr_expense/i18n/th.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/tlh.po b/addons/hr_expense/i18n/tlh.po
index 12f9cf01568..c2d02a99bf7 100644
--- a/addons/hr_expense/i18n/tlh.po
+++ b/addons/hr_expense/i18n/tlh.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/tr.po b/addons/hr_expense/i18n/tr.po
index ad1baeecd73..d280eea6b84 100644
--- a/addons/hr_expense/i18n/tr.po
+++ b/addons/hr_expense/i18n/tr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/uk.po b/addons/hr_expense/i18n/uk.po
index 2091c1432b7..ff09878bace 100644
--- a/addons/hr_expense/i18n/uk.po
+++ b/addons/hr_expense/i18n/uk.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/vi.po b/addons/hr_expense/i18n/vi.po
index ba1860c6176..f4daf49ec59 100644
--- a/addons/hr_expense/i18n/vi.po
+++ b/addons/hr_expense/i18n/vi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po
index 8867dee7236..900385f2457 100644
--- a/addons/hr_expense/i18n/zh_CN.po
+++ b/addons/hr_expense/i18n/zh_CN.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/i18n/zh_TW.po b/addons/hr_expense/i18n/zh_TW.po
index 9d5042a32f4..ee4e3a19e40 100644
--- a/addons/hr_expense/i18n/zh_TW.po
+++ b/addons/hr_expense/i18n/zh_TW.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-12 07:42+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2014-04-22 07:07+0000\n"
+"X-Generator: Launchpad (build 16985)\n"
 
 #. module: hr_expense
 #: view:hr.expense.expense:0
diff --git a/addons/hr_expense/report/__init__.py b/addons/hr_expense/report/__init__.py
index ad0c48a0819..9ec287fb9c7 100644
--- a/addons/hr_expense/report/__init__.py
+++ b/addons/hr_expense/report/__init__.py
@@ -19,8 +19,6 @@
 #
 ##############################################################################
 
-import expense
 import hr_expense_report
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_expense/report/expense.py b/addons/hr_expense/report/expense.py
deleted file mode 100644
index a6898204741..00000000000
--- a/addons/hr_expense/report/expense.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
-#
-##############################################################################
-
-import datetime
-import time
-
-from openerp.report import report_sxw
-
-class expense(report_sxw.rml_parse):
-
-    def __init__(self, cr, uid, name, context):
-        super(expense, self).__init__(cr, uid, name, context=context)
-        self.localcontext.update({'time': time, })
-
-report_sxw.report_sxw('report.hr.expense', 'hr.expense.expense', 'addons/hr_expense/report/expense.rml',parser=expense)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/hr_expense/report/expense.rml b/addons/hr_expense/report/expense.rml
deleted file mode 100644
index 3e07516c01b..00000000000
--- a/addons/hr_expense/report/expense.rml
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0"?>
-<document filename="test.pdf">
-  <template title="Expenses" author="OpenERP S.A. (sales@openerp.com)" allowSplitting="20">
-    <pageTemplate id="first">
-      <frame id="first" x1="16.0" y1="57.0" width="522" height="728"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_employee_ref_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_employee_ref_content">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="0,0" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="1,0" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="2,0" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_hr_expense_line_header">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_expense_line">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="5,-1" stop="5,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table_Final_total">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#ffffff" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="Footer" fontName="Helvetica"/>
-    <paraStyle name="Horizontal Line" fontName="Helvetica" fontSize="6.0" leading="8" spaceBefore="0.0" spaceAfter="14.0"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Heading 9" fontName="Helvetica-Bold" fontSize="75%" leading="NaN" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_8" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Centre" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Right" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_address" fontName="Helvetica" fontSize="10.0" leading="13" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Bold_centre_9" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_9_bold_right" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_italic_8" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-  <pto>
-  <pto_header>
-    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-  </pto_header>
-    <para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_header_Centre">HR Expenses</para>
-    <para style="terp_tblheader_General_Centre">
-      <font face="Helvetica" size="9.0">[[ o.name or '' ]]</font>
-    </para>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="130.5,130.5,130.5,130.5" style="Table_employee_ref_header">
-      <tr>
-        <td>
-          <para style="terp_tblheader_General_Centre">Employee</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Description</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_General_Centre">Validated By</para>
-        </td>
-      </tr>
-    </blockTable>
-    <blockTable colWidths="130.5,130.5,130.5,130.5" style="Table_employee_ref_content">
-      <tr>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.employee_id.name ]] </para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ formatLang(o.date,date=True) ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.name ]]</para>
-        </td>
-        <td>
-          <para style="terp_default_Centre_8">[[ o.user_valid.name ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_8">
-      <font color="white"> </font>
-    </para>
-    <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_hr_expense_line_header">
-      <tr>
-        <td>
-          <para style="terp_tblheader_Details">Date</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Name</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Ref.</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Unit Price</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Qty</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">Price</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_1">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_8">[[ repeatIn(o.line_ids,'line') ]]</para>
-      <blockTable colWidths="60.0,200.0,50.0,70.0,70.0,85.0" style="Table_expense_line">
-        <tr>
-          <td>
-            <para style="terp_default_9">[[ formatLang(line.date_value,date=True) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line.name or '' ]] [[ line.description or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">[[ line.ref or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.unit_amount) ]] </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.unit_quantity) ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">[[ formatLang(line.total_amount, currency_obj=o.currency_id) ]] </para>
-          </td>
-        </tr>
-        <tr>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_italic_8">[[ line.analytic_account and line.analytic_account.complete_name or removeParentNode('tr') ]]</para>
-          </td>
-          <td>
-            <para style="terp_default_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-          <td>
-            <para style="terp_default_Right_9">
-              <font color="white"> </font>
-            </para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-    <blockTable colWidths="365.0,70.0,100.0" style="Table_Final_total">
-      <tr>
-        <td>
-          <para style="terp_default_8">
-            <font color="white"> </font>
-          </para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details">Total:</para>
-        </td>
-        <td>
-          <para style="terp_tblheader_Details_Right">[[ formatLang(o.amount, currency_obj=o.currency_id) ]]</para>
-        </td>
-      </tr>
-    </blockTable>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">[[ o.note or '' ]]</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">Certified honest and conform,</para>
-    <para style="terp_default_9">(Date and signature)</para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">
-      <font color="white"> </font>
-    </para>
-    <para style="terp_default_9">This document must be dated and signed for reimbursement</para>
-  </pto>
-  </story>
-</document>
diff --git a/addons/hr_expense/test/expense_process.yml b/addons/hr_expense/test/expense_process.yml
index e9339e24a95..b3e19714c74 100644
--- a/addons/hr_expense/test/expense_process.yml
+++ b/addons/hr_expense/test/expense_process.yml
@@ -32,11 +32,3 @@
   !python {model: hr.expense.expense}: |
     duplicate_id = self.copy(cr, uid, ref('sep_expenses'), context=context)
     self.expense_canceled(cr, uid, [duplicate_id])
--
-  I print a report of the expenses.
-- 
-  !python {model: hr.expense.expense}: |
-    data, format = self.print_report(cr, uid, [ref('hr_expense.sep_expenses')], 'hr.expense', {}, {})
-    if openerp.tools.config['test_report_directory']:
-        import os
-        file(os.path.join(openerp.tools.config['test_report_directory'], 'hr_expense-report.'+format), 'wb+').write(data)
diff --git a/addons/hr_expense/views/report_expense.xml b/addons/hr_expense/views/report_expense.xml
new file mode 100644
index 00000000000..5bb2e1dd8e2
--- /dev/null
+++ b/addons/hr_expense/views/report_expense.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+<template id="report_expense">
+    <t t-call="report.html_container">
+        <t t-foreach="docs" t-as="o">
+            <t t-call="report.external_layout">
+                <div class="page">
+                    <h2>HR Expenses</h2>
+
+                    <div class="row mt32 mb32">
+                        <div class="col-xs-3">
+                            <strong>Employee:</strong>
+                            <p t-field="o.employee_id.name"/>
+                        </div>
+                        <div class="col-xs-3">
+                            <strong>Date:</strong>
+                            <p t-field="o.date"/>
+                        </div>
+                        <div class="col-xs-3">
+                            <strong>Description:</strong>
+                            <p t-field="o.name"/>
+                        </div>
+                        <div class="col-xs-3">
+                            <strong>Validated By:</strong>
+                            <p t-field="o.user_valid"/>
+                        </div>
+                    </div>
+
+                    <table class="table table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Date</th>
+                                <th>Name</th>
+                                <th class="text-center">Ref.</th>
+                                <th>Unit Price</th>
+                                <th class="text-center">Qty</th>
+                                <th class="text-right">Price</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr t-foreach="o.line_ids" t-as="line">
+                                <td><span t-field="line.date_value"/></td>
+                                <td>
+                                    <span t-field="line.name"/> 
+                                    <span t-field="line.description"/><br/>
+                                    <span t-field="line.analytic_account.complete_name"/>
+                                </td>
+                                <td style="text-center">
+                                    <span t-field="line.ref"/>
+                                </td>
+                                <td>
+                                    <span t-field="line.unit_amount"/>
+                                </td>
+                                <td class="text-center">
+                                    <span t-field="line.unit_quantity"/>
+                                </td>
+                                <td class="text-right">
+                                    <span t-field="line.total_amount"
+                                        t-field-options='{"widget": "monetary", "display_currency":"o.currency_id"}'/>
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table>
+
+                    <div class="row">
+                        <div class="col-xs-4 pull-right">
+                            <table class="table table-condensed">
+                                <tr class="border-black">
+                                    <td><strong>Total</strong></td>
+                                    <td class="text-right">
+                                        <span t-field="o.amount"
+                                            t-field-options='{"widget": "monetary", "display_currency": "o.currency_id"}'/>
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                    </div>
+
+                    <p t-field="o.note"/>
+                    <p>Certified honest and conform,<br/>(Date and signature).<br/><br/></p>
+                    <p>This document must be dated and signed for reimbursement.</p>
+                </div>
+            </t>
+        </t>
+    </t>
+</template>
+</data>
+</openerp>