From 1eca639f6eaaf3d1dcd1850aca05f4b613371016 Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Wed, 5 Sep 2012 12:54:47 +0200
Subject: [PATCH] [FIX] OPW 578410: hr_timesheet_invoice: avoid overriding
 default data with demo data, as it breaks translations for nodemo databases

bzr revid: odo@openerp.com-20120905105447-ly01eat4o4407d09
---
 .../hr_timesheet_invoice_data.xml                    | 12 ++++++------
 .../hr_timesheet_invoice_demo.xml                    | 10 ----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
index 462888e0b39..8ac4adb1ee4 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
@@ -7,14 +7,14 @@
             <field name="factor">0.0</field>
         </record>
         <record id="timesheet_invoice_factor2" model="hr_timesheet_invoice.factor">
-            <field name="name">90%</field>
-            <field name="customer_name">90%</field>
-            <field name="factor">10.0</field>
+            <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">50%</field>
-            <field name="customer_name">50%</field>
-            <field name="factor">50.0</field>
+            <field name="name">Gratis</field>
+            <field name="customer_name">Offered developments</field>
+            <field name="factor">100.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 ee6bdf23538..cd59f7a5e7f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data noupdate="1">
-        <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>