From 4c0604b41a2202a47d52f56547379b46fe18598e Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Wed, 5 Nov 2003 09:59:16 +0000
Subject: [PATCH] Pacth d'Antoine sur les permissions pour la partie compta

---
 doc/dev/permissions.sgml                          | 4 +++-
 htdocs/compta/bank/account.php                    | 5 +++++
 htdocs/compta/bank/bilan.php                      | 5 +++++
 htdocs/compta/bank/bplc.php                       | 4 ++++
 htdocs/compta/bank/budget.php                     | 5 +++++
 htdocs/compta/bank/categ.php                      | 5 +++++
 htdocs/compta/bank/config.php                     | 5 +++++
 htdocs/compta/bank/fiche.php                      | 5 +++++
 htdocs/compta/bank/index.php                      | 5 +++++
 htdocs/compta/bank/ligne.php                      | 5 +++++
 htdocs/compta/bank/rappro.php                     | 5 +++++
 htdocs/compta/bank/releve.php                     | 5 +++++
 htdocs/compta/bank/search.php                     | 6 ++++++
 htdocs/compta/bank/virement.php                   | 7 ++++++-
 htdocs/includes/modules/modComptabilite.class.php | 8 +++++---
 htdocs/user.class.php                             | 9 +++++++++
 16 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/doc/dev/permissions.sgml b/doc/dev/permissions.sgml
index 1f09abd6f94..cb1642381e8 100644
--- a/doc/dev/permissions.sgml
+++ b/doc/dev/permissions.sgml
@@ -34,7 +34,8 @@
 	<item>6 - fiches d'intervention</item>
 	<item>7 - adhérents</item>
 	<item>8 - commandes</item>
-	<item>9 - <em>non attribué</em></item>
+	<item>9 - comptabilité</em></item>
+	<item>10 - <em>non attribué</em></item>
       </list>
     </p>
   </sect>
@@ -71,6 +72,7 @@
 | 61 | Lire les fiches d'intervention                    | ficheinter | r    |         1 |
 | 62 | Créer modifier les fiches d'intervention          | ficheinter | w    |         0 |
 | 64 | Supprimer les fiches d'intervention               | ficheinter | d    |         0 |
+| 91 | Gestion banquaire                                 | compta     | a    |         0 |
 +----+---------------------------------------------------+------------+------+-----------+
 
       </example>
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 6eb192aef86..6535f0c34c2 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -23,6 +23,11 @@
 
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 if ($HTTP_POST_VARS["action"] == 'add' && $account)
 {    
   if ($credit > 0)
diff --git a/htdocs/compta/bank/bilan.php b/htdocs/compta/bank/bilan.php
index cf7e724ee84..cf013faad5a 100644
--- a/htdocs/compta/bank/bilan.php
+++ b/htdocs/compta/bank/bilan.php
@@ -22,6 +22,11 @@
 
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 function valeur($sql)
diff --git a/htdocs/compta/bank/bplc.php b/htdocs/compta/bank/bplc.php
index f991e1fd92d..e542801b96d 100644
--- a/htdocs/compta/bank/bplc.php
+++ b/htdocs/compta/bank/bplc.php
@@ -22,6 +22,10 @@
 require("./pre.inc.php");
 require("./bank.lib.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
 
 llxHeader();
 
diff --git a/htdocs/compta/bank/budget.php b/htdocs/compta/bank/budget.php
index 6c382ac5d63..3302493a8bc 100644
--- a/htdocs/compta/bank/budget.php
+++ b/htdocs/compta/bank/budget.php
@@ -21,6 +21,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 /*
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 0a28e3f4580..0e34fd523c6 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -21,6 +21,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($action == 'add')
diff --git a/htdocs/compta/bank/config.php b/htdocs/compta/bank/config.php
index 14ff5b49630..71f8cac6c11 100644
--- a/htdocs/compta/bank/config.php
+++ b/htdocs/compta/bank/config.php
@@ -21,6 +21,11 @@
 require("./pre.inc.php");
 require("./bank.lib.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 print_titre("Configuration");
diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php
index c615286da84..0ccff3b8e32 100644
--- a/htdocs/compta/bank/fiche.php
+++ b/htdocs/compta/bank/fiche.php
@@ -21,6 +21,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($HTTP_POST_VARS["action"] == 'add')
diff --git a/htdocs/compta/bank/index.php b/htdocs/compta/bank/index.php
index 160d912c3e4..f108960f119 100644
--- a/htdocs/compta/bank/index.php
+++ b/htdocs/compta/bank/index.php
@@ -24,6 +24,11 @@ require("./bank.lib.php");
 require("../../tva.class.php");
 require("../../chargesociales.class.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 print_titre ("Comptes bancaires");
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 25d7966018f..18dea8b359f 100644
--- a/htdocs/compta/bank/ligne.php
+++ b/htdocs/compta/bank/ligne.php
@@ -22,6 +22,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($HTTP_POST_VARS["action"] == 'confirm_delete_categ' && $HTTP_POST_VARS["confirm"] == yes)
diff --git a/htdocs/compta/bank/rappro.php b/htdocs/compta/bank/rappro.php
index 440c5ccbc26..238137313e4 100644
--- a/htdocs/compta/bank/rappro.php
+++ b/htdocs/compta/bank/rappro.php
@@ -20,6 +20,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($action == 'rappro')
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 33ea2c59e85..b7687456285 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -25,6 +25,11 @@
  */
 require("./pre.inc.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index 15eef6d5840..c20c7b9dae3 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -23,6 +23,12 @@
 
 require("./pre.inc.php");
 require("./bank.lib.php");
+
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($vline) {
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index 5ef9e79ecb9..c565e423c8c 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -22,6 +22,11 @@
 require("./pre.inc.php");
 require("./bank.lib.php");
 
+$user->getrights('compta');
+
+if (!$user->admin && !$user->rights->compta->bank)
+  accessforbidden();
+
 llxHeader();
 
 if ($action == 'add')
@@ -89,7 +94,7 @@ if ($result)
     while ($i < $num)
       {
 	$objp = $db->fetch_object($i);
-	print "<option value=\"$objp->rowid\">$objp->label</option><br>";
+	print "<option value=\"$objp->rowid\">$objp->label</option>";
 	$i++;
       }
 }
diff --git a/htdocs/includes/modules/modComptabilite.class.php b/htdocs/includes/modules/modComptabilite.class.php
index 3305b853130..136c738bdf8 100644
--- a/htdocs/includes/modules/modComptabilite.class.php
+++ b/htdocs/includes/modules/modComptabilite.class.php
@@ -50,8 +50,10 @@ class modComptabilite extends modDolibarrModules
   {
     /*
      * Permissions
-     */
-    $sql = array();
+     */    
+    $sql = array(
+		 "insert into llx_rights_def values (91,'Gestion banquaire','compta','a',1);",
+		 );
     
     return $this->_init($sql);
   }
@@ -61,7 +63,7 @@ class modComptabilite extends modDolibarrModules
    */
   Function remove()
   {
-    $sql = array();
+    $sql = "DELETE FROM llx_rights_def WHERE module = 'compta';";
 
     return $this->_remove($sql);
   }
diff --git a/htdocs/user.class.php b/htdocs/user.class.php
index 44c2b96cd2e..1b486a00c01 100644
--- a/htdocs/user.class.php
+++ b/htdocs/user.class.php
@@ -304,6 +304,15 @@ class User
 		    $this->rights->adherent->supprimer = 1;
 
 		}
+
+	      if ($module == 'compta' or $module == '')
+		{
+
+		  if ($obj->fk_id == 91)
+		    $this->rights->compta->bank = 1;
+			
+		}
+		
 	      $i++;
 	      }
 	    //	    $this->db->free();