# 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.php
+++ C:\wamp\www\0.83-bugfixes\inc\cartridge2.class.php
@@ -119,22 +119,7 @@
       return false;
    }
 
-
-   // SPECIFIC FUNCTIONS
    /**
-   * Update count pages value of a cartridge
-   *
-   *@param $pages  count pages value
-   *
-   *@return boolean : true for success
-   **/
-   function updatePages($pages) {
-
-      return $this->update(array('id'    => $this->fields['id'],
-                                 'pages' => $pages));
-   }
-
-   /**
    * Update dates use value of a cartridge
    *
    *@param $date_use  date_use value
@@ -494,13 +479,11 @@
       $pages_printed    = 0;
       $nb_pages_printed = 0;
       $ORDER = " `glpi_cartridges`.`date_use` ASC,
-                `glpi_cartridges`.`date_out` DESC,
                 `glpi_cartridges`.`date_in`";
 
       if (!$show_old) {
          $ORDER = " `glpi_cartridges`.`date_out` ASC,
-                   `glpi_cartridges`.`date_use` ASC,
-                   `glpi_cartridges`.`date_in`";
+                   `glpi_cartridges`.`date_use` ASC";
       }
       $query = "SELECT `glpi_cartridges`.*,
                        `glpi_printers`.`id` AS printID,
@@ -676,8 +659,7 @@
                        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`.`date_use` ASC";
\ No newline at end of file
 
       $result = $DB->query($query);
       $number = $DB->numrows($result);