[MERGE] changed name of employee and users

Browse Source

bzr revid: fp@openerp.com-20130312125303-clm404ifoh31wgef

...

This commit is contained in:

Fabien Pinckaers 2013-03-12 13:53:03 +01:00

parent 97822007e0 cd3b190693

commit 28e724ab1f

2 changed files with 29 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48

addons/hr/hr_demo.xml

View File

File diff suppressed because one or more lines are too long

10

addons/project_timesheet/project_timesheet_demo.xml

View File

File diff suppressed because one or more lines are too long