Don't import classes twice.
Set constant name to upper case to respect naming convention.
Little code layout changes.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9434 20353a03-c40f-0410-a6d1-a30d3c3de9de