Géry Debongnie 62900fe01b Merge remote-tracking branch 'odoo/master' into master-inline-searchview-ged ...

Conflicts:
	addons/crm/crm_case_section_view.xml

2014-05-26 10:06:31 +02:00

..

i18n

Launchpad automatic translations update.

2014-04-22 08:24:59 +00:00

images

…

security

…

static

[IMP] missing file

2014-05-23 09:55:24 +02:00

test

[FIX] improve yml test case

2013-10-15 14:10:22 +05:30

views

[IMP] bundlify addons (except website)

2014-04-24 19:21:29 +02:00

__init__.py

[IMP] hr.department cleanup

2014-01-29 01:29:13 +01:00

__openerp__.py

[MERGE] upstream

2014-04-29 17:41:04 +02:00

hr_data.xml

[IMP] Backport one feature from website: this feature allows to specify a file

2014-01-09 16:45:50 +01:00

hr_demo.xml

[FIX] hr: demo data: removed color definition as this field is defind in hr_recruitment, not in hr

2014-02-11 13:05:51 +01:00

hr_installer.xml

…

hr_view.xml

[IMP] replace all 'Group By...' by 'Group By'

2014-05-22 11:44:35 +02:00

hr.py

[MERGE] forward port of branch saas-3 up to revid 9450 chs@openerp.com-20140507153348-g2qw61dkxvps13br

2014-05-07 18:00:23 +02:00

mail_hr_view.xml

…

res_config_view.xml

[MRG] merge with lp:openobject-addons

2014-02-10 12:51:00 +05:30

res_config.py

…

res_users_view.xml

…

res_users.py

[FIX] hr: posting on the user should not fail when it is

2013-12-17 09:47:28 +01:00