Richard Mathot (OpenERP) 55a53ec9ef [MER] Resolving conflicts ...

bzr revid: rim@openerp.com-20131022072438-1aucyd1epcunohd1

2013-10-22 09:24:38 +02:00

..

i18n

Launchpad automatic translations update.

2013-09-12 06:40:18 +00:00

report

Reverting to old *non working* hr_evaluation, still not working with new survey

2013-10-21 17:12:20 +02:00

security

Reverting to old *non working* hr_evaluation, still not working with new survey

2013-10-21 17:12:20 +02:00

specifications

…

static/description

[IMP] move html module description and icon

2013-06-28 12:04:41 +02:00

test

[FIX] Fixing hr_evaluation dependencies to survey's models

2013-10-21 15:23:31 +02:00

__init__.py

[FIX] incorrect import, prepare for wizard removal

2012-12-09 19:22:37 +01:00

__openerp__.py

[cherry picking] manual merge of lp:~openerp-dev/openobject-addons/trunk-screenshots-main-modules-vba

2013-01-31 19:41:41 +01:00

board_hr_evaluation_view.xml

Reverting to old *non working* hr_evaluation, still not working with new survey

2013-10-21 17:12:20 +02:00

hr_evaluation_data.xml

[FIX] Fixing hr_evaluation dependencies to survey's models

2013-10-21 15:23:31 +02:00

hr_evaluation_demo.xml

…

hr_evaluation_installer.xml

[IMP] introducing new file type: html

2012-08-04 16:35:56 +02:00

hr_evaluation_view.xml

[MER] Resolving conflicts

2013-10-22 09:24:38 +02:00

hr_evaluation.py

[MER] Resolving conflicts

2013-10-22 09:24:38 +02:00