Merge lp:~simonsp/ocsinventory-ocsreports/fix_missing_doublons_when_no_mac into lp:ocsinventory-ocsreports/stable-1.3

[Paul W. Simons]

[Paul W. Simons (simonsp)]

Changed an sql statement in doublons.php so that if a computer does not have a mac address, it does not disappear from hostname or serial listings. Currently if a computer does not have a mac address, and it had the same serial or hostname as a computer that had a mac address, only that computer would show up in the doublons report. It was then impossible to merge a computer that did not have a network adapter before, and has one now.

[Gonéri Le Bouder (goneri)]

Thanks

=== modified file 'doublons.php'
--- doublons.php	2009-10-06 23:05:12 +0000
+++ doublons.php	2010-01-27 17:24:19 +0000
@@ -23,7 +23,10 @@
 }
 
 $fromBase="hardware h LEFT JOIN accountinfo a ON a.hardware_id = h.id LEFT JOIN bios b ON b.hardware_id = h.id LEFT OUTER JOIN networks n1 on b.hardware_id=n1.hardware_id";
-$whereBase="n1.hardware_id = h.id ";
+//This statement below is changed from n1.hardware_id = h.id to h.id 
+//IS NOT NULL to prevent an issue where pc's without mac address' do not show 
+//up under serials or hostame only reports.
+$whereBase="h.id IS NOT NULL";
 if( $mesMachines ) {
 	$whereBase .= "AND $mesMachines";
 }