fixes issue #52 and more#59

yustas147 wants to merge 2 commits intoOCA:8.0OCA/department:8.0from

yustas147:8.0yustas147/department:8.0Copy head branch name to clipboard