Modification des permissions

htdocs/compta/bank/account.php

@@ -25,7 +25,7 @@ require("./pre.inc.php");
 
 $user->getrights('compta');
 
-if (!$user->admin && !$user->rights->compta->bank)
+if (!$user->rights->banque->lire)
   accessforbidden();
 
 if ($HTTP_POST_VARS["action"] == 'add' && $account)
@@ -78,7 +78,7 @@ if ($HTTP_POST_VARS["action"] == 'add' && $account)
     }
     */
 }
-if ($action == 'del' && $account)
+if ($action == 'del' && $account && $user->rights->banque->modifier)
 {
   $acct=new Account($db,$account);
   $acct->deleteline($rowid);
@@ -93,7 +93,7 @@ if ($action == 'del' && $account)
 
 llxHeader();
 
-if ($account > 0)
+if ($_GET["account"] > 0)
 {
   if ($vline)
     {
@@ -212,15 +212,27 @@ if ($account > 0)
   print '<td align="right"><input type="text" name="req_debit" size="6"></TD>';
   print '<td align="right"><input type="text" name="req_credit" size="6"></TD>';
   print '<td align="center"><input type="submit" value="Chercher"></td>';
-  print '<td align="center"><a href="rappro.php?account='.$account.'">Rappro</a></td>';
+  print '<td align="center">';
+  if ($user->rights->banque->modifier)
+    {
+      print '<a href="rappro.php?account='.$account.'">Rappro</a>';
+    }
+  else
+    {
+      print "&nbsp;";
+    }
+  print '</td>';
   print "</tr>\n";
   print "</form>\n";
   /*
    *
    *
    */
+  if ($user->rights->banque->modifier)
+    {
       print "<form method=\"post\" action=\"$PHP_SELF?vline=$vline&amp;account=$account\">";
       print '<input type="hidden" name="action" value="add">';
+    }
   print '<tr class="liste_titre">';
   print '<td>Date</td><td>Type</td><td>Description</td>';
   print '<td align="right">Débit</td><td align="right">Crédit</td><td align="right">Solde</td>';
@@ -275,7 +287,8 @@ if ($account > 0)
    *
    */
 
-
+  if ($user->rights->banque->modifier)
+    {
       print "<tr><td align=\"right\" colspan=\"5\">&nbsp;</td>";
       print "<td align=\"right\"><b>".price($total)."</b></td><td>&nbsp;</td></tr>\n";
       print '<tr><td><input name="dateoy" type="text" size="4" value="'.strftime("%Y",time()).'" maxlength="4">';
@@ -295,7 +308,12 @@ if ($account > 0)
       print "<td colspan=\"2\" align=\"center\"><select name=\"cat1\">$options</select></td>";
       print '</tr><tr><td colspan="3"><small>YYYYMMDD</small></td><td>0000.00</td>';
       print '<td colspan="3" align="center"><input type="submit" value="Ajouter"></td></tr>';
-  print "</table></form>";
+    }
+  print "</table>";
+  if ($user->rights->banque->modifier)
+    {
+      print "</form>";
+    }
 }
 else
 {
@@ -310,7 +328,7 @@ llxFooter("<em>Derni&egrave;re modification $Date$ r&eacute;vision $Revision$</e
  */
 Function _print_lines($db,$sql, $acct)
 {
-  global $bc, $nbline, $viewline;
+  global $bc, $nbline, $viewline, $user;
   $var=True;  
   $num = $db->num_rows();
   $i = 0; $total = 0;
@@ -409,7 +427,16 @@ Function _print_lines($db,$sql, $acct)
 		}
 	      else
 		{
-		  print "<td align=\"center\"><a href=\"$PHP_SELF?action=del&amp;rowid=$objp->rowid&amp;account=$acct->id&amp;page=$page\">[Del]</a></td>";
+		  if ($user->rights->banque->modifier)
+		    {
+		      print "<td align=\"center\"><a href=\"$PHP_SELF?action=del&amp;rowid=$objp->rowid&amp;account=$acct->id&amp;page=$page\">";
+		      print img_delete();
+		      print "</a></td>";
+		    }
+		  else
+		    {
+		      print "<td align=\"center\">&nbsp;</td>";
+		    }
 		}
 	      
 	      print "</tr>";

htdocs/compta/bank/bilan.php

@@ -22,9 +22,7 @@
 
 require("./pre.inc.php");
 
-$user->getrights('compta');
+if (!$user->rights->banque->lire)
-
-if (!$user->admin && !$user->rights->compta->bank)
   accessforbidden();
 
 llxHeader();

htdocs/compta/bank/budget.php

@@ -21,9 +21,7 @@
  */
 require("./pre.inc.php");
 
-$user->getrights('compta');
+if (!$user->rights->banque->lire)
-
-if (!$user->admin && !$user->rights->compta->bank)
   accessforbidden();
 
 llxHeader();

htdocs/compta/bank/pre.inc.php

@@ -23,6 +23,8 @@
 require("../../main.inc.php");
 require("./account.class.php");
 
+$user->getrights('banque');
+
 function llxHeader($head = "")
 {
   global $db, $user, $conf, $account;
@@ -61,9 +63,16 @@ function llxHeader($head = "")
 
   $menu->add_submenu("budget.php","Budgets");
   $menu->add_submenu("bilan.php","Bilan");
-  $menu->add_submenu("virement.php","Virement");
 
-  $menu->add_submenu("config.php","Config");
+  if ($user->rights->banque->modifier)
+    {
+      $menu->add_submenu("virement.php","Virement");
+    }
+
+  if ($user->rights->banque->configurer)
+    {
+      $menu->add_submenu("config.php","Configuration");
+    }
 
   if (defined("COMPTA_ONLINE_PAYMENT_BPLC") && COMPTA_ONLINE_PAYMENT_BPLC)
     {

htdocs/compta/bank/releve.php

@@ -25,9 +25,7 @@
  */
 require("./pre.inc.php");
 
-$user->getrights('compta');
+if (!$user->rights->banque->lire)
-
-if (!$user->admin && !$user->rights->compta->bank)
   accessforbidden();
 
 llxHeader();
@@ -64,7 +62,7 @@ if (! strlen($num))
       
       print_barre_liste("Relevés bancaires", $page, $PHP_SELF,"&account=$account",$sortfield,$sortorder,'',$numrows);
 
-      print '<TABLE border="1" width="100%" cellspacing="0" cellpadding="2">';
+      print '<table class="border" width="100%" cellspacing="0" cellpadding="2">';
       print "<TR class=\"liste_titre\">";
       print "<td>Date</td></tr>";
 
@@ -210,8 +208,14 @@ else
     
 	  print "<td align=\"right\">".price($total)."</TD>\n";
 	  
+	  if ($user->rights->banque->modifier)
+	    {
 	      print "<td align=\"center\">[<a href=\"ligne.php?rowid=$objp->rowid&amp;account=$account\">edit</a>]</td>";
-	  
+	    }
+	  else
+	    {
+	      print "<td align=\"center\">&nbsp;</td>";
+	    }
 	  print "</tr>";
 	  $i++;
 	}

htdocs/compta/bank/virement.php

@@ -22,9 +22,7 @@
 require("./pre.inc.php");
 require("./bank.lib.php");
 
-$user->getrights('compta');
+if (!$user->rights->banque->modifier)
-
-if (!$user->admin && !$user->rights->compta->bank)
   accessforbidden();
 
 llxHeader();