[MERGE] Merge hr changes

Browse Source

bzr revid: sbh@tinyerp.com-20120613084745-wbwnb43okod66qal

...

This commit is contained in:

Sbh (Openerp) 2012-06-13 14:17:45 +05:30

parent 7e3e6cf9e6 fe55d53961

commit af25c37e8b

1 changed files with 2 additions and 2 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

4

addons/hr/hr_demo.xml

View File

File diff suppressed because one or more lines are too long