# This patch file was generated by NetBeans IDE
# This patch can be applied using context Tools: Apply Diff Patch action on respective folder.
# It uses platform neutral UTF-8 encoding.
# Above lines and this line are ignored by the patching process.
--- C:\wamp\www\0.83-bugfixes\inc\cartridge.class.propre.php
+++ C:\wamp\www\0.83-bugfixes\inc\cartridge.class.php
@@ -493,14 +493,12 @@
       $use_time         = 0;
       $pages_printed    = 0;
       $nb_pages_printed = 0;
-      $ORDER = " `glpi_cartridges`.`date_use` ASC,
-                `glpi_cartridges`.`date_out` DESC,
-                `glpi_cartridges`.`date_in`";
+      $ORDER = " `glpi_cartridges`.`date_out` ASC,
+                `glpi_cartridges`.`pages` ASC";
 
       if (!$show_old) {
-         $ORDER = " `glpi_cartridges`.`date_out` ASC,
-                   `glpi_cartridges`.`date_use` ASC,
-                   `glpi_cartridges`.`date_in`";
+         $ORDER = " `glpi_cartridges`.`date_use` ASC,
+                   `glpi_cartridges`.`date_in` ASC";
       }
       $query = "SELECT `glpi_cartridges`.*,
                        `glpi_printers`.`id` AS printID,
@@ -676,8 +674,8 @@
                        AND `glpi_cartridges`.`printers_id` = '$instID'
                        AND `glpi_cartridges`.`cartridgeitems_id` = `glpi_cartridgeitems`.`id`)
                 ORDER BY `glpi_cartridges`.`date_out` ASC,
-                         `glpi_cartridges`.`date_use` DESC,
-                         `glpi_cartridges`.`date_in`";
\ No newline at end of file
+                         `glpi_cartridges`.`pages` ASC,
+                         `glpi_cartridges`.`date_in` ASC"; //Pour trier aussi les cartouches utilisées 
\ No newline at end of file
 
       $result = $DB->query($query);
       $number = $DB->numrows($result);