addOrRestoreFromTrash search in tree entity and manufacturer (so, only one request needed with addsoftware) - see #3702

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@20100 35612d4c-9d10-0410-837c-bf9dd1be60d7