From 2144f9490533e39e45e4bba64f723e26bfc7d860 Mon Sep 17 00:00:00 2001
From: Eric Gomez <eric.gomez.arellano@gmail.com>
Date: Thu, 17 Dec 2020 01:06:32 -0600
Subject: [PATCH 1/2] Solve issue #193 (#197)

* Add the category openSuse in reports

Solve #193 Add the category openSuse in reports Computer SO and Distribution Linux, without affect the actual operation, even if not find the sistem openSuse the reports work same

* solve 'Linux' => 'Linux|Ubuntu|openSUSE', instead.
---
 inc/inventory.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/inventory.class.php b/inc/inventory.class.php
index 81f8ea2e..3bdd34d9 100644
--- a/inc/inventory.class.php
+++ b/inc/inventory.class.php
@@ -321,7 +321,7 @@ function computersByOS($config = []) {
       $sql_entities = " AND c.`entities_id` IN ({$this->where_entities})";
       $sql_states   = self::getStateCondition('c.states_id');
       $oses = ['Windows' => 'Windows',
-               'Linux'   => 'Linux|Ubuntu',
+               'Linux'   => 'Linux|Ubuntu|openSUSE',
                'Solaris' => 'Solaris',
                'AIX'     => 'AIX',
                'BSD'     => 'BSD',
@@ -462,7 +462,7 @@ function reportHbarLinux($config = []) {
       $sql_states2 = self::getStateCondition('c.states_id', true);
 
       $data = [];
-      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%'") as $os) {
+      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%' OR name LIKE '%openSUSE%'") as $os) {
          $iterator = $DB->request(
             'glpi_computers', [
                'SELECT' => [
@@ -516,7 +516,7 @@ function reportHbarLinuxDistro($config = []) {
       $sql_states = self::getStateCondition('glpi_computers.states_id', true);
 
       $data = [];
-      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%'") as $os) {
+      foreach ($DB->request('glpi_operatingsystems', "name LIKE '%Linux%' OR name LIKE '%Ubuntu%' OR name LIKE '%openSUSE%'") as $os) {
          $number = countElementsInTable(
             'glpi_computers', [
                'INNER JOIN' => [

From ea5028b248a9f74004da62560a68b4e1e9f32bf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Anne?= <cedric.anne@gmail.com>
Date: Fri, 18 Dec 2020 15:59:06 +0100
Subject: [PATCH 2/2] Add 1.7.1 version definition

---
 mreporting.xml | 5 +++++
 setup.php      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mreporting.xml b/mreporting.xml
index 8b999ea0..adc20894 100644
--- a/mreporting.xml
+++ b/mreporting.xml
@@ -98,6 +98,11 @@ Voir documentation : https://github.com/PluginsGLPI/mreporting/wiki
       <author>Infotel</author>
    </authors>
    <versions>
+      <version>
+         <num>1.7.1</num>
+         <compatibility>~9.5.0</compatibility>
+         <download_url>https://github.com/pluginsGLPI/mreporting/releases/download/1.7.1/glpi-mreporting-1.7.1.tar.bz2</download_url>
+      </version>
       <version>
          <num>1.7.0</num>
          <compatibility>~9.5.0</compatibility>
diff --git a/setup.php b/setup.php
index 26963ad1..672fc9d8 100644
--- a/setup.php
+++ b/setup.php
@@ -26,7 +26,7 @@
  --------------------------------------------------------------------------
  */
 
-define ('PLUGIN_MREPORTING_VERSION', '1.7.0');
+define ('PLUGIN_MREPORTING_VERSION', '1.7.1');
 
 // Minimal GLPI version, inclusive
 define("PLUGIN_MREPORTING_MIN_GLPI", "9.5");