Add an option to enable monitor serialnumber partial matching (#2865)

* Add an option to enable monitor serialnumber partial matching
Option is disabled by default

* Try monitor serial partial match only if the serial number has at least 4 chars

inc/config.class.php

@@ -112,6 +112,7 @@ function initConfigModule($getOnly = false) {
       $input['import_registry']        = 1;
       $input['import_process']         = 1;
       $input['import_vm']              = 1;
+      $input['import_monitor_on_partial_sn'] = 0;
       $input['component_processor']    = 1;
       $input['component_memory']       = 1;
       $input['component_harddrive']    = 1;
@@ -591,7 +592,12 @@ static function showFormInventory($options = []) {
       echo "<td>";
       Dropdown::showYesNo("manage_osname", $pfConfig->getValue('manage_osname'));
       echo "</td>";
-      echo "<td colspan='2'></td>";
+      echo "<td>";
+      echo __('Import monitor on serial partial match:', 'fusioninventory');
+      echo "</td>";
+      echo "<td>";
+      Dropdown::showYesNo("import_monitor_on_partial_sn", $pfConfig->getValue('import_monitor_on_partial_sn'));
+      echo "</td>";
       echo "</tr>";
 
       echo "<tr class='tab_bg_1'>";

inc/inventoryruleimport.class.php

@@ -396,6 +396,8 @@ function getCriteriaByID($critname) {
    function findWithGlobalCriteria($input) {
       global $DB, $CFG_GLPI;
 
+      $pfConfig = new PluginFusioninventoryConfig();
+
       PluginFusioninventoryToolbox::logIfExtradebug(
          "pluginFusioninventory-rules",
          $input
@@ -568,6 +570,12 @@ function findWithGlobalCriteria($input) {
                      OR `[typetable]`.`serial`='".$serial2."')";
                   $_SESSION["plugin_fusioninventory_serialHP"] = $serial2;
 
+               } else if (isset($input['itemtype'])
+                       AND $input['itemtype'] == 'Monitor'
+                       AND $pfConfig->getValue('import_monitor_on_partial_sn') == 1
+                       AND strlen($input["serial"]) >= 4) {
+                  // Support partial match for monitor serial
+                  $sql_where_temp = " AND `[typetable]`.`serial` LIKE '%".$input["serial"]."%'";
                } else {
                   $sql_where_temp = " AND `[typetable]`.`serial`='".$input["serial"]."'";
                }

install/update.php

@@ -863,6 +863,7 @@ function pluginFusioninventoryUpdate($current_version, $migrationname = 'Migrati
       'import_registry'                => 1,
       'import_process'                 => 1,
       'import_vm'                      => 1,
+      'import_monitor_on_partial_sn'   => 0,
       'component_processor'            => 1,
       'component_memory'               => 1,
       'component_harddrive'            => 1,