From 12748406196875ba3b6bc450db2cfe7e5157e1ef Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 11 Jun 2005 11:35:12 +0000
Subject: [PATCH] New: Ajout page setup module syslog et dons

---
 htdocs/includes/modules/modContrat.class.php  | 19 +++++++++++++------
 htdocs/includes/modules/modDon.class.php      |  5 ++++-
 htdocs/includes/modules/modSyslog.class.php   | 13 ++++++++-----
 .../propale/pdf_propale_azur.modules.php      | 11 +++++++----
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/htdocs/includes/modules/modContrat.class.php b/htdocs/includes/modules/modContrat.class.php
index 30329de5e39..b7e7a845715 100644
--- a/htdocs/includes/modules/modContrat.class.php
+++ b/htdocs/includes/modules/modContrat.class.php
@@ -20,7 +20,8 @@
  *
  */
 
-/**     \defgroup   contrat     Module contrat
+/**
+        \defgroup   contrat     Module contrat
         \brief      Module pour gérer la tenue de contrat de services
 */
 
@@ -82,22 +83,28 @@ class modContrat extends DolibarrModules
 
     $this->rights[2][0] = 162;
     $this->rights[2][1] = 'Créer / modifier les contrats';
-    $this->rights[2][2] = 'r';
+    $this->rights[2][2] = 'w';
     $this->rights[2][3] = 0;
     $this->rights[2][4] = 'creer';
 
     $this->rights[3][0] = 163;
-    $this->rights[3][1] = 'Activer les contrats de services';
-    $this->rights[3][2] = 'r';
+    $this->rights[3][1] = 'Activer un service d\'un contrat';
+    $this->rights[3][2] = 'w';
     $this->rights[3][3] = 0;    
     $this->rights[3][4] = 'activer';
 
     $this->rights[4][0] = 164;
-    $this->rights[4][1] = 'Désactiver les contrats de services';
-    $this->rights[4][2] = 'r';
+    $this->rights[4][1] = 'Désactiver un service d\'un contrat';
+    $this->rights[4][2] = 'w';
     $this->rights[4][3] = 0;
     $this->rights[4][4] = 'desactiver';
 
+    $this->rights[5][0] = 165;
+    $this->rights[5][1] = 'Supprimer un contrat';
+    $this->rights[5][2] = 'd';
+    $this->rights[5][3] = 0;
+    $this->rights[5][4] = 'supprimer';
+
   }
 
 
diff --git a/htdocs/includes/modules/modDon.class.php b/htdocs/includes/modules/modDon.class.php
index cc79a09a40e..4d57fabdc90 100644
--- a/htdocs/includes/modules/modDon.class.php
+++ b/htdocs/includes/modules/modDon.class.php
@@ -66,13 +66,16 @@ class modDon  extends DolibarrModules
     $this->depends = array();
     $this->requiredby = array();
 
+    // Config pages
+    $this->config_page_url = "dons.php";
+
     // Constantes
     $this->const = array();
     $this->const[0][0] = "DONS_FORM";
     $this->const[0][1] = "chaine";
     $this->const[0][2] = "fsfe.fr.php";
     $this->const[0][3] = 'Nom du gestionnaire de formulaire de dons';
-    $this->const[0][4] = 1;
+    $this->const[0][4] = 0;
 
     // Boxes
     $this->boxes = array();
diff --git a/htdocs/includes/modules/modSyslog.class.php b/htdocs/includes/modules/modSyslog.class.php
index 71cff433e4c..34820f2f7b2 100644
--- a/htdocs/includes/modules/modSyslog.class.php
+++ b/htdocs/includes/modules/modSyslog.class.php
@@ -22,14 +22,14 @@
  */
 
 /**
-   \defgroup   syslog  Module syslog
-   \brief      Module pour gérer les messages d'erreur dans syslog
+        \defgroup   syslog  Module syslog
+        \brief      Module pour gérer les messages d'erreur dans syslog
 */
 
 /**
-   \file       htdocs/includes/modules/modSyslog.class.php
-   \ingroup    syslog
-   \brief      Fichier de description et activation du module de syslog
+        \file       htdocs/includes/modules/modSyslog.class.php
+        \ingroup    syslog
+        \brief      Fichier de description et activation du module de syslog
 */
 
 include_once "DolibarrModules.class.php";
@@ -63,6 +63,9 @@ class modSyslog extends DolibarrModules
     // Dir
     $this->dirs = array();
 
+    // Config pages
+    $this->config_page_url = "syslog.php";
+
     // Dépendances
     $this->depends = array();
     $this->requiredby = array();
diff --git a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
index 59bb68b0715..1556a8b5b4f 100644
--- a/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
+++ b/htdocs/includes/modules/propale/pdf_propale_azur.modules.php
@@ -44,6 +44,8 @@ class pdf_propale_azur extends ModelePDFPropales
     */
     function pdf_propale_azur($db=0)
     {
+      	global $langs;
+
         $this->db = $db;
         $this->name = "azur";
         $this->description = "Modèle de propositions commerciales complet (logo...)";
@@ -554,23 +556,24 @@ class pdf_propale_azur extends ModelePDFPropales
         {
             $pdf->MultiCell(80, 4, FAC_PDF_ADRESSE);
         }
-        if (defined("FAC_PDF_TEL"))
+        if (defined("FAC_PDF_TEL") && FAC_PDF_TEL)
         {
             $pdf->MultiCell(80, 4, $langs->trans("Phone").": ".FAC_PDF_TEL);
         }
-        if (defined("FAC_PDF_FAX"))
+        if (defined("FAC_PDF_FAX") && FAC_PDF_FAX)
         {
             $pdf->MultiCell(80, 4, $langs->trans("Fax").": ".FAC_PDF_FAX);
         }
-		if (defined("FAC_PDF_MEL"))
+		if (defined("FAC_PDF_MEL") && FAC_PDF_MEL)
 		{
 			$pdf->MultiCell(80, 4, $langs->trans("Email").": ".FAC_PDF_MEL);
 		}
-		if (defined("FAC_PDF_WWW"))
+		if (defined("FAC_PDF_WWW") && FAC_PDF_WWW)
 		{
 			$pdf->MultiCell(80, 4, $langs->trans("Web").": ".FAC_PDF_WWW);
         }
 
+        $pdf->SetFont('Arial','',7);
         if (defined("MAIN_INFO_SIREN") && MAIN_INFO_SIREN)
         {
             $pdf->MultiCell(80, 4, $langs->transcountry("ProfId1",$this->code_pays).": ".MAIN_INFO_SIREN);