334c334
<          return $LANG['consumables'][22];
---
>          return $LANG['consumables'][21];   // Au singulier plutot...?
400c400
<             echo "<tr><th colspan='7'>";
---
>             echo "<tr><th colspan='".($canedit?'6':'4')."'>";
404c404
<             echo "<tr><th colspan='8'>".$LANG['consumables'][35]."</th></tr>";
---
>             echo "<tr><th colspan='".($canedit?'8':'6')."'>".$LANG['consumables'][35]."</th></tr>";
408c408
<          echo "<th>".$LANG['cartridges'][24]."</th><th>".$LANG['consumables'][26]."</th>";
---
>          echo "<th>".$LANG['cartridges'][24]."</th>";
410,426c410
<             echo "<th>".$LANG['consumables'][31]."</th>";
<          }
<          echo "<th width='200px'>".$LANG['financial'][3]."</th>";
< 
<          if (!$show_old && $canedit && $DB->result($result,0,0)!=0) {
<             echo "<th colspan='".($canedit?'2':'1')."'>";
< 
<             Dropdown::showAllItems("items_id", 0, 0,$consitem->fields["entities_id"],
<                                    $CFG_GLPI["consumables_types"]);
< 
< /*            User::dropdown(array('value'  => $consitem->fields["entities_id"],
<                                  'right'  => 'all'));*/
<             echo "&nbsp;<input type='submit' class='submit' name='give' value='".
<                            $LANG['consumables'][32]."'>";
<             echo "</th>";
<          } else {
<             echo "<th colspan='".($canedit?'2':'1')."'>&nbsp;</th>";
---
>             echo "<th>".$LANG['consumables'][26]."</th><th>".$LANG['consumables'][31]."</th>";
427a412,415
>          echo "<th>".$LANG['financial'][3]."</th>";
> 		 if ($canedit) {
>             echo "<th colspan='2'>".$LANG['rulesengine'][7]."</th>";
> 		 }
429d416
< 
456d442
<             echo "<td class='center'>".$date_out."</td>";
459c445,446
<                echo "<td class='center'>";
---
>                echo "<td class='center'>".$date_out."</td>";
> 			   echo "<td class='center'>";
470,475c457,466
<             if (!$show_old && $canedit) {
<                echo "<td class='center'>";
<                echo "<input type='checkbox' name='out[".$data["id"]."]'>";
<                echo "</td>";
<             }
<             if ($show_old && $canedit) {
---
> 			if ($canedit) { //autant tout cacher si nous ne pouvons pas modifier...!
> 			   echo "<td class='center'>";
> 			   if (!$show_old) {
>                   echo "<input type='checkbox' name='out[".$data["id"]."]'>";
>                } else {
> 			      echo "<a href='".
>                          $CFG_GLPI["root_doc"]."/front/consumable.form.php?restore=restore&amp;id=".
>                          $data["id"]."&amp;tID=$tID'>".$LANG['consumables'][37]."</a>";
> 			   }
> 			   echo "</td>";
478,479c469,470
<                       $CFG_GLPI["root_doc"]."/front/consumable.form.php?restore=restore&amp;id=".
<                       $data["id"]."&amp;tID=$tID'>".$LANG['consumables'][37]."</a>";
---
>                       $CFG_GLPI["root_doc"]."/front/consumable.form.php?delete=delete&amp;id=".
>                       $data["id"]."&amp;tID=$tID'><img title=\"".$LANG['buttons'][6]."\" alt=\"".$LANG['buttons'][6]."\" src='".$CFG_GLPI["root_doc"]."/pics/delete.png'></a>";
481c472,476
<             }
---
> 			}
> 			echo "</tr>";
>          }
> 		 if (!$show_old && $number>0 && $canedit) {
>             echo "<tr class='tab_bg_2'><td colspan='4'>&nbsp;</td>";
483,486c478,486
<             echo "<a href='".
<                    $CFG_GLPI["root_doc"]."/front/consumable.form.php?delete=delete&amp;id=".
<                    $data["id"]."&amp;tID=$tID'>".$LANG['buttons'][6]."</a>";
<             echo "</td></tr>";
---
> 			if ($DB->result($result,0,0)!=0) {
> 			   echo "<input type='submit' class='submit' name='give' value='".$LANG['consumables'][31]."'>&nbsp;";
>                Dropdown::showAllItems("items_id", 0, 0,$consitem->fields["entities_id"],
>                                    $CFG_GLPI["consumables_types"]);
> /*             User::dropdown(array('value'  => $consitem->fields["entities_id"],
>                                  'right'  => 'all'));*/
> 			}
> 		    echo "</td>";
>             echo "<td>&nbsp;</td></tr>";