419c419
<       $canedit = $cartitem->can($tID,'r');
---
>       $canedit = $cartitem->can($tID,'w'); //bizarre qu'il soit en "r"...
433c433
<             echo "<tr><th colspan='8'>".self::getCount($tID,-1)."</th>";
---
>             echo "<tr><th colspan='".($canedit?'8':'6')."'>".self::getCount($tID,-1)."</th>";
436c436
<             echo "<tr><th colspan='10'>".$LANG['cartridges'][35]."</th>";
---
>             echo "<tr><th colspan='".($canedit?'10':'8')."'>".$LANG['cartridges'][35]."</th>";
450,451c450,454
<          echo "<th colspan='2'>".$LANG['rulesengine'][7]."</th>";
< 
---
>          
> 		 if ($canedit) {
> 		    echo "<th colspan='2'>".$LANG['rulesengine'][7]."</th>";
>          }
> 		 
542c545
<   	       }
---
> 			   }
548,549c551,553
<             echo "<td class='center'>";
<             if (!is_null($date_use) && $canedit) {
---
>             if ($canedit) {
> 			   echo "<td class='center'>";
>                if (!is_null($date_use)) {
552,558c556,560
<             } else {
<                 echo "&nbsp;";
<             }
<             echo "</td>";
<             echo "<td class='center'>";
<             if ($canedit) {
<                echo "<a href='".$CFG_GLPI["root_doc"]."/front/cartridge.form.php?delete=delete&amp;id=".
---
> 			   } else {
> 			      echo "&nbsp;";
> 			   }
>                echo "</td><td class='center'>";
>  			   echo "<a href='".$CFG_GLPI["root_doc"]."/front/cartridge.form.php?delete=delete&amp;id=".
560,561c562
<             } else {
<                 echo "&nbsp;";
---
>                echo "</td>";
563c564
<             echo "</td></tr>";
---
>             echo "</tr>";
570c571
<             echo "<td class='center'>".$LANG['cartridges'][40]."&nbsp;:<br>";
---
>             echo "<td class='center b'>".$LANG['cartridges'][40]."&nbsp;:<br>";
573c574
<             echo "<td class='center'>".$LANG['cartridges'][41]."&nbsp;:<br>";
---
>             echo "<td class='center b'>".$LANG['cartridges'][41]."&nbsp;:<br>";
575c576
<             echo "<td class='center'>".$LANG['cartridges'][42]."&nbsp;:<br>";
---
>             echo "<td class='center b'>".$LANG['cartridges'][42]."&nbsp;:<br>";
577c578
<             echo "<td colspan='3'>&nbsp;</td></tr>";
---
>             echo "<td colspan='".($canedit?'3':'1')."'>&nbsp;</td></tr>";
658c659
<          echo "<tr><th colspan='5'>".$LANG['cartridges'][33]."&nbsp;:</th></tr>";
---
>          echo "<tr><th colspan='".($canedit?'5':'4')."'>".$LANG['cartridges'][33]."&nbsp;:</th></tr>";
660c661
<          echo "<tr><th colspan='7'>".$LANG['cartridges'][35]."&nbsp;:</th></tr>";
---
>          echo "<tr><th colspan='".($canedit?'7':'6')."'>".$LANG['cartridges'][35]."&nbsp;:</th></tr>";
663,664c664
<       echo "<th>".$LANG['cartridges'][24]."</th>";
<       echo "<th>".$LANG['consumables'][26]."</th>";
---
>       echo "<th>".$LANG['cartridges'][24]."</th><th>".$LANG['consumables'][26]."</th>";
668,669c668,671
< 
<       echo "<th>&nbsp;</th></tr>";
---
> 	  if ($canedit) {
>          echo "<th>".$LANG['rulesengine'][7]."</th>";
> 	  }
> 	  echo "</tr>";
681c683
<          echo "<td class='center b'>";
---
>          echo "<td class='center'>";
692a695
>          echo "</td>";
695d697
<             echo "</td>";
697,698c699
<          }
<          if ($old!=0) {
---
> 
705,707c706,707
<          }
<          echo "</td><td class='center'>";
<          if ($old!=0) {
---
>             
> 			echo "</td><td class='center'>";
711c711
<                echo "<input type='text' name='pages' value=\"".$data['pages']."\" size='10'>";
---
>                echo "<input type='text' name='pages' value=\"".$data['pages']."\" size='6'>"; // ca permet 9 999 999 d'impression... ;)
716c716
<                echo "<input type='text' name='pages' value=\"".$data['pages']."\" size='10'>";
---
>                echo "<input type='text' name='pages' value=\"".$data['pages']."\" size='6'>"; // ca permet 9 999 999 d'impression... ;)
722c722
<                echo ($data['pages']-$pages)." ".$LANG['printers'][31];
---
>                echo "&nbsp;".($data['pages']-$pages)." ".$LANG['printers'][31];
725d724
<             echo "</td><td class='center'>";
726a726
> 		 echo "</td>";
728c728
<             echo "<span class='small_space'>";
---
> 		    echo "<td class='center'>";
736c736
<                       "&amp;tID=".$data["tID"]."'>".$LANG['buttons'][6]."</a>";
---
>                       "&amp;tID=".$data["tID"]."'><img title=\"".$LANG['buttons'][6]."\" alt=\"".$LANG['buttons'][6]."\" src='".$CFG_GLPI["root_doc"]."/pics/delete.png'></a>";
738c738
<             echo "</span></td></tr>";
---
>             echo "</td></tr>";
741,752c741,752
<       if ($old==0 && $canedit) {
<          echo "<tr class='tab_bg_1'><td>&nbsp;</td><td class='center' colspan='3'>";
<          echo "<form method='post' action=\"".$CFG_GLPI["root_doc"]."/front/cartridge.form.php\">";
<          echo "<input type='hidden' name='pID' value='$instID'>";
< 
<          if (CartridgeItem::dropdownForPrinter($printer)) {
<             echo "&nbsp;<input type='submit' name='install' value=\"".$LANG['buttons'][4]."\"
<                          class='submit'>";
<          }
<          echo "</form></td><td class='tab_bg_2 center'>&nbsp;";
<          echo "</td></tr>";
< 
---
>       if ($old==0) { // gros bug a cause de cette partie. en gros si il a les droits en lecture, 
>          if ($canedit) { // il verra la partie du dessous dans les cartouches utilisées!
> 		    echo "<tr class='tab_bg_1'><td class='center' colspan='5'>";
>             echo "<form method='post' action=\"".$CFG_GLPI["root_doc"]."/front/cartridge.form.php\">";
>             echo "<input type='hidden' name='pID' value='$instID'>";
> 
>             if (CartridgeItem::dropdownForPrinter($printer)) {
>                echo "&nbsp;<input type='submit' name='install' value=\"".$LANG['buttons'][4]."\"
>                             class='submit'>";
>             }
>             echo "</form></td></tr>";
> 		 }
758,759c758,759
<             echo "<tr class='tab_bg_2'><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>";
<             echo "<td class='center'>".$LANG['cartridges'][40]."&nbsp;:<br>";
---
>             echo "<tr class='tab_bg_2'><td colspan='3'>&nbsp;</td>";
>             echo "<td class='center b'>".$LANG['cartridges'][40]."&nbsp;:<br>";
761c761
<             echo "<td class='center'>".$LANG['cartridges'][41].":<br>";
---
>             echo "<td class='center b'>".$LANG['cartridges'][41]."&nbsp;:<br>";
763c763
<             echo "<td class='center'>".$LANG['cartridges'][42].":<br>";
---
>             echo "<td class='center b'>".$LANG['cartridges'][42]."&nbsp;:<br>";
765c765,768
<             echo "<td>&nbsp;</td></tr>";
---
>             if ($canedit) {
> 			   echo "<td>&nbsp;</td>";
> 			}
> 			echo "</tr>";