Merge lp:~openerp-dev/openobject-addons/6.1-opw-585243-ado into lp:openobject-addons/6.1

Proposed by Amit Dodiya (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/6.1-opw-585243-ado
Merge into: lp:openobject-addons/6.1
Diff against target: 21 lines (+2/-2)
1 file modified
hr_holidays/__openerp__.py (+2/-2)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/6.1-opw-585243-ado
Reviewer Review Type Date Requested Status
Xavier ALT Pending
Naresh(OpenERP) Pending
Review via email: mp+147043@code.launchpad.net

Description of the change

Hello,

"[FIX] move hr_holidays_data file to demo_xml from update_xml becuase when we create database without demo data the record for leave type is created from this file"

Issue: The holidays type is always be created with new database(with demo data and without demo data).

It should be in demo data not directly in the installation data, So it will only be created in database if we checked demo data option while creating database.

Regards,
Amit Dodiya

To post a comment you must log in.

Unmerged revisions

7147. By Amit Dodiya (OpenERP)

[FIX] move hr_holidays_data file to demo_xml from update_xml becuase when we create database without demo data the record for leave type is created from this file

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_holidays/__openerp__.py'
2--- hr_holidays/__openerp__.py 2012-01-31 13:36:57 +0000
3+++ hr_holidays/__openerp__.py 2013-02-07 09:06:22 +0000
4@@ -58,7 +58,6 @@
5 'security/ir_rule.xml',
6 'hr_holidays_workflow.xml',
7 'hr_holidays_view.xml',
8- 'hr_holidays_data.xml',
9 'hr_holidays_wizard.xml',
10 'hr_holidays_report.xml',
11 'report/hr_holidays_report_view.xml',
12@@ -68,7 +67,8 @@
13 'board_hr_holidays_view.xml',
14 'board_hr_manager_holidays_view.xml',
15 ],
16- 'demo_xml': ['hr_holidays_demo.xml',],
17+ 'demo_xml': ['hr_holidays_data.xml',
18+ 'hr_holidays_demo.xml',],
19 'test': ['test/test_hr_holiday.yml',
20 'test/hr_holidays_report.yml',
21 ],