Fix sql error. references #2492
Fix sql error. references #2492
Enhance inventory. references #2490

Conflicts:
	inc/inventorycomputerlib.class.php