[-] BO : Fix bug #PSCFI-6640 Admingenerator refactoring following svn17327