From 3af4136ffe9edcafbcffa8ae74fca2d9193bff01 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Tue, 6 Feb 2007 14:47:44 +0000
Subject: [PATCH] =?UTF-8?q?D=E9but=20ajout=20d'un=20mod=E8le=20de=20num=E9?=
 =?UTF-8?q?rotation=20param=E9trable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/facture/pluton/pluton.modules.php | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/htdocs/includes/modules/facture/pluton/pluton.modules.php b/htdocs/includes/modules/facture/pluton/pluton.modules.php
index fd28d43be2c..b7eb38d6d83 100644
--- a/htdocs/includes/modules/facture/pluton/pluton.modules.php
+++ b/htdocs/includes/modules/facture/pluton/pluton.modules.php
@@ -50,14 +50,46 @@ function info()
     	
       $texte = $langs->trans('PlutonNumRefModelDesc1')."<br>\n";
       
+      $texte.= 'Début année fiscale';
       if ($conf->global->SOCIETE_FISCAL_MONTH_START)
       {
-      	$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->SOCIETE_FISCAL_MONTH_START.')';
+      	$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->SOCIETE_FISCAL_MONTH_START.')<br>';
       }
       else
       {
-      	$texte.= ' ('.$langs->trans('IsNotDefined').')';
+      	$texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
       }
+      
+      $texte.= 'Préfix de la facture';
+      if ($conf->global->FACTURE_NUM_PREFIX)
+      {
+      	$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->FACTURE_NUM_PREFIX.')<br>';
+      }
+      else
+      {
+      	$texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
+      }
+      
+      $texte.= 'Nombre de chiffres sur le compteur';
+      if ($conf->global->FACTURE_NUM_QUANTIFY_METER)
+      {
+      	$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->FACTURE_NUM_QUANTIFY_METER.')<br>';
+      }
+      else
+      {
+      	$texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
+      }
+      
+      $texte.= 'Le compteur se remet à zéro en début d\'année';
+      if ($conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR)
+      {
+      	$texte.= ' ('.$langs->trans('DefinedAndHasThisValue').' : '.$conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR.')<br>';
+      }
+      else
+      {
+      	$texte.= ' ('.$langs->trans('IsNotDefined').')<br>';
+      }
+      
       return $texte;
     }
 
@@ -110,7 +142,7 @@ function info()
         $fayy='';
         $sql = "SELECT MAX(facnumber)";
         $sql.= " FROM ".MAIN_DB_PREFIX."facture";
-        if ($conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR) $sql.= " WHERE facnumber like '${fisc}%'";
+        if ($conf->global->FACTURE_NUM_RESTART_BEGIN_YEAR == 1) $sql.= " WHERE facnumber like '${fisc}%'";
         $resql=$db->query($sql);
         if ($resql)
         {