diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py
index f45490867c2..dfcda5ec534 100644
--- a/addons/hr_timesheet_invoice/__openerp__.py
+++ b/addons/hr_timesheet_invoice/__openerp__.py
@@ -31,9 +31,9 @@ reports, eso.""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
     'depends': ['account', 'hr_timesheet'],
-    'init_xml': [],
-    'update_xml': [
+    'data': [
         'security/ir.model.access.csv',
+        'hr_timesheet_invoice_data.xml',
         'hr_timesheet_invoice_view.xml',
         'hr_timesheet_invoice_wizard.xml',
         'hr_timesheet_invoice_report.xml',
@@ -45,11 +45,12 @@ reports, eso.""",
         'wizard/hr_timesheet_invoice_create_final_view.xml',
         'board_hr_timesheet_invoice.xml',
     ],
-    'demo_xml': ['hr_timesheet_invoice_demo.xml',
-                 ],
+    'demo': [
+        'hr_timesheet_invoice_demo.xml',
+    ],
     'test': ['test/test_hr_timesheet_invoice.yml',
              'test/hr_timesheet_invoice_report.yml',
-             ],             
+             ],
     'installable': True,
     'active': False,
     'certificate': '0056091842381',
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
new file mode 100644
index 00000000000..a81af0788b6
--- /dev/null
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
+            <field name="name">Yes (100%)</field>
+            <field name="customer_name">100%</field>
+            <field name="factor">0.0</field>
+        </record>
+    </data>
+</openerp>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index adc9e47b033..ee6bdf23538 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,36 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        
-        <record id="timesheet_invoice_factor1" model="hr_timesheet_invoice.factor">
-            <field name="name">100%</field>
-            <field name="customer_name"/>
-            <field name="factor">0.0</field>
-        </record>
-        
         <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
             <field name="name">50%</field>
             <field name="customer_name">50% Discount</field>
             <field name="factor">50.0</field>
         </record>
-        
         <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
             <field name="name">Gratis</field>
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
-        
         <record id="account.analytic_sednacom" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
         <record id="account.analytic_thymbra" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
         <record id="account.analytic_partners_camp_to_camp" model="account.analytic.account">
             <field name="to_invoice" ref="timesheet_invoice_factor1"/>
         </record>
-        
     </data>
 </openerp>