[0.85] #4385: Consumable


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21513 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] #4385: Cartridge


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