Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ... bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk		2014-01-16 11:39:10 +01:00
..
doc	[DOC] hr_holidays: added basic changelog	2013-08-09 16:50:26 +02:00
i18n	Launchpad automatic translations update.	2014-01-19 05:26:09 +00:00
process	[REM] more nonsensical @model + @ref	2013-04-29 14:52:17 +02:00
report	[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb	2013-12-24 12:24:07 +01:00
security	[REF] Rename model crm.meeting into calendar.event	2014-01-15 10:38:05 +01:00
static/description	[REF] Removing the quick create overriding for hr_holiday - that was a test/sample not used	2014-01-13 18:47:01 +01:00
test	[IMP] hr_holidays: workflow update	2013-08-05 13:30:23 +02:00
tests	[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.	2014-01-16 11:39:10 +01:00
wizard	[REF] removed explicit model instanciations.	2013-04-15 12:23:49 +02:00
__init__.py	merged with trunk	2010-12-30 15:28:09 +05:30
__openerp__.py	[TYPO] Rename base_calendar into calendar	2013-12-19 15:47:39 +01:00
board_hr_holidays_view.xml	[IMP]Remove type field from the whole hr module	2012-08-08 18:18:39 +05:30
hr_bel_holidays_2008.xml	merged with trunk	2010-12-30 15:28:09 +05:30
hr_holidays.py	[REF] Rename model crm.meeting into calendar.event	2014-01-15 10:38:05 +01:00
hr_holidays_data.xml	[IMP] hr_holidays: workflow update	2013-08-05 13:30:23 +02:00
hr_holidays_demo.xml	rb r2g.	2013-11-18 09:45:32 +01:00
hr_holidays_report.xml	[IMP]hr:change report name and Leave instead of Holiday	2012-06-07 18:51:46 +05:30
hr_holidays_view.xml	[REF] Rename model crm.meeting into calendar.event	2014-01-15 10:38:05 +01:00
hr_holidays_workflow.xml	hr_holidays: force refuse.@flow_stop to False to correctly update existing databases	2013-10-21 17:51:20 +02:00