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

..

i18n

Launchpad automatic translations update.

2013-12-31 04:47:45 +00:00

images

…

process

…

security

…

static

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

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

test

[FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login)

2013-10-03 16:32:34 +02:00

__init__.py

…

__openerp__.py

[MERGE]sync with trunk

2013-06-26 16:40:29 +05:30

board_hr_view.xml

…

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

[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

hr_department_view.xml

…

hr_department.py

…

hr_installer.xml

…

hr_view.xml

[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3

2013-11-25 16:00:54 +01:00

hr.py

[MERGE] sync with trunk

2013-12-02 16:09:25 +01:00

mail_hr_view.xml

…

res_config_view.xml

…

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