[0.85] fix field unicity / infocom


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20341 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] clean code


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20343 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] minro fix thks orthagh


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20344 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] fix cartridge / consumable link


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20346 35612d4c-9d10-0410-837c-bf9dd1be60d7
Merge branch '0.85/work' of github.com:fusinv/glpi into 0.85/ldap/jpegphoto