Merge pull request #1661 from OCSInventory-NG/fix_export_csv

Add prettyversion field to the filter query

Author: charleneauger

require/softwares/AllSoftware.php

@@ -319,7 +319,7 @@ public function generateQueryFilter($filters) {
         // if isset OS / GROUP / TAG / ASSET -> initialize SQL beginning
         if(is_defined($filters['OS']) || is_defined($filters['GROUP']) || is_defined($filters['TAG']) || is_defined($filters['ASSET']) || is_defined($filters['CSV'])) {
             // Select
-            $queryFilter['SELECT'] = "SELECT n.NAME, p.PUBLISHER, v.VERSION, c.CATEGORY_NAME, 
+            $queryFilter['SELECT'] = "SELECT n.NAME, p.PUBLISHER, v.VERSION, c.CATEGORY_NAME, v.PRETTYVERSION,
             CONCAT(n.NAME,';',p.PUBLISHER,';',v.VERSION) as id, COUNT(CONCAT(s.NAME_ID, s.PUBLISHER_ID, s.VERSION_ID)) as ";
 
             if(is_defined($filters['SUBMIT_FORM_RESTRICT']) && $filters['SUBMIT_FORM_RESTRICT']) {