pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] OPW 578410: hr_timesheet_invoice: avoid overriding default data with demo data, as it breaks translations for nodemo databases

Browse Source 
bzr revid: odo@openerp.com-20120905125815-1hlev4p5yb0l307o
This commit is contained in:
Olivier Dony
2012-09-05 14:58:15 +02:00
parent ad0007135a 1eca639f6e
commit dda5310057
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_invoice/hr_timesheet_invoice_data.xml
+6 -6
View File
@@ -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>
addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
-10
View File
@@ -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>