fix order between check and variable definition
remove useless check in catalog as property is never set on document and check is made later on line

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