alxarafe / alixar

dolibarr/htdocs/core/modules/dons/modules_don.php

Indentation +6 added lines, -6 removed lines

@@ -35,9 +35,9 @@ 
 abstract class ModeleDon extends CommonDocGenerator
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -69,9 +69,9 @@ 
 abstract class ModeleNumRefDons
 {
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
     /**
      * 	Return if a module can be used or not

Spacing +6 added lines, -6 removed lines

@@ -37,7 +37,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
@@ -47,16 +47,16 @@ 
      *  @param  integer $maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-    static function liste_modeles($db,$maxfilenamelength=0)
+    static function liste_modeles($db, $maxfilenamelength = 0)
     {
         // phpcs:enable
         global $conf;
 
-        $type='donation';
-        $liste=array();
+        $type = 'donation';
+        $liste = array();
 
         include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-        $liste=getListOfModels($db,$type,$maxfilenamelength);
+        $liste = getListOfModels($db, $type, $maxfilenamelength);
 
         return $liste;
     }
@@ -71,7 +71,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
     /**
      * 	Return if a module can be used or not

Braces +12 added lines, -4 removed lines

@@ -139,10 +139,18 @@
         global $langs;
         $langs->load("admin");
 
-        if ($this->version == 'development') return $langs->trans("VersionDevelopment");
-        if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
-        if ($this->version == 'dolibarr') return DOL_VERSION;
-        if ($this->version) return $this->version;
+        if ($this->version == 'development') {
+            return $langs->trans("VersionDevelopment");
+        }
+        if ($this->version == 'experimental') {
+            return $langs->trans("VersionExperimental");
+        }
+        if ($this->version == 'dolibarr') {
+            return DOL_VERSION;
+        }
+        if ($this->version) {
+            return $this->version;
+        }
         return $langs->trans("NotAvailable");
     }
 }

dolibarr/htdocs/core/modules/dons/html_cerfafr.modules.php

Indentation +384 added lines, -384 removed lines

@@ -35,119 +35,119 @@ 
  */
 class html_cerfafr extends ModeleDon
 {
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDb      $db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs;
-
-		$this->db = $db;
-		$this->name = "cerfafr";
-		$this->description = $langs->trans('DonationsReceiptModel').' - fr_FR - Cerfa 11580*03';
-
-		// Dimension page for size A4
-		$this->type = 'html';
-	}
-
-
-	/**
-	 * 	Return if a module can be used or not
-	 *
-	 *  @return	boolean     true if module can be used
-	 */
-	function isEnabled()
-	{
-		return true;
-	}
+    /**
+     *  Constructor
+     *
+     *  @param      DoliDb      $db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs;
+
+        $this->db = $db;
+        $this->name = "cerfafr";
+        $this->description = $langs->trans('DonationsReceiptModel').' - fr_FR - Cerfa 11580*03';
+
+        // Dimension page for size A4
+        $this->type = 'html';
+    }
+
+
+    /**
+     * 	Return if a module can be used or not
+     *
+     *  @return	boolean     true if module can be used
+     */
+    function isEnabled()
+    {
+        return true;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Write the object to document file to disk
-	 *
-	 *	@param	Don			$don	        Donation object
-	 *  @param  Translate	$outputlangs    Lang object for output language
-	 *  @param	string		$currency		Currency code
-	 *	@return	int             			>0 if OK, <0 if KO
-	 */
-	function write_file($don,$outputlangs,$currency='')
-	{
+    /**
+     *  Write the object to document file to disk
+     *
+     *	@param	Don			$don	        Donation object
+     *  @param  Translate	$outputlangs    Lang object for output language
+     *  @param	string		$currency		Currency code
+     *	@return	int             			>0 if OK, <0 if KO
+     */
+    function write_file($don,$outputlangs,$currency='')
+    {
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc;
-
-		$now=dol_now();
-		$id = (! is_object($don)?$don:'');
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
-
-		$currency = !empty($currency) ? $currency : $conf->currency;
-
-		if (! empty($conf->don->dir_output))
-		{
-			// Definition of the object don (for upward compatibility)
-			if (! is_object($don))
-			{
-				$don = new Don($this->db);
-				$ret=$don->fetch($id);
-				$id=$don->id;
-			}
-
-			// Definition of $dir and $file
-			if (! empty($don->specimen))
-			{
-				$dir = $conf->don->dir_output;
-				$file = $dir . "/SPECIMEN.html";
-			}
-			else
-			{
-				$donref = dol_sanitizeFileName($don->ref);
-				$dir = $conf->don->dir_output . "/" . $donref;
-				$file = $dir . "/" . $donref . ".html";
-			}
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-					return -1;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				$formclass = new Form($this->db);
-
-				// This is not the proper way to do it but $formclass->form_modes_reglement
-				// prints the translation instead of returning it
-				if ($don->modepaiementid)
-				{
-					$formclass->load_cache_types_paiements();
-					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
-				}
-				else $paymentmode = '';
-
-				if ($don->modepaymentcode=='CHQ'){
-					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else if ($don->modepaymentcode=='LIQ'){
-					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else if ($don->modepaymentcode=='VIR' || $don->modepaymentcode=='PRE' || $don->modepaymentcode=='CB'){
-					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else
-				{
-					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-
-				/*
+        global $user,$conf,$langs,$mysoc;
+
+        $now=dol_now();
+        $id = (! is_object($don)?$don:'');
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
+
+        $currency = !empty($currency) ? $currency : $conf->currency;
+
+        if (! empty($conf->don->dir_output))
+        {
+            // Definition of the object don (for upward compatibility)
+            if (! is_object($don))
+            {
+                $don = new Don($this->db);
+                $ret=$don->fetch($id);
+                $id=$don->id;
+            }
+
+            // Definition of $dir and $file
+            if (! empty($don->specimen))
+            {
+                $dir = $conf->don->dir_output;
+                $file = $dir . "/SPECIMEN.html";
+            }
+            else
+            {
+                $donref = dol_sanitizeFileName($don->ref);
+                $dir = $conf->don->dir_output . "/" . $donref;
+                $file = $dir . "/" . $donref . ".html";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                    return -1;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                $formclass = new Form($this->db);
+
+                // This is not the proper way to do it but $formclass->form_modes_reglement
+                // prints the translation instead of returning it
+                if ($don->modepaiementid)
+                {
+                    $formclass->load_cache_types_paiements();
+                    $paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
+                }
+                else $paymentmode = '';
+
+                if ($don->modepaymentcode=='CHQ'){
+                    $ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
+                }
+                else if ($don->modepaymentcode=='LIQ'){
+                    $ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
+                }
+                else if ($don->modepaymentcode=='VIR' || $don->modepaymentcode=='PRE' || $don->modepaymentcode=='CB'){
+                    $ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
+                }
+                else
+                {
+                    $ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
+                }
+
+                /*
 				if (empty($don->societe))
 				{
 					$CodeDon = '<td width="33%"><input type="checkbox" disabled="true" checked="checked" > 200 du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 238 bis du CGI</td><td width="33%"><input type="checkbox" disabled="true" > 885-0 V bis A du CGI</td>';
@@ -158,279 +158,279 @@ 
 				}
 				*/
 
-				// Define contents
-				$donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
-				$form = implode('', file($donmodel));
-				$form = str_replace('__REF__',$don->id,$form);
-				$form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form);
-				//$form = str_replace('__IP__',$user->ip,$form); // TODO $user->ip not exist
-				$form = str_replace('__AMOUNT__', price($don->amount), $form);
-				$form = str_replace('__AMOUNTLETTERS__', $this->amountToLetters($don->amount),$form);
-				$form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$currency),$form);
-				$form = str_replace('__CURRENCYCODE__',$conf->currency,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__',$mysoc->object,$form);
-				$form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
-				$form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
-				$form = str_replace('__DONATOR_SOCIETE__',$don->societe,$form);
-				$form = str_replace('__DONATOR_STATUT__',$don->statut,$form);
-				$form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
-				$form = str_replace('__DONATOR_ZIP__',$don->zip,$form);
-				$form = str_replace('__DONATOR_TOWN__',$don->town,$form);
-				$form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode,$form);
-				$form = str_replace('__NOW__',dol_print_date($now,'day',false,$outputlangs),$form);
-				$form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form);
-				$form = str_replace('__DonationTitle__',$outputlangs->trans("DonationTitle"),$form);
-				$form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form);
-				$form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
-				$form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
-				$form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
-				// $form = str_replace('__CodeDon__',$CodeDon,$form);
-				$form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
-				$form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
-				$form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);
-				$form = str_replace('__Town__',$outputlangs->trans("Town"),$form);
-				$form = str_replace('__Object__',$outputlangs->trans("Object"),$form);
-				$form = str_replace('__Donor__',$outputlangs->trans("Donor"),$form);
-				$form = str_replace('__Date__',$outputlangs->trans("Date"),$form);
-				$form = str_replace('__Signature__',$outputlangs->trans("Signature"),$form);
-				$form = str_replace('__Message__',$outputlangs->trans("Message"),$form);
-				$form = str_replace('__IConfirmDonationReception__',$outputlangs->trans("IConfirmDonationReception"),$form);
-				$form = str_replace('__DonationMessage__',$conf->global->DONATION_MESSAGE,$form);
-
-				$form = str_replace('__ModePaiement__', $ModePaiement,$form);
-
-				$frencharticle='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
-				$form = str_replace('__FrenchArticle__',$frencharticle,$form);
-
-				$frencheligibility='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
-				$form = str_replace('__FrenchEligibility__',$frencheligibility,$form);
-
-				$art200='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
-					if ($conf->global->DONATION_ART200 >= 1)
-					{
-						$art200='<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
-					}
-					else
-					{
-						$art200='<input type="checkbox" disabled="true">200 du CGI';
-					}
-				}
-				$form = str_replace('__ARTICLE200__',$art200,$form);
-
-				$art238='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
-					if ($conf->global->DONATION_ART238 >= 1)
-					{
-						$art238='<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
-					}
-					else
-					{
-						$art238='<input type="checkbox" disabled="true">238 bis du CGI';
-					}
-				}
-				$form = str_replace('__ARTICLE238__',$art238,$form);
-
-				$art885='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
-					if ($conf->global->DONATION_ART885 >= 1)
-					{
-						$art885='<input type="checkbox" disabled="true" checked="checked" >885-0 V bis du CGI';
-					}
-					else
-					{
-						$art885='<input type="checkbox" disabled="true">885-0 V bis du CGI';
-					}
-				}
-				$form = str_replace('__ARTICLE885__',$art885,$form);
-
-				// Save file on disk
-				dol_syslog("html_cerfafr::write_file $file");
-				$handle=fopen($file,"w");
-				fwrite($handle,$form);
-				fclose($handle);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;
-			}
-			else
-			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-		else
-		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
-			return 0;
-		}
-	}
-
-	/**
-	 * numbers to letters
-	 *
-	 * @param   mixed   $montant    amount
-	 * @param   mixed   $devise1    devise 1 ex: euro
-	 * @param   mixed   $devise2    devise 2 ex: centimes
-	 * @return string               amount in letters
-	 */
-	private function amountToLetters($montant, $devise1='', $devise2='')
-	{
-		$unite = array();
-		$dix = array();
-		$cent = array();
-		if(empty($devise1)) $dev1='euros';
-		else $dev1=$devise1;
-		if(empty($devise2)) $dev2='centimes';
-		else $dev2=$devise2;
-		$valeur_entiere=intval($montant);
-		$valeur_decimal=intval(round($montant-intval($montant), 2)*100);
-		$dix_c=intval($valeur_decimal%100/10);
-		$cent_c=intval($valeur_decimal%1000/100);
-		$unite[1]=$valeur_entiere%10;
-		$dix[1]=intval($valeur_entiere%100/10);
-		$cent[1]=intval($valeur_entiere%1000/100);
-		$unite[2]=intval($valeur_entiere%10000/1000);
-		$dix[2]=intval($valeur_entiere%100000/10000);
-		$cent[2]=intval($valeur_entiere%1000000/100000);
-		$unite[3]=intval($valeur_entiere%10000000/1000000);
-		$dix[3]=intval($valeur_entiere%100000000/10000000);
-		$cent[3]=intval($valeur_entiere%1000000000/100000000);
-		$chif=array('', 'un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze', 'treize', 'quatorze', 'quinze', 'seize', 'dix sept', 'dix huit', 'dix neuf');
-			$secon_c='';
-			$trio_c='';
-		for($i=1; $i<=3; $i++){
-			$prim[$i]='';
-			$secon[$i]='';
-			$trio[$i]='';
-			if($dix[$i]==0){
-				$secon[$i]='';
-				$prim[$i]=$chif[$unite[$i]];
-			}
-			else if($dix[$i]==1){
-				$secon[$i]='';
-				$prim[$i]=$chif[($unite[$i]+10)];
-			}
-			else if($dix[$i]==2){
-				if($unite[$i]==1){
-				$secon[$i]='vingt et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='vingt';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==3){
-				if($unite[$i]==1){
-				$secon[$i]='trente et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='trente';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==4){
-				if($unite[$i]==1){
-				$secon[$i]='quarante et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='quarante';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==5){
-				if($unite[$i]==1){
-				$secon[$i]='cinquante et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='cinquante';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==6){
-				if($unite[$i]==1){
-				$secon[$i]='soixante et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='soixante';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==7){
-				if($unite[$i]==1){
-				$secon[$i]='soixante et';
-				$prim[$i]=$chif[$unite[$i]+10];
-				}
-				else {
-				$secon[$i]='soixante';
-				$prim[$i]=$chif[$unite[$i]+10];
-				}
-			}
-			else if($dix[$i]==8){
-				if($unite[$i]==1){
-				$secon[$i]='quatre-vingts et';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
-				$secon[$i]='quatre-vingt';
-				$prim[$i]=$chif[$unite[$i]];
-				}
-			}
-			else if($dix[$i]==9){
-				if($unite[$i]==1){
-				$secon[$i]='quatre-vingts et';
-				$prim[$i]=$chif[$unite[$i]+10];
-				}
-				else {
-				$secon[$i]='quatre-vingts';
-				$prim[$i]=$chif[$unite[$i]+10];
-				}
-			}
-			if($cent[$i]==1) $trio[$i]='cent';
-			else if($cent[$i]!=0 || $cent[$i]!='') $trio[$i]=$chif[$cent[$i]] .' cents';
-		}
-
-
-		$chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
-		$secon_c=$chif2[$dix_c];
-		if($cent_c==1) $trio_c='cent';
-		else if($cent_c!=0 || $cent_c!='') $trio_c=$chif[$cent_c] .' cents';
-
-		if(($cent[3]==0 || $cent[3]=='') && ($dix[3]==0 || $dix[3]=='') && ($unite[3]==1))
-			$somme = $trio[3]. '  ' .$secon[3]. ' ' . $prim[3]. ' million ';
-		else if(($cent[3]!=0 && $cent[3]!='') || ($dix[3]!=0 && $dix[3]!='') || ($unite[3]!=0 && $unite[3]!=''))
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3]. ' millions ';
-		else
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3];
-
-		if(($cent[2]==0 || $cent[2]=='') && ($dix[2]==0 || $dix[2]=='') && ($unite[2]==1))
-			$somme = $somme.' mille ';
-		else if(($cent[2]!=0 && $cent[2]!='') || ($dix[2]!=0 && $dix[2]!='') || ($unite[2]!=0 && $unite[2]!=''))
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2]. ' milles ';
-		else
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2];
-
-		$somme = $somme. $trio[1]. ' ' .$secon[1]. ' ' . $prim[1];
-
-		$somme = $somme. ' '. $dev1 .' ' ;
-
-		if(($cent_c=='0' || $cent_c=='') && ($dix_c=='0' || $dix_c==''))
-			return $somme. ' et z&eacute;ro '. $dev2;
-		else
-			return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
-	}
+                // Define contents
+                $donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
+                $form = implode('', file($donmodel));
+                $form = str_replace('__REF__',$don->id,$form);
+                $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form);
+                //$form = str_replace('__IP__',$user->ip,$form); // TODO $user->ip not exist
+                $form = str_replace('__AMOUNT__', price($don->amount), $form);
+                $form = str_replace('__AMOUNTLETTERS__', $this->amountToLetters($don->amount),$form);
+                $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$currency),$form);
+                $form = str_replace('__CURRENCYCODE__',$conf->currency,$form);
+                $form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
+                $form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
+                $form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form);
+                $form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form);
+                $form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__',$mysoc->object,$form);
+                $form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
+                $form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
+                $form = str_replace('__DONATOR_SOCIETE__',$don->societe,$form);
+                $form = str_replace('__DONATOR_STATUT__',$don->statut,$form);
+                $form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
+                $form = str_replace('__DONATOR_ZIP__',$don->zip,$form);
+                $form = str_replace('__DONATOR_TOWN__',$don->town,$form);
+                $form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode,$form);
+                $form = str_replace('__NOW__',dol_print_date($now,'day',false,$outputlangs),$form);
+                $form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form);
+                $form = str_replace('__DonationTitle__',$outputlangs->trans("DonationTitle"),$form);
+                $form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form);
+                $form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
+                $form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
+                $form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
+                // $form = str_replace('__CodeDon__',$CodeDon,$form);
+                $form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
+                $form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
+                $form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);
+                $form = str_replace('__Town__',$outputlangs->trans("Town"),$form);
+                $form = str_replace('__Object__',$outputlangs->trans("Object"),$form);
+                $form = str_replace('__Donor__',$outputlangs->trans("Donor"),$form);
+                $form = str_replace('__Date__',$outputlangs->trans("Date"),$form);
+                $form = str_replace('__Signature__',$outputlangs->trans("Signature"),$form);
+                $form = str_replace('__Message__',$outputlangs->trans("Message"),$form);
+                $form = str_replace('__IConfirmDonationReception__',$outputlangs->trans("IConfirmDonationReception"),$form);
+                $form = str_replace('__DonationMessage__',$conf->global->DONATION_MESSAGE,$form);
+
+                $form = str_replace('__ModePaiement__', $ModePaiement,$form);
+
+                $frencharticle='';
+                if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
+                $form = str_replace('__FrenchArticle__',$frencharticle,$form);
+
+                $frencheligibility='';
+                if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+                $form = str_replace('__FrenchEligibility__',$frencheligibility,$form);
+
+                $art200='';
+                if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+                    if ($conf->global->DONATION_ART200 >= 1)
+                    {
+                        $art200='<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
+                    }
+                    else
+                    {
+                        $art200='<input type="checkbox" disabled="true">200 du CGI';
+                    }
+                }
+                $form = str_replace('__ARTICLE200__',$art200,$form);
+
+                $art238='';
+                if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+                    if ($conf->global->DONATION_ART238 >= 1)
+                    {
+                        $art238='<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
+                    }
+                    else
+                    {
+                        $art238='<input type="checkbox" disabled="true">238 bis du CGI';
+                    }
+                }
+                $form = str_replace('__ARTICLE238__',$art238,$form);
+
+                $art885='';
+                if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+                    if ($conf->global->DONATION_ART885 >= 1)
+                    {
+                        $art885='<input type="checkbox" disabled="true" checked="checked" >885-0 V bis du CGI';
+                    }
+                    else
+                    {
+                        $art885='<input type="checkbox" disabled="true">885-0 V bis du CGI';
+                    }
+                }
+                $form = str_replace('__ARTICLE885__',$art885,$form);
+
+                // Save file on disk
+                dol_syslog("html_cerfafr::write_file $file");
+                $handle=fopen($file,"w");
+                fwrite($handle,$form);
+                fclose($handle);
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;
+            }
+            else
+            {
+                $this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+        else
+        {
+            $this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
+            return 0;
+        }
+    }
+
+    /**
+     * numbers to letters
+     *
+     * @param   mixed   $montant    amount
+     * @param   mixed   $devise1    devise 1 ex: euro
+     * @param   mixed   $devise2    devise 2 ex: centimes
+     * @return string               amount in letters
+     */
+    private function amountToLetters($montant, $devise1='', $devise2='')
+    {
+        $unite = array();
+        $dix = array();
+        $cent = array();
+        if(empty($devise1)) $dev1='euros';
+        else $dev1=$devise1;
+        if(empty($devise2)) $dev2='centimes';
+        else $dev2=$devise2;
+        $valeur_entiere=intval($montant);
+        $valeur_decimal=intval(round($montant-intval($montant), 2)*100);
+        $dix_c=intval($valeur_decimal%100/10);
+        $cent_c=intval($valeur_decimal%1000/100);
+        $unite[1]=$valeur_entiere%10;
+        $dix[1]=intval($valeur_entiere%100/10);
+        $cent[1]=intval($valeur_entiere%1000/100);
+        $unite[2]=intval($valeur_entiere%10000/1000);
+        $dix[2]=intval($valeur_entiere%100000/10000);
+        $cent[2]=intval($valeur_entiere%1000000/100000);
+        $unite[3]=intval($valeur_entiere%10000000/1000000);
+        $dix[3]=intval($valeur_entiere%100000000/10000000);
+        $cent[3]=intval($valeur_entiere%1000000000/100000000);
+        $chif=array('', 'un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze', 'treize', 'quatorze', 'quinze', 'seize', 'dix sept', 'dix huit', 'dix neuf');
+            $secon_c='';
+            $trio_c='';
+        for($i=1; $i<=3; $i++){
+            $prim[$i]='';
+            $secon[$i]='';
+            $trio[$i]='';
+            if($dix[$i]==0){
+                $secon[$i]='';
+                $prim[$i]=$chif[$unite[$i]];
+            }
+            else if($dix[$i]==1){
+                $secon[$i]='';
+                $prim[$i]=$chif[($unite[$i]+10)];
+            }
+            else if($dix[$i]==2){
+                if($unite[$i]==1){
+                $secon[$i]='vingt et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='vingt';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==3){
+                if($unite[$i]==1){
+                $secon[$i]='trente et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='trente';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==4){
+                if($unite[$i]==1){
+                $secon[$i]='quarante et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='quarante';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==5){
+                if($unite[$i]==1){
+                $secon[$i]='cinquante et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='cinquante';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==6){
+                if($unite[$i]==1){
+                $secon[$i]='soixante et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='soixante';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==7){
+                if($unite[$i]==1){
+                $secon[$i]='soixante et';
+                $prim[$i]=$chif[$unite[$i]+10];
+                }
+                else {
+                $secon[$i]='soixante';
+                $prim[$i]=$chif[$unite[$i]+10];
+                }
+            }
+            else if($dix[$i]==8){
+                if($unite[$i]==1){
+                $secon[$i]='quatre-vingts et';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+                else {
+                $secon[$i]='quatre-vingt';
+                $prim[$i]=$chif[$unite[$i]];
+                }
+            }
+            else if($dix[$i]==9){
+                if($unite[$i]==1){
+                $secon[$i]='quatre-vingts et';
+                $prim[$i]=$chif[$unite[$i]+10];
+                }
+                else {
+                $secon[$i]='quatre-vingts';
+                $prim[$i]=$chif[$unite[$i]+10];
+                }
+            }
+            if($cent[$i]==1) $trio[$i]='cent';
+            else if($cent[$i]!=0 || $cent[$i]!='') $trio[$i]=$chif[$cent[$i]] .' cents';
+        }
+
+
+        $chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
+        $secon_c=$chif2[$dix_c];
+        if($cent_c==1) $trio_c='cent';
+        else if($cent_c!=0 || $cent_c!='') $trio_c=$chif[$cent_c] .' cents';
+
+        if(($cent[3]==0 || $cent[3]=='') && ($dix[3]==0 || $dix[3]=='') && ($unite[3]==1))
+            $somme = $trio[3]. '  ' .$secon[3]. ' ' . $prim[3]. ' million ';
+        else if(($cent[3]!=0 && $cent[3]!='') || ($dix[3]!=0 && $dix[3]!='') || ($unite[3]!=0 && $unite[3]!=''))
+            $somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3]. ' millions ';
+        else
+            $somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3];
+
+        if(($cent[2]==0 || $cent[2]=='') && ($dix[2]==0 || $dix[2]=='') && ($unite[2]==1))
+            $somme = $somme.' mille ';
+        else if(($cent[2]!=0 && $cent[2]!='') || ($dix[2]!=0 && $dix[2]!='') || ($unite[2]!=0 && $unite[2]!=''))
+            $somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2]. ' milles ';
+        else
+            $somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2];
+
+        $somme = $somme. $trio[1]. ' ' .$secon[1]. ' ' . $prim[1];
+
+        $somme = $somme. ' '. $dev1 .' ' ;
+
+        if(($cent_c=='0' || $cent_c=='') && ($dix_c=='0' || $dix_c==''))
+            return $somme. ' et z&eacute;ro '. $dev2;
+        else
+            return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
+    }
 }

Spacing +186 added lines, -186 removed lines

@@ -42,7 +42,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$this->db = $db;
 		$this->name = "cerfafr";
@@ -73,49 +73,49 @@ 
 	 *  @param	string		$currency		Currency code
 	 *	@return	int             			>0 if OK, <0 if KO
 	 */
-	function write_file($don,$outputlangs,$currency='')
+	function write_file($don, $outputlangs, $currency = '')
 	{
         // phpcs:enable
-		global $user,$conf,$langs,$mysoc;
+		global $user, $conf, $langs, $mysoc;
 
-		$now=dol_now();
-		$id = (! is_object($don)?$don:'');
+		$now = dol_now();
+		$id = (!is_object($don) ? $don : '');
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 
-		if (! empty($conf->don->dir_output))
+		if (!empty($conf->don->dir_output))
 		{
 			// Definition of the object don (for upward compatibility)
-			if (! is_object($don))
+			if (!is_object($don))
 			{
 				$don = new Don($this->db);
-				$ret=$don->fetch($id);
-				$id=$don->id;
+				$ret = $don->fetch($id);
+				$id = $don->id;
 			}
 
 			// Definition of $dir and $file
-			if (! empty($don->specimen))
+			if (!empty($don->specimen))
 			{
 				$dir = $conf->don->dir_output;
-				$file = $dir . "/SPECIMEN.html";
+				$file = $dir."/SPECIMEN.html";
 			}
 			else
 			{
 				$donref = dol_sanitizeFileName($don->ref);
-				$dir = $conf->don->dir_output . "/" . $donref;
-				$file = $dir . "/" . $donref . ".html";
+				$dir = $conf->don->dir_output."/".$donref;
+				$file = $dir."/".$donref.".html";
 			}
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 					return -1;
 				}
 			}
@@ -133,13 +133,13 @@ 
 				}
 				else $paymentmode = '';
 
-				if ($don->modepaymentcode=='CHQ'){
+				if ($don->modepaymentcode == 'CHQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
-				else if ($don->modepaymentcode=='LIQ'){
+				else if ($don->modepaymentcode == 'LIQ') {
 					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
-				else if ($don->modepaymentcode=='VIR' || $don->modepaymentcode=='PRE' || $don->modepaymentcode=='CB'){
+				else if ($don->modepaymentcode == 'VIR' || $don->modepaymentcode == 'PRE' || $don->modepaymentcode == 'CB') {
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
 				}
 				else
@@ -159,103 +159,103 @@ 
 				*/
 
 				// Define contents
-				$donmodel=DOL_DOCUMENT_ROOT ."/core/modules/dons/html_cerfafr.html";
+				$donmodel = DOL_DOCUMENT_ROOT."/core/modules/dons/html_cerfafr.html";
 				$form = implode('', file($donmodel));
-				$form = str_replace('__REF__',$don->id,$form);
-				$form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form);
+				$form = str_replace('__REF__', $don->id, $form);
+				$form = str_replace('__DATE__', dol_print_date($don->date, 'day', false, $outputlangs), $form);
 				//$form = str_replace('__IP__',$user->ip,$form); // TODO $user->ip not exist
 				$form = str_replace('__AMOUNT__', price($don->amount), $form);
-				$form = str_replace('__AMOUNTLETTERS__', $this->amountToLetters($don->amount),$form);
-				$form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$currency),$form);
-				$form = str_replace('__CURRENCYCODE__',$conf->currency,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__',$mysoc->address,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form);
-				$form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__',$mysoc->object,$form);
-				$form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
-				$form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
-				$form = str_replace('__DONATOR_SOCIETE__',$don->societe,$form);
-				$form = str_replace('__DONATOR_STATUT__',$don->statut,$form);
-				$form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
-				$form = str_replace('__DONATOR_ZIP__',$don->zip,$form);
-				$form = str_replace('__DONATOR_TOWN__',$don->town,$form);
-				$form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode,$form);
-				$form = str_replace('__NOW__',dol_print_date($now,'day',false,$outputlangs),$form);
-				$form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form);
-				$form = str_replace('__DonationTitle__',$outputlangs->trans("DonationTitle"),$form);
-				$form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form);
-				$form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form);
-				$form = str_replace('__DonationDatePayment__',$outputlangs->trans("DonationDatePayment"),$form);
-				$form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form);
+				$form = str_replace('__AMOUNTLETTERS__', $this->amountToLetters($don->amount), $form);
+				$form = str_replace('__CURRENCY__', $outputlangs->transnoentitiesnoconv("Currency".$currency), $form);
+				$form = str_replace('__CURRENCYCODE__', $conf->currency, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_NOM__', $mysoc->name, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_ADDRESS__', $mysoc->address, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_ZIP__', $mysoc->zip, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_TOWN__', $mysoc->town, $form);
+				$form = str_replace('__MAIN_INFO_SOCIETE_OBJECT__', $mysoc->object, $form);
+				$form = str_replace('__DONATOR_FIRSTNAME__', $don->firstname, $form);
+				$form = str_replace('__DONATOR_LASTNAME__', $don->lastname, $form);
+				$form = str_replace('__DONATOR_SOCIETE__', $don->societe, $form);
+				$form = str_replace('__DONATOR_STATUT__', $don->statut, $form);
+				$form = str_replace('__DONATOR_ADDRESS__', $don->address, $form);
+				$form = str_replace('__DONATOR_ZIP__', $don->zip, $form);
+				$form = str_replace('__DONATOR_TOWN__', $don->town, $form);
+				$form = str_replace('__PAYMENTMODE_LIB__ ', $paymentmode, $form);
+				$form = str_replace('__NOW__', dol_print_date($now, 'day', false, $outputlangs), $form);
+				$form = str_replace('__DonationRef__', $outputlangs->trans("DonationRef"), $form);
+				$form = str_replace('__DonationTitle__', $outputlangs->trans("DonationTitle"), $form);
+				$form = str_replace('__DonationReceipt__', $outputlangs->trans("DonationReceipt"), $form);
+				$form = str_replace('__DonationRecipient__', $outputlangs->trans("DonationRecipient"), $form);
+				$form = str_replace('__DonationDatePayment__', $outputlangs->trans("DonationDatePayment"), $form);
+				$form = str_replace('__PaymentMode__', $outputlangs->trans("PaymentMode"), $form);
 				// $form = str_replace('__CodeDon__',$CodeDon,$form);
-				$form = str_replace('__Name__',$outputlangs->trans("Name"),$form);
-				$form = str_replace('__Address__',$outputlangs->trans("Address"),$form);
-				$form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form);
-				$form = str_replace('__Town__',$outputlangs->trans("Town"),$form);
-				$form = str_replace('__Object__',$outputlangs->trans("Object"),$form);
-				$form = str_replace('__Donor__',$outputlangs->trans("Donor"),$form);
-				$form = str_replace('__Date__',$outputlangs->trans("Date"),$form);
-				$form = str_replace('__Signature__',$outputlangs->trans("Signature"),$form);
-				$form = str_replace('__Message__',$outputlangs->trans("Message"),$form);
-				$form = str_replace('__IConfirmDonationReception__',$outputlangs->trans("IConfirmDonationReception"),$form);
-				$form = str_replace('__DonationMessage__',$conf->global->DONATION_MESSAGE,$form);
-
-				$form = str_replace('__ModePaiement__', $ModePaiement,$form);
-
-				$frencharticle='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
-				$form = str_replace('__FrenchArticle__',$frencharticle,$form);
-
-				$frencheligibility='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
-				$form = str_replace('__FrenchEligibility__',$frencheligibility,$form);
-
-				$art200='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+				$form = str_replace('__Name__', $outputlangs->trans("Name"), $form);
+				$form = str_replace('__Address__', $outputlangs->trans("Address"), $form);
+				$form = str_replace('__Zip__', $outputlangs->trans("Zip"), $form);
+				$form = str_replace('__Town__', $outputlangs->trans("Town"), $form);
+				$form = str_replace('__Object__', $outputlangs->trans("Object"), $form);
+				$form = str_replace('__Donor__', $outputlangs->trans("Donor"), $form);
+				$form = str_replace('__Date__', $outputlangs->trans("Date"), $form);
+				$form = str_replace('__Signature__', $outputlangs->trans("Signature"), $form);
+				$form = str_replace('__Message__', $outputlangs->trans("Message"), $form);
+				$form = str_replace('__IConfirmDonationReception__', $outputlangs->trans("IConfirmDonationReception"), $form);
+				$form = str_replace('__DonationMessage__', $conf->global->DONATION_MESSAGE, $form);
+
+				$form = str_replace('__ModePaiement__', $ModePaiement, $form);
+
+				$frencharticle = '';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) $frencharticle = '<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
+				$form = str_replace('__FrenchArticle__', $frencharticle, $form);
+
+				$frencheligibility = '';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) $frencheligibility = 'Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				$form = str_replace('__FrenchEligibility__', $frencheligibility, $form);
+
+				$art200 = '';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
 					if ($conf->global->DONATION_ART200 >= 1)
 					{
-						$art200='<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
+						$art200 = '<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
 					}
 					else
 					{
-						$art200='<input type="checkbox" disabled="true">200 du CGI';
+						$art200 = '<input type="checkbox" disabled="true">200 du CGI';
 					}
 				}
-				$form = str_replace('__ARTICLE200__',$art200,$form);
+				$form = str_replace('__ARTICLE200__', $art200, $form);
 
-				$art238='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+				$art238 = '';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
 					if ($conf->global->DONATION_ART238 >= 1)
 					{
-						$art238='<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
+						$art238 = '<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
 					}
 					else
 					{
-						$art238='<input type="checkbox" disabled="true">238 bis du CGI';
+						$art238 = '<input type="checkbox" disabled="true">238 bis du CGI';
 					}
 				}
-				$form = str_replace('__ARTICLE238__',$art238,$form);
+				$form = str_replace('__ARTICLE238__', $art238, $form);
 
-				$art885='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+				$art885 = '';
+				if (preg_match('/fr/i', $outputlangs->defaultlang)) {
 					if ($conf->global->DONATION_ART885 >= 1)
 					{
-						$art885='<input type="checkbox" disabled="true" checked="checked" >885-0 V bis du CGI';
+						$art885 = '<input type="checkbox" disabled="true" checked="checked" >885-0 V bis du CGI';
 					}
 					else
 					{
-						$art885='<input type="checkbox" disabled="true">885-0 V bis du CGI';
+						$art885 = '<input type="checkbox" disabled="true">885-0 V bis du CGI';
 					}
 				}
-				$form = str_replace('__ARTICLE885__',$art885,$form);
+				$form = str_replace('__ARTICLE885__', $art885, $form);
 
 				// Save file on disk
 				dol_syslog("html_cerfafr::write_file $file");
-				$handle=fopen($file,"w");
-				fwrite($handle,$form);
+				$handle = fopen($file, "w");
+				fwrite($handle, $form);
 				fclose($handle);
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
@@ -264,13 +264,13 @@ 
 			}
 			else
 			{
-				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->trans("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
+			$this->error = $langs->trans("ErrorConstantNotDefined", "DON_OUTPUTDIR");
 			return 0;
 		}
 	}
@@ -283,154 +283,154 @@ 
 	 * @param   mixed   $devise2    devise 2 ex: centimes
 	 * @return string               amount in letters
 	 */
-	private function amountToLetters($montant, $devise1='', $devise2='')
+	private function amountToLetters($montant, $devise1 = '', $devise2 = '')
 	{
 		$unite = array();
 		$dix = array();
 		$cent = array();
-		if(empty($devise1)) $dev1='euros';
-		else $dev1=$devise1;
-		if(empty($devise2)) $dev2='centimes';
-		else $dev2=$devise2;
-		$valeur_entiere=intval($montant);
-		$valeur_decimal=intval(round($montant-intval($montant), 2)*100);
-		$dix_c=intval($valeur_decimal%100/10);
-		$cent_c=intval($valeur_decimal%1000/100);
-		$unite[1]=$valeur_entiere%10;
-		$dix[1]=intval($valeur_entiere%100/10);
-		$cent[1]=intval($valeur_entiere%1000/100);
-		$unite[2]=intval($valeur_entiere%10000/1000);
-		$dix[2]=intval($valeur_entiere%100000/10000);
-		$cent[2]=intval($valeur_entiere%1000000/100000);
-		$unite[3]=intval($valeur_entiere%10000000/1000000);
-		$dix[3]=intval($valeur_entiere%100000000/10000000);
-		$cent[3]=intval($valeur_entiere%1000000000/100000000);
-		$chif=array('', 'un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze', 'treize', 'quatorze', 'quinze', 'seize', 'dix sept', 'dix huit', 'dix neuf');
-			$secon_c='';
-			$trio_c='';
-		for($i=1; $i<=3; $i++){
-			$prim[$i]='';
-			$secon[$i]='';
-			$trio[$i]='';
-			if($dix[$i]==0){
-				$secon[$i]='';
-				$prim[$i]=$chif[$unite[$i]];
+		if (empty($devise1)) $dev1 = 'euros';
+		else $dev1 = $devise1;
+		if (empty($devise2)) $dev2 = 'centimes';
+		else $dev2 = $devise2;
+		$valeur_entiere = intval($montant);
+		$valeur_decimal = intval(round($montant - intval($montant), 2) * 100);
+		$dix_c = intval($valeur_decimal % 100 / 10);
+		$cent_c = intval($valeur_decimal % 1000 / 100);
+		$unite[1] = $valeur_entiere % 10;
+		$dix[1] = intval($valeur_entiere % 100 / 10);
+		$cent[1] = intval($valeur_entiere % 1000 / 100);
+		$unite[2] = intval($valeur_entiere % 10000 / 1000);
+		$dix[2] = intval($valeur_entiere % 100000 / 10000);
+		$cent[2] = intval($valeur_entiere % 1000000 / 100000);
+		$unite[3] = intval($valeur_entiere % 10000000 / 1000000);
+		$dix[3] = intval($valeur_entiere % 100000000 / 10000000);
+		$cent[3] = intval($valeur_entiere % 1000000000 / 100000000);
+		$chif = array('', 'un', 'deux', 'trois', 'quatre', 'cinq', 'six', 'sept', 'huit', 'neuf', 'dix', 'onze', 'douze', 'treize', 'quatorze', 'quinze', 'seize', 'dix sept', 'dix huit', 'dix neuf');
+			$secon_c = '';
+			$trio_c = '';
+		for ($i = 1; $i <= 3; $i++) {
+			$prim[$i] = '';
+			$secon[$i] = '';
+			$trio[$i] = '';
+			if ($dix[$i] == 0) {
+				$secon[$i] = '';
+				$prim[$i] = $chif[$unite[$i]];
 			}
-			else if($dix[$i]==1){
-				$secon[$i]='';
-				$prim[$i]=$chif[($unite[$i]+10)];
+			else if ($dix[$i] == 1) {
+				$secon[$i] = '';
+				$prim[$i] = $chif[($unite[$i] + 10)];
 			}
-			else if($dix[$i]==2){
-				if($unite[$i]==1){
-				$secon[$i]='vingt et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 2) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'vingt et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='vingt';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'vingt';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==3){
-				if($unite[$i]==1){
-				$secon[$i]='trente et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 3) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'trente et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='trente';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'trente';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==4){
-				if($unite[$i]==1){
-				$secon[$i]='quarante et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 4) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'quarante et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='quarante';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'quarante';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==5){
-				if($unite[$i]==1){
-				$secon[$i]='cinquante et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 5) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'cinquante et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='cinquante';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'cinquante';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==6){
-				if($unite[$i]==1){
-				$secon[$i]='soixante et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 6) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'soixante et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='soixante';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'soixante';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==7){
-				if($unite[$i]==1){
-				$secon[$i]='soixante et';
-				$prim[$i]=$chif[$unite[$i]+10];
+			else if ($dix[$i] == 7) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'soixante et';
+				$prim[$i] = $chif[$unite[$i] + 10];
 				}
 				else {
-				$secon[$i]='soixante';
-				$prim[$i]=$chif[$unite[$i]+10];
+				$secon[$i] = 'soixante';
+				$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			}
-			else if($dix[$i]==8){
-				if($unite[$i]==1){
-				$secon[$i]='quatre-vingts et';
-				$prim[$i]=$chif[$unite[$i]];
+			else if ($dix[$i] == 8) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'quatre-vingts et';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 				else {
-				$secon[$i]='quatre-vingt';
-				$prim[$i]=$chif[$unite[$i]];
+				$secon[$i] = 'quatre-vingt';
+				$prim[$i] = $chif[$unite[$i]];
 				}
 			}
-			else if($dix[$i]==9){
-				if($unite[$i]==1){
-				$secon[$i]='quatre-vingts et';
-				$prim[$i]=$chif[$unite[$i]+10];
+			else if ($dix[$i] == 9) {
+				if ($unite[$i] == 1) {
+				$secon[$i] = 'quatre-vingts et';
+				$prim[$i] = $chif[$unite[$i] + 10];
 				}
 				else {
-				$secon[$i]='quatre-vingts';
-				$prim[$i]=$chif[$unite[$i]+10];
+				$secon[$i] = 'quatre-vingts';
+				$prim[$i] = $chif[$unite[$i] + 10];
 				}
 			}
-			if($cent[$i]==1) $trio[$i]='cent';
-			else if($cent[$i]!=0 || $cent[$i]!='') $trio[$i]=$chif[$cent[$i]] .' cents';
+			if ($cent[$i] == 1) $trio[$i] = 'cent';
+			else if ($cent[$i] != 0 || $cent[$i] != '') $trio[$i] = $chif[$cent[$i]].' cents';
 		}
 
 
-		$chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
-		$secon_c=$chif2[$dix_c];
-		if($cent_c==1) $trio_c='cent';
-		else if($cent_c!=0 || $cent_c!='') $trio_c=$chif[$cent_c] .' cents';
+		$chif2 = array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
+		$secon_c = $chif2[$dix_c];
+		if ($cent_c == 1) $trio_c = 'cent';
+		else if ($cent_c != 0 || $cent_c != '') $trio_c = $chif[$cent_c].' cents';
 
-		if(($cent[3]==0 || $cent[3]=='') && ($dix[3]==0 || $dix[3]=='') && ($unite[3]==1))
-			$somme = $trio[3]. '  ' .$secon[3]. ' ' . $prim[3]. ' million ';
-		else if(($cent[3]!=0 && $cent[3]!='') || ($dix[3]!=0 && $dix[3]!='') || ($unite[3]!=0 && $unite[3]!=''))
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3]. ' millions ';
+		if (($cent[3] == 0 || $cent[3] == '') && ($dix[3] == 0 || $dix[3] == '') && ($unite[3] == 1))
+			$somme = $trio[3].'  '.$secon[3].' '.$prim[3].' million ';
+		else if (($cent[3] != 0 && $cent[3] != '') || ($dix[3] != 0 && $dix[3] != '') || ($unite[3] != 0 && $unite[3] != ''))
+			$somme = $trio[3].' '.$secon[3].' '.$prim[3].' millions ';
 		else
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3];
+			$somme = $trio[3].' '.$secon[3].' '.$prim[3];
 
-		if(($cent[2]==0 || $cent[2]=='') && ($dix[2]==0 || $dix[2]=='') && ($unite[2]==1))
+		if (($cent[2] == 0 || $cent[2] == '') && ($dix[2] == 0 || $dix[2] == '') && ($unite[2] == 1))
 			$somme = $somme.' mille ';
-		else if(($cent[2]!=0 && $cent[2]!='') || ($dix[2]!=0 && $dix[2]!='') || ($unite[2]!=0 && $unite[2]!=''))
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2]. ' milles ';
+		else if (($cent[2] != 0 && $cent[2] != '') || ($dix[2] != 0 && $dix[2] != '') || ($unite[2] != 0 && $unite[2] != ''))
+			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2].' milles ';
 		else
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2];
+			$somme = $somme.$trio[2].' '.$secon[2].' '.$prim[2];
 
-		$somme = $somme. $trio[1]. ' ' .$secon[1]. ' ' . $prim[1];
+		$somme = $somme.$trio[1].' '.$secon[1].' '.$prim[1];
 
-		$somme = $somme. ' '. $dev1 .' ' ;
+		$somme = $somme.' '.$dev1.' ';
 
-		if(($cent_c=='0' || $cent_c=='') && ($dix_c=='0' || $dix_c==''))
-			return $somme. ' et z&eacute;ro '. $dev2;
+		if (($cent_c == '0' || $cent_c == '') && ($dix_c == '0' || $dix_c == ''))
+			return $somme.' et z&eacute;ro '.$dev2;
 		else
-			return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
+			return $somme.$trio_c.' '.$secon_c.' '.$dev2;
 	}
 }

Braces +81 added lines, -84 removed lines

@@ -81,7 +81,9 @@ 
 		$now=dol_now();
 		$id = (! is_object($don)?$don:'');
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "donations"));
@@ -103,8 +105,7 @@ 
 			{
 				$dir = $conf->don->dir_output;
 				$file = $dir . "/SPECIMEN.html";
-			}
-			else
+			} else
 			{
 				$donref = dol_sanitizeFileName($don->ref);
 				$dir = $conf->don->dir_output . "/" . $donref;
@@ -130,19 +131,17 @@ 
 				{
 					$formclass->load_cache_types_paiements();
 					$paymentmode = $formclass->cache_types_paiements[$don->modepaiementid]['label'];
+				} else {
+				    $paymentmode = '';
 				}
-				else $paymentmode = '';
 
 				if ($don->modepaymentcode=='CHQ'){
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox" disabled="true" checked="checked"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else if ($don->modepaymentcode=='LIQ'){
+				} else if ($don->modepaymentcode=='LIQ'){
 					$ModePaiement = '<td width="25%"><input type="checkbox" checked="checked"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else if ($don->modepaymentcode=='VIR' || $don->modepaymentcode=='PRE' || $don->modepaymentcode=='CB'){
+				} else if ($don->modepaymentcode=='VIR' || $don->modepaymentcode=='PRE' || $don->modepaymentcode=='CB'){
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox" checked="checked"> Virement, prélèvement, carte bancaire</td>';
-				}
-				else
+				} else
 				{
 					$ModePaiement = '<td width="25%"><input type="checkbox"> Remise d\'espèces</td><td width="25%"><input type="checkbox"> Chèque</td><td width="50%"><input type="checkbox"> Virement, prélèvement, carte bancaire</td>';
 				}
@@ -204,11 +203,15 @@ 
 				$form = str_replace('__ModePaiement__', $ModePaiement,$form);
 
 				$frencharticle='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+				    $frencharticle='<font size="+1">Article 200, 238 bis et 885-0 V bis A du code général des impôts (CGI)</font>';
+				}
 				$form = str_replace('__FrenchArticle__',$frencharticle,$form);
 
 				$frencheligibility='';
-				if (preg_match('/fr/i',$outputlangs->defaultlang)) $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				if (preg_match('/fr/i',$outputlangs->defaultlang)) {
+				    $frencheligibility='Le bénéficiaire certifie sur l\'honneur que les dons et versements qu\'il reçoit ouvrent droit à la réduction d\'impôt prévue à l\'article :';
+				}
 				$form = str_replace('__FrenchEligibility__',$frencheligibility,$form);
 
 				$art200='';
@@ -216,8 +219,7 @@ 
 					if ($conf->global->DONATION_ART200 >= 1)
 					{
 						$art200='<input type="checkbox" disabled="true" checked="checked" >200 du CGI';
-					}
-					else
+					} else
 					{
 						$art200='<input type="checkbox" disabled="true">200 du CGI';
 					}
@@ -229,8 +231,7 @@ 
 					if ($conf->global->DONATION_ART238 >= 1)
 					{
 						$art238='<input type="checkbox" disabled="true" checked="checked" >238 bis du CGI';
-					}
-					else
+					} else
 					{
 						$art238='<input type="checkbox" disabled="true">238 bis du CGI';
 					}
@@ -242,8 +243,7 @@ 
 					if ($conf->global->DONATION_ART885 >= 1)
 					{
 						$art885='<input type="checkbox" disabled="true" checked="checked" >885-0 V bis du CGI';
-					}
-					else
+					} else
 					{
 						$art885='<input type="checkbox" disabled="true">885-0 V bis du CGI';
 					}
@@ -255,20 +255,19 @@ 
 				$handle=fopen($file,"w");
 				fwrite($handle,$form);
 				fclose($handle);
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$langs->trans("ErrorCanNotCreateDir",$dir);
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$langs->trans("ErrorConstantNotDefined","DON_OUTPUTDIR");
 			return 0;
@@ -288,10 +287,16 @@ 
 		$unite = array();
 		$dix = array();
 		$cent = array();
-		if(empty($devise1)) $dev1='euros';
-		else $dev1=$devise1;
-		if(empty($devise2)) $dev2='centimes';
-		else $dev2=$devise2;
+		if(empty($devise1)) {
+		    $dev1='euros';
+		} else {
+		    $dev1=$devise1;
+		}
+		if(empty($devise2)) {
+		    $dev2='centimes';
+		} else {
+		    $dev2=$devise2;
+		}
 		$valeur_entiere=intval($montant);
 		$valeur_decimal=intval(round($montant-intval($montant), 2)*100);
 		$dix_c=intval($valeur_decimal%100/10);
@@ -315,122 +320,114 @@ 
 			if($dix[$i]==0){
 				$secon[$i]='';
 				$prim[$i]=$chif[$unite[$i]];
-			}
-			else if($dix[$i]==1){
+			} else if($dix[$i]==1){
 				$secon[$i]='';
 				$prim[$i]=$chif[($unite[$i]+10)];
-			}
-			else if($dix[$i]==2){
+			} else if($dix[$i]==2){
 				if($unite[$i]==1){
 				$secon[$i]='vingt et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='vingt';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==3){
+			} else if($dix[$i]==3){
 				if($unite[$i]==1){
 				$secon[$i]='trente et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='trente';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==4){
+			} else if($dix[$i]==4){
 				if($unite[$i]==1){
 				$secon[$i]='quarante et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='quarante';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==5){
+			} else if($dix[$i]==5){
 				if($unite[$i]==1){
 				$secon[$i]='cinquante et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='cinquante';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==6){
+			} else if($dix[$i]==6){
 				if($unite[$i]==1){
 				$secon[$i]='soixante et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='soixante';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==7){
+			} else if($dix[$i]==7){
 				if($unite[$i]==1){
 				$secon[$i]='soixante et';
 				$prim[$i]=$chif[$unite[$i]+10];
-				}
-				else {
+				} else {
 				$secon[$i]='soixante';
 				$prim[$i]=$chif[$unite[$i]+10];
 				}
-			}
-			else if($dix[$i]==8){
+			} else if($dix[$i]==8){
 				if($unite[$i]==1){
 				$secon[$i]='quatre-vingts et';
 				$prim[$i]=$chif[$unite[$i]];
-				}
-				else {
+				} else {
 				$secon[$i]='quatre-vingt';
 				$prim[$i]=$chif[$unite[$i]];
 				}
-			}
-			else if($dix[$i]==9){
+			} else if($dix[$i]==9){
 				if($unite[$i]==1){
 				$secon[$i]='quatre-vingts et';
 				$prim[$i]=$chif[$unite[$i]+10];
-				}
-				else {
+				} else {
 				$secon[$i]='quatre-vingts';
 				$prim[$i]=$chif[$unite[$i]+10];
 				}
 			}
-			if($cent[$i]==1) $trio[$i]='cent';
-			else if($cent[$i]!=0 || $cent[$i]!='') $trio[$i]=$chif[$cent[$i]] .' cents';
+			if($cent[$i]==1) {
+			    $trio[$i]='cent';
+			} else if($cent[$i]!=0 || $cent[$i]!='') {
+			    $trio[$i]=$chif[$cent[$i]] .' cents';
+			}
 		}
 
 
 		$chif2=array('', 'dix', 'vingt', 'trente', 'quarante', 'cinquante', 'soixante', 'soixante-dix', 'quatre-vingts', 'quatre-vingts dix');
 		$secon_c=$chif2[$dix_c];
-		if($cent_c==1) $trio_c='cent';
-		else if($cent_c!=0 || $cent_c!='') $trio_c=$chif[$cent_c] .' cents';
-
-		if(($cent[3]==0 || $cent[3]=='') && ($dix[3]==0 || $dix[3]=='') && ($unite[3]==1))
-			$somme = $trio[3]. '  ' .$secon[3]. ' ' . $prim[3]. ' million ';
-		else if(($cent[3]!=0 && $cent[3]!='') || ($dix[3]!=0 && $dix[3]!='') || ($unite[3]!=0 && $unite[3]!=''))
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3]. ' millions ';
-		else
-			$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3];
-
-		if(($cent[2]==0 || $cent[2]=='') && ($dix[2]==0 || $dix[2]=='') && ($unite[2]==1))
-			$somme = $somme.' mille ';
-		else if(($cent[2]!=0 && $cent[2]!='') || ($dix[2]!=0 && $dix[2]!='') || ($unite[2]!=0 && $unite[2]!=''))
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2]. ' milles ';
-		else
-			$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2];
+		if($cent_c==1) {
+		    $trio_c='cent';
+		} else if($cent_c!=0 || $cent_c!='') {
+		    $trio_c=$chif[$cent_c] .' cents';
+		}
+
+		if(($cent[3]==0 || $cent[3]=='') && ($dix[3]==0 || $dix[3]=='') && ($unite[3]==1)) {
+					$somme = $trio[3]. '  ' .$secon[3]. ' ' . $prim[3]. ' million ';
+		} else if(($cent[3]!=0 && $cent[3]!='') || ($dix[3]!=0 && $dix[3]!='') || ($unite[3]!=0 && $unite[3]!='')) {
+					$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3]. ' millions ';
+		} else {
+					$somme = $trio[3]. ' ' .$secon[3]. ' ' . $prim[3];
+		}
+
+		if(($cent[2]==0 || $cent[2]=='') && ($dix[2]==0 || $dix[2]=='') && ($unite[2]==1)) {
+					$somme = $somme.' mille ';
+		} else if(($cent[2]!=0 && $cent[2]!='') || ($dix[2]!=0 && $dix[2]!='') || ($unite[2]!=0 && $unite[2]!='')) {
+					$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2]. ' milles ';
+		} else {
+					$somme = $somme. $trio[2]. ' ' .$secon[2]. ' ' . $prim[2];
+		}
 
 		$somme = $somme. $trio[1]. ' ' .$secon[1]. ' ' . $prim[1];
 
 		$somme = $somme. ' '. $dev1 .' ' ;
 
-		if(($cent_c=='0' || $cent_c=='') && ($dix_c=='0' || $dix_c==''))
-			return $somme. ' et z&eacute;ro '. $dev2;
-		else
-			return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
+		if(($cent_c=='0' || $cent_c=='') && ($dix_c=='0' || $dix_c=='')) {
+					return $somme. ' et z&eacute;ro '. $dev2;
+		} else {
+					return $somme. $trio_c. ' ' .$secon_c. ' ' . $dev2;
+		}
 	}
 }

dolibarr/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php

Indentation +492 added lines, -492 removed lines

@@ -35,135 +35,135 @@ 
 
 class pdf_sepamandate extends ModeleBankAccountDoc
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $langs, $mysoc;
-
-		// Translations
-		$langs->loadLangs(array("main", "bank", "withdrawals", "companies"));
-
-		$this->db = $db;
-		$this->name = "sepamandate";
-		$this->description = $langs->transnoentitiesnoconv("DocumentModelSepaMandate");
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-
-		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-
-		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxworkload=$this->marge_gauche+100;
-		$this->posxprogress=$this->marge_gauche+130;
-		$this->posxdatestart=$this->marge_gauche+150;
-		$this->posxdateend=$this->marge_gauche+170;
-	}
+    public $version = 'dolibarr';
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $langs, $mysoc;
+
+        // Translations
+        $langs->loadLangs(array("main", "bank", "withdrawals", "companies"));
+
+        $this->db = $db;
+        $this->name = "sepamandate";
+        $this->description = $langs->transnoentitiesnoconv("DocumentModelSepaMandate");
+
+        // Dimension page pour format A4
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+        $this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+
+        // Recupere emmetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+
+        // Defini position des colonnes
+        $this->posxref=$this->marge_gauche+1;
+        $this->posxlabel=$this->marge_gauche+25;
+        $this->posxworkload=$this->marge_gauche+100;
+        $this->posxprogress=$this->marge_gauche+130;
+        $this->posxdatestart=$this->marge_gauche+150;
+        $this->posxdateend=$this->marge_gauche+170;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
     /**
-	 *  Fonction generant le projet sur le disque
-	 *
-	 *	@param	    Project		$object   		    Object project a generer
-	 *	@param	    Translate	$outputlangs	    Lang output object
+     *  Fonction generant le projet sur le disque
+     *
+     *	@param	    Project		$object   		    Object project a generer
+     *	@param	    Translate	$outputlangs	    Lang output object
      *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
      *  @param		int			$hidedetails		Do not show line details (not used for this template)
      *  @param		int			$hidedesc			Do not show desc (not used for this template)
      *  @param		int			$hideref			Do not show ref (not used for this template)
      *  @param      null|array  $moreparams         More parameters
-	 *	@return	    int         				    1 if OK, <=0 if KO
-	 */
-	function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
-	{
+     *	@return	    int         				    1 if OK, <=0 if KO
+     */
+    function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+    {
         // phpcs:enable
-		global $conf, $hookmanager, $langs, $user, $mysoc;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
-
-		if (! empty($conf->bank->dir_output))
-		{
-			//$nblignes = count($object->lines);  // This is set later with array of tasks
-
-		    // Definition of $dir and $file
-		    if ($object->specimen)
-		    {
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
-		    {
-		        $objectref = dol_sanitizeFileName($object->ref);
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
-		    }
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        global $conf, $hookmanager, $langs, $user, $mysoc;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
+
+        if (! empty($conf->bank->dir_output))
+        {
+            //$nblignes = count($object->lines);  // This is set later with array of tasks
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+                else $dir = $conf->bank->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+                else $dir = $conf->bank->dir_output . "/" . $objectref;
+                $file = $dir . "/" . $langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+                $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+                $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -173,419 +173,419 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("SepaMandate"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("SepaMandate"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-				// New page
-				$pdf->AddPage();
-				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-				$tab_top = 50;
-				$tab_height = 200;
-				$tab_top_newpage = 40;
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("SepaMandate"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("SepaMandate"));
+                if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+                $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+                // New page
+                $pdf->AddPage();
+                $pagenb++;
+                $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
+
+                $tab_top = 50;
+                $tab_height = 200;
+                $tab_top_newpage = 40;
                 $tab_height_newpage = 210;
 
-				// Affiche notes
-				if (! empty($object->note_public))
-				{
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-($tab_top-2);
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
-
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
-
-				$posY = $curY;
-
-				$pdf->SetFont('','', $default_font_size);
-
-				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=2;
-
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
-
-				$posY=$pdf->GetY();
-				$posY+=2;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$ics='';
-				if (! empty($conf->global->PRELEVEMENT_ICS)) $ics=$conf->global->PRELEVEMENT_ICS;
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
-
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorName").' : '.$mysoc->name, 0, 'L');
-
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $mysoc->getFullAddress(), 0, 'L');
-
-				$posY=$pdf->GetY();
-				$posY+=3;
-
-				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-
-				$pdf->SetFont('','', $default_font_size - 1);
-
-				$posY+=8;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 8, $outputlangs->transnoentitiesnoconv("SEPALegalText", $mysoc->name, $mysoc->name), 0, 'L');
-
-				// Your data form
-				$posY=$pdf->GetY();
-				$posY+=8;
-				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=2;
-
-				$pdf->SetFont('','', $default_font_size);
-
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFillForm"), 0, 'C');
-
-				$thirdparty=new Societe($this->db);
-				if ($object->socid > 0) $thirdparty->fetch($object->socid);
-
-				$sepaname = '______________________________________________';
-				if ($thirdparty->id > 0)
-				{
-				    $sepaname = $thirdparty->name.($object->account_owner?' ('.$object->account_owner.')':'');
-				}
-				$posY=$pdf->GetY();
-				$posY+=3;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourName").' * : ', 0, 'L');
-				$pdf->SetXY(80, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepaname, 0, 'L');
-
-			    $address = '______________________________________________';
-				if ($thirdparty->id > 0)
-				{
-				    $address = $thirdparty->getFullAddress();
-				}
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
-				$pdf->SetXY(80, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
-				if (preg_match('/_____/', $address))
-				{
-    				$posY+=6;
-    				$pdf->SetXY(80, $posY);
-    				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
-				}
-
-				$ban = '__________________________________________________';
-				if (! empty($object->iban)) $ban = $object->iban;
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBAN").' * : ', 0, 'L');
-				$pdf->SetXY(80, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $ban, 0, 'L');
-
-				$bic = '__________________________________________________';
-				if (! empty($object->bic)) $bic = $object->bic;
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBIC").' * : ', 0, 'L');
-				$pdf->SetXY(80, $posY);
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $bic, 0, 'L');
-
-
-				$posY=$pdf->GetY();
-				$posY+=1;
-				$pdf->SetXY($this->marge_gauche, $posY);
-				$txt = $outputlangs->transnoentitiesnoconv("SEPAFrstOrRecur").' * : ';
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				$pdf->Rect(80, $posY, 5, 5);
-				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
-				$pdf->SetXY(86, $posY);
-				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				$posY+=6;
-				$pdf->Rect(80, $posY, 5, 5);
-				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
-				$pdf->SetXY(86, $posY);
-				$txt = $langs->transnoentitiesnoconv("ModeFRST");
-				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				if (empty($object->frstrecur))
-				{
-    				$posY+=6;
-    				$pdf->SetXY(80, $posY);
-				    $txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
-    				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				}
-
-				$posY=$pdf->GetY();
-				$posY+=3;
-				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=3;
-
-
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				/*var_dump($tab_top);
+                // Affiche notes
+                if (! empty($object->note_public))
+                {
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+                    $nexY = $pdf->GetY();
+                    $height_note=$nexY-($tab_top-2);
+
+                    // Rect prend une longueur en 3eme param
+                    $pdf->SetDrawColor(192,192,192);
+                    $pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+                    $tab_height = $tab_height - $height_note;
+                    $tab_top = $nexY+6;
+                }
+                else
+                {
+                    $height_note=0;
+                }
+
+                $iniY = $tab_top + 7;
+                $curY = $tab_top + 7;
+                $nexY = $tab_top + 7;
+
+                $posY = $curY;
+
+                $pdf->SetFont('','', $default_font_size);
+
+                $pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
+                $posY+=2;
+
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
+
+                $posY=$pdf->GetY();
+                $posY+=2;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $ics='';
+                if (! empty($conf->global->PRELEVEMENT_ICS)) $ics=$conf->global->PRELEVEMENT_ICS;
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
+
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorName").' : '.$mysoc->name, 0, 'L');
+
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $mysoc->getFullAddress(), 0, 'L');
+
+                $posY=$pdf->GetY();
+                $posY+=3;
+
+                $pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
+
+                $pdf->SetFont('','', $default_font_size - 1);
+
+                $posY+=8;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 8, $outputlangs->transnoentitiesnoconv("SEPALegalText", $mysoc->name, $mysoc->name), 0, 'L');
+
+                // Your data form
+                $posY=$pdf->GetY();
+                $posY+=8;
+                $pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
+                $posY+=2;
+
+                $pdf->SetFont('','', $default_font_size);
+
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFillForm"), 0, 'C');
+
+                $thirdparty=new Societe($this->db);
+                if ($object->socid > 0) $thirdparty->fetch($object->socid);
+
+                $sepaname = '______________________________________________';
+                if ($thirdparty->id > 0)
+                {
+                    $sepaname = $thirdparty->name.($object->account_owner?' ('.$object->account_owner.')':'');
+                }
+                $posY=$pdf->GetY();
+                $posY+=3;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourName").' * : ', 0, 'L');
+                $pdf->SetXY(80, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $sepaname, 0, 'L');
+
+                $address = '______________________________________________';
+                if ($thirdparty->id > 0)
+                {
+                    $address = $thirdparty->getFullAddress();
+                }
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
+                $pdf->SetXY(80, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
+                if (preg_match('/_____/', $address))
+                {
+                    $posY+=6;
+                    $pdf->SetXY(80, $posY);
+                    $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
+                }
+
+                $ban = '__________________________________________________';
+                if (! empty($object->iban)) $ban = $object->iban;
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBAN").' * : ', 0, 'L');
+                $pdf->SetXY(80, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $ban, 0, 'L');
+
+                $bic = '__________________________________________________';
+                if (! empty($object->bic)) $bic = $object->bic;
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBIC").' * : ', 0, 'L');
+                $pdf->SetXY(80, $posY);
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $bic, 0, 'L');
+
+
+                $posY=$pdf->GetY();
+                $posY+=1;
+                $pdf->SetXY($this->marge_gauche, $posY);
+                $txt = $outputlangs->transnoentitiesnoconv("SEPAFrstOrRecur").' * : ';
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
+                $pdf->Rect(80, $posY, 5, 5);
+                $pdf->SetXY(80, $posY);
+                if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+                $pdf->SetXY(86, $posY);
+                $txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
+                $posY+=6;
+                $pdf->Rect(80, $posY, 5, 5);
+                $pdf->SetXY(80, $posY);
+                if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+                $pdf->SetXY(86, $posY);
+                $txt = $langs->transnoentitiesnoconv("ModeFRST");
+                $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
+                if (empty($object->frstrecur))
+                {
+                    $posY+=6;
+                    $pdf->SetXY(80, $posY);
+                    $txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
+                    $pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
+                }
+
+                $posY=$pdf->GetY();
+                $posY+=3;
+                $pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
+                $posY+=3;
+
+
+                // Show square
+                if ($pagenb == 1)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                /*var_dump($tab_top);
 				var_dump($heightforinfotot);
 				var_dump($heightforfreetext);
 				var_dump($heightforfooter);
 				var_dump($bottomlasttab);*/
 
-				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+                // Affiche zone infos
+                $posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
-				/*
+                /*
 				 * Pied de page
 				 */
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-
-		$this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
-		return 0;
-	}
-
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		Hide top bar of array
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
-	{
-		global $conf,$mysoc;
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+                $pdf->Close();
+
+                $pdf->Output($file,'F');
+
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+
+        $this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
+        return 0;
+    }
+
+
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		string		$tab_top		Top position of table
+     *   @param		string		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		Hide top bar of array
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+    {
+        global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
-	}
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *   Show miscellaneous information (payment mode, payment term, ...)
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		Object		$object			Object to show
-	 *   @param		int			$posy			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @return	void
-	 */
-	function _tableau_info(&$pdf, $object, $posy, $outputlangs)
-	{
+    /**
+     *   Show miscellaneous information (payment mode, payment term, ...)
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		Object		$object			Object to show
+     *   @param		int			$posy			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @return	void
+     */
+    function _tableau_info(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
         global $conf, $mysoc;
 
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?1:$conf->global->PDF_DIFFSIZE_TITLE);
+        $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?1:$conf->global->PDF_DIFFSIZE_TITLE);
 
-	    $posy+=$this->_signature_area($pdf, $object, $posy, $outputlangs);
+        $posy+=$this->_signature_area($pdf, $object, $posy, $outputlangs);
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('','', $default_font_size);
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
-	    $posy=$pdf->GetY()+2;
+        $pdf->SetXY($this->marge_gauche, $posy);
+        $pdf->SetFont('','', $default_font_size);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
+        $posy=$pdf->GetY()+2;
 
-	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('','', $default_font_size - $diffsizetitle);
-	    $pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
-		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress()), 0, 'L', 0);
-		$posy=$pdf->GetY()+2;
+        $pdf->SetXY($this->marge_gauche, $posy);
+        $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+        $pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
+        $pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress()), 0, 'L', 0);
+        $posy=$pdf->GetY()+2;
 
-	    return $posy;
-	}
+        return $posy;
+    }
 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show area for the customer to sign
-	 *
-	 *	@param	PDF			$pdf            Object PDF
-	 *	@param  Facture		$object         Object invoice
-	 *	@param	int			$posy			Position depart
-	 *	@param	Translate	$outputlangs	Objet langs
-	 *	@return int							Position pour suite
-	 */
-	function _signature_area(&$pdf, $object, $posy, $outputlangs)
-	{
+    /**
+     *	Show area for the customer to sign
+     *
+     *	@param	PDF			$pdf            Object PDF
+     *	@param  Facture		$object         Object invoice
+     *	@param	int			$posy			Position depart
+     *	@param	Translate	$outputlangs	Objet langs
+     *	@return int							Position pour suite
+     */
+    function _signature_area(&$pdf, $object, $posy, $outputlangs)
+    {
         // phpcs:enable
-	    $default_font_size = pdf_getPDFFontSize($outputlangs);
-	    $tab_top = $posy + 4;
-	    $tab_hl = 4;
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
+        $tab_top = $posy + 4;
+        $tab_hl = 4;
 
-	    $posx = $this->marge_gauche;
-	    $pdf->SetXY($posx, $tab_top + 0);
+        $posx = $this->marge_gauche;
+        $pdf->SetXY($posx, $tab_top + 0);
 
-	    $pdf->SetFont('','', $default_font_size - 2);
+        $pdf->SetFont('','', $default_font_size - 2);
 
-	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
-	    $pdf->MultiCell(100, 3, ' ');
-	    $pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
+        $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
+        $pdf->MultiCell(100, 3, ' ');
+        $pdf->MultiCell(100, 3, '______________________', 0, 'L', 0);
 
-	    $posx = 120;
-	    $largcol = ($this->page_largeur - $this->marge_droite - $posx);
-	    $useborder=0;
-	    $index = 0;
-	    // Total HT
-	    $pdf->SetFillColor(255,255,255);
-	    $pdf->SetXY($posx, $tab_top + 0);
-	    $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
+        $posx = 120;
+        $largcol = ($this->page_largeur - $this->marge_droite - $posx);
+        $useborder=0;
+        $index = 0;
+        // Total HT
+        $pdf->SetFillColor(255,255,255);
+        $pdf->SetXY($posx, $tab_top + 0);
+        $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
 
-	    $pdf->SetXY($posx, $tab_top + $tab_hl);
-	    $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
+        $pdf->SetXY($posx, $tab_top + $tab_hl);
+        $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
 
-	    return ($tab_hl*7);
-	}
+        return ($tab_hl*7);
+    }
 
 
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Project		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $langs,$conf,$mysoc;
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Project		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $langs,$conf,$mysoc;
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
 
         $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
-			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
-			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
-
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("SepaMandate"), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
-
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$daterum = '__________________';
-		if (! empty($object->date_rum))
-		{
+        $posy=$this->marge_haute;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if ($mysoc->logo)
+        {
+            if (is_readable($logo))
+            {
+                $height=pdf_getHeightForLogo($logo);
+                $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+            }
+            else
+            {
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+            }
+        }
+        else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+
+        $pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("SepaMandate"), '', 'R');
+        $pdf->SetFont('','', $default_font_size + 2);
+
+        $posy+=6;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $daterum = '__________________';
+        if (! empty($object->date_rum))
+        {
             $daterum = dol_print_date($object->date_rum,'day',false,$outputlangs,true);
-		}
-		else $daterum = dol_print_date($object->datec,'day',false,$outputlangs,true);   // For old record, the date_rum was not saved.
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . $daterum, '', 'R');
-		/*$posy+=6;
+        }
+        else $daterum = dol_print_date($object->datec,'day',false,$outputlangs,true);   // For old record, the date_rum was not saved.
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . $daterum, '', 'R');
+        /*$posy+=6;
 		$pdf->SetXY($posx,$posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
 		*/
 
-		$pdf->SetTextColor(0,0,60);
+        $pdf->SetTextColor(0,0,60);
 
-		// Add list of linked objects
-		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
+        // Add list of linked objects
+        /* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
 	    foreach($object->linkedObjects as $objecttype => $objects)
@@ -607,21 +607,21 @@ 
 	    	}
 	    }
         */
-	}
+    }
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Project		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	integer
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PAYMENTORDER_FREE_TEXT',null,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Project		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	integer
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        return pdf_pagefoot($pdf,$outputlangs,'PAYMENTORDER_FREE_TEXT',null,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +147 added lines, -147 removed lines

@@ -65,30 +65,30 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxworkload=$this->marge_gauche+100;
-		$this->posxprogress=$this->marge_gauche+130;
-		$this->posxdatestart=$this->marge_gauche+150;
-		$this->posxdateend=$this->marge_gauche+170;
+		$this->posxref = $this->marge_gauche + 1;
+		$this->posxlabel = $this->marge_gauche + 25;
+		$this->posxworkload = $this->marge_gauche + 100;
+		$this->posxprogress = $this->marge_gauche + 130;
+		$this->posxdatestart = $this->marge_gauche + 150;
+		$this->posxdateend = $this->marge_gauche + 170;
 	}
 
 
@@ -105,42 +105,42 @@ 
      *  @param      null|array  $moreparams         More parameters
 	 *	@return	    int         				    1 if OK, <=0 if KO
 	 */
-	function write_file($object, $outputlangs, $srctemplatepath='', $hidedetails=0, $hidedesc=0, $hideref=0, $moreparams=null)
+	function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
 	{
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user, $mysoc;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
 
-		if (! empty($conf->bank->dir_output))
+		if (!empty($conf->bank->dir_output))
 		{
 			//$nblignes = count($object->lines);  // This is set later with array of tasks
 
 		    // Definition of $dir and $file
 		    if ($object->specimen)
 		    {
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
 		        else $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
+		        $file = $dir."/SPECIMEN.pdf";
 		    }
 		    else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
+		        if (!empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
+		        else $dir = $conf->bank->dir_output."/".$objectref;
+		        $file = $dir."/".$langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref."-".dol_sanitizeFileName($object->rum).".pdf";
 		    }
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -148,23 +148,23 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
-                $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+                $heightforinfotot = 50; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+                $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -174,25 +174,25 @@ 
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("SepaMandate"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("SepaMandate"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 50;
 				$tab_height = 200;
@@ -200,23 +200,23 @@ 
                 $tab_height_newpage = 210;
 
 				// Affiche notes
-				if (! empty($object->note_public))
+				if (!empty($object->note_public))
 				{
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxref - 1, $tab_top - 2, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-($tab_top-2);
+					$height_note = $nexY - ($tab_top - 2);
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 3, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -225,64 +225,64 @@ 
 
 				$posY = $curY;
 
-				$pdf->SetFont('','', $default_font_size);
+				$pdf->SetFont('', '', $default_font_size);
 
 				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=2;
+				$posY += 2;
 
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("RUMLong").' ('.$outputlangs->transnoentitiesnoconv("RUM").')'.' : '.$object->rum, 0, 'L');
 
-				$posY=$pdf->GetY();
-				$posY+=2;
+				$posY = $pdf->GetY();
+				$posY += 2;
 				$pdf->SetXY($this->marge_gauche, $posY);
-				$ics='';
-				if (! empty($conf->global->PRELEVEMENT_ICS)) $ics=$conf->global->PRELEVEMENT_ICS;
+				$ics = '';
+				if (!empty($conf->global->PRELEVEMENT_ICS)) $ics = $conf->global->PRELEVEMENT_ICS;
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
 
-				$posY=$pdf->GetY();
-				$posY+=1;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorName").' : '.$mysoc->name, 0, 'L');
 
-				$posY=$pdf->GetY();
-				$posY+=1;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $mysoc->getFullAddress(), 0, 'L');
 
-				$posY=$pdf->GetY();
-				$posY+=3;
+				$posY = $pdf->GetY();
+				$posY += 3;
 
 				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
 
-				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->SetFont('', '', $default_font_size - 1);
 
-				$posY+=8;
+				$posY += 8;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 8, $outputlangs->transnoentitiesnoconv("SEPALegalText", $mysoc->name, $mysoc->name), 0, 'L');
 
 				// Your data form
-				$posY=$pdf->GetY();
-				$posY+=8;
+				$posY = $pdf->GetY();
+				$posY += 8;
 				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=2;
+				$posY += 2;
 
-				$pdf->SetFont('','', $default_font_size);
+				$pdf->SetFont('', '', $default_font_size);
 
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFillForm"), 0, 'C');
 
-				$thirdparty=new Societe($this->db);
+				$thirdparty = new Societe($this->db);
 				if ($object->socid > 0) $thirdparty->fetch($object->socid);
 
 				$sepaname = '______________________________________________';
 				if ($thirdparty->id > 0)
 				{
-				    $sepaname = $thirdparty->name.($object->account_owner?' ('.$object->account_owner.')':'');
+				    $sepaname = $thirdparty->name.($object->account_owner ? ' ('.$object->account_owner.')' : '');
 				}
-				$posY=$pdf->GetY();
-				$posY+=3;
+				$posY = $pdf->GetY();
+				$posY += 3;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourName").' * : ', 0, 'L');
 				$pdf->SetXY(80, $posY);
@@ -293,40 +293,40 @@ 
 				{
 				    $address = $thirdparty->getFullAddress();
 				}
-				$posY=$pdf->GetY();
-				$posY+=1;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("Address").' : ', 0, 'L');
 				$pdf->SetXY(80, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
 				if (preg_match('/_____/', $address))
 				{
-    				$posY+=6;
+    				$posY += 6;
     				$pdf->SetXY(80, $posY);
     				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $address, 0, 'L');
 				}
 
 				$ban = '__________________________________________________';
-				if (! empty($object->iban)) $ban = $object->iban;
-				$posY=$pdf->GetY();
-				$posY+=1;
+				if (!empty($object->iban)) $ban = $object->iban;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBAN").' * : ', 0, 'L');
 				$pdf->SetXY(80, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $ban, 0, 'L');
 
 				$bic = '__________________________________________________';
-				if (! empty($object->bic)) $bic = $object->bic;
-				$posY=$pdf->GetY();
-				$posY+=1;
+				if (!empty($object->bic)) $bic = $object->bic;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFormYourBIC").' * : ', 0, 'L');
 				$pdf->SetXY(80, $posY);
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $bic, 0, 'L');
 
 
-				$posY=$pdf->GetY();
-				$posY+=1;
+				$posY = $pdf->GetY();
+				$posY += 1;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$txt = $outputlangs->transnoentitiesnoconv("SEPAFrstOrRecur").' * : ';
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
@@ -336,7 +336,7 @@ 
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
-				$posY+=6;
+				$posY += 6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
 				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
@@ -345,28 +345,28 @@ 
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				if (empty($object->frstrecur))
 				{
-    				$posY+=6;
+    				$posY += 6;
     				$pdf->SetXY(80, $posY);
 				    $txt = '('.$langs->transnoentitiesnoconv("PleaseCheckOne").')';
     				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				}
 
-				$posY=$pdf->GetY();
-				$posY+=3;
+				$posY = $pdf->GetY();
+				$posY += 3;
 				$pdf->line($this->marge_gauche, $posY, $this->page_largeur - $this->marge_droite, $posY);
-				$posY+=3;
+				$posY += 3;
 
 
 				// Show square
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				/*var_dump($tab_top);
@@ -376,44 +376,44 @@ 
 				var_dump($bottomlasttab);*/
 
 				// Affiche zone infos
-				$posy=$this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
+				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
 
 				/*
 				 * Pied de page
 				 */
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
 		return 0;
 	}
 
@@ -430,9 +430,9 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 	}
@@ -455,20 +455,20 @@ 
 
 	    $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-	    $diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?1:$conf->global->PDF_DIFFSIZE_TITLE);
+	    $diffsizetitle = (empty($conf->global->PDF_DIFFSIZE_TITLE) ? 1 : $conf->global->PDF_DIFFSIZE_TITLE);
 
-	    $posy+=$this->_signature_area($pdf, $object, $posy, $outputlangs);
+	    $posy += $this->_signature_area($pdf, $object, $posy, $outputlangs);
 
 	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('','', $default_font_size);
+	    $pdf->SetFont('', '', $default_font_size);
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("PleaseReturnMandate", $mysoc->email).':', 0, 'L', 0);
-	    $posy=$pdf->GetY()+2;
+	    $posy = $pdf->GetY() + 2;
 
 	    $pdf->SetXY($this->marge_gauche, $posy);
-	    $pdf->SetFont('','', $default_font_size - $diffsizetitle);
+	    $pdf->SetFont('', '', $default_font_size - $diffsizetitle);
 	    $pdf->MultiCell(100, 6, $mysoc->name, 0, 'L', 0);
 		$pdf->MultiCell(100, 6, $outputlangs->convToOutputCharset($mysoc->getFullAddress()), 0, 'L', 0);
-		$posy=$pdf->GetY()+2;
+		$posy = $pdf->GetY() + 2;
 
 	    return $posy;
 	}
@@ -495,7 +495,7 @@ 
 	    $posx = $this->marge_gauche;
 	    $pdf->SetXY($posx, $tab_top + 0);
 
-	    $pdf->SetFont('','', $default_font_size - 2);
+	    $pdf->SetFont('', '', $default_font_size - 2);
 
 	    $pdf->MultiCell(100, 3, $outputlangs->transnoentitiesnoconv("DateOfSignature"), 0, 'L', 0);
 	    $pdf->MultiCell(100, 3, ' ');
@@ -503,17 +503,17 @@ 
 
 	    $posx = 120;
 	    $largcol = ($this->page_largeur - $this->marge_droite - $posx);
-	    $useborder=0;
+	    $useborder = 0;
 	    $index = 0;
 	    // Total HT
-	    $pdf->SetFillColor(255,255,255);
+	    $pdf->SetFillColor(255, 255, 255);
 	    $pdf->SetXY($posx, $tab_top + 0);
 	    $pdf->MultiCell($largcol, $tab_hl, $outputlangs->transnoentitiesnoconv("Signature"), 0, 'L', 1);
 
 	    $pdf->SetXY($posx, $tab_top + $tab_hl);
-	    $pdf->MultiCell($largcol, $tab_hl*3, '', 1, 'R');
+	    $pdf->MultiCell($largcol, $tab_hl * 3, '', 1, 'R');
 
-	    return ($tab_hl*7);
+	    return ($tab_hl * 7);
 	}
 
 
@@ -528,61 +528,61 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("SepaMandate"), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
+		$pdf->SetFont('', '', $default_font_size + 2);
 
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
 		$daterum = '__________________';
-		if (! empty($object->date_rum))
+		if (!empty($object->date_rum))
 		{
-            $daterum = dol_print_date($object->date_rum,'day',false,$outputlangs,true);
+            $daterum = dol_print_date($object->date_rum, 'day', false, $outputlangs, true);
 		}
-		else $daterum = dol_print_date($object->datec,'day',false,$outputlangs,true);   // For old record, the date_rum was not saved.
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . $daterum, '', 'R');
+		else $daterum = dol_print_date($object->datec, 'day', false, $outputlangs, true); // For old record, the date_rum was not saved.
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".$daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
 		*/
 
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetTextColor(0, 0, 60);
 
 		// Add list of linked objects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
@@ -618,10 +618,10 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf,$outputlangs,'PAYMENTORDER_FREE_TEXT',null,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'PAYMENTORDER_FREE_TEXT', null, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }

Braces +60 added lines, -30 removed lines

@@ -80,7 +80,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Defini position des colonnes
 		$this->posxref=$this->marge_gauche+1;
@@ -110,9 +113,13 @@ 
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user, $mysoc;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "withdrawals", "companies", "projects", "bills"));
@@ -124,15 +131,20 @@ 
 		    // Definition of $dir and $file
 		    if ($object->specimen)
 		    {
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output;
+		        if (! empty($moreparams['force_dir_output'])) {
+		            $dir = $moreparams['force_dir_output'];
+		        } else {
+		            $dir = $conf->bank->dir_output;
+		        }
 		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
+		    } else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
-		        if (! empty($moreparams['force_dir_output'])) $dir = $moreparams['force_dir_output'];
-		        else $dir = $conf->bank->dir_output . "/" . $objectref;
+		        if (! empty($moreparams['force_dir_output'])) {
+		            $dir = $moreparams['force_dir_output'];
+		        } else {
+		            $dir = $conf->bank->dir_output . "/" . $objectref;
+		        }
 		        $file = $dir . "/" . $langs->transnoentitiesnoconv("SepaMandateShort").' '.$objectref . "-".dol_sanitizeFileName($object->rum).".pdf";
 		    }
 
@@ -163,7 +175,9 @@ 
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+	                $heightforfooter+= 6;
+	            }
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -182,7 +196,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("SepaMandate"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -213,8 +229,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -237,7 +252,9 @@ 
 				$posY+=2;
 				$pdf->SetXY($this->marge_gauche, $posY);
 				$ics='';
-				if (! empty($conf->global->PRELEVEMENT_ICS)) $ics=$conf->global->PRELEVEMENT_ICS;
+				if (! empty($conf->global->PRELEVEMENT_ICS)) {
+				    $ics=$conf->global->PRELEVEMENT_ICS;
+				}
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("CreditorIdentifier").' ('.$outputlangs->transnoentitiesnoconv("ICS").')'.' : '.$ics, 0, 'L');
 
 				$posY=$pdf->GetY();
@@ -274,7 +291,9 @@ 
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $outputlangs->transnoentitiesnoconv("SEPAFillForm"), 0, 'C');
 
 				$thirdparty=new Societe($this->db);
-				if ($object->socid > 0) $thirdparty->fetch($object->socid);
+				if ($object->socid > 0) {
+				    $thirdparty->fetch($object->socid);
+				}
 
 				$sepaname = '______________________________________________';
 				if ($thirdparty->id > 0)
@@ -307,7 +326,9 @@ 
 				}
 
 				$ban = '__________________________________________________';
-				if (! empty($object->iban)) $ban = $object->iban;
+				if (! empty($object->iban)) {
+				    $ban = $object->iban;
+				}
 				$posY=$pdf->GetY();
 				$posY+=1;
 				$pdf->SetXY($this->marge_gauche, $posY);
@@ -316,7 +337,9 @@ 
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $ban, 0, 'L');
 
 				$bic = '__________________________________________________';
-				if (! empty($object->bic)) $bic = $object->bic;
+				if (! empty($object->bic)) {
+				    $bic = $object->bic;
+				}
 				$posY=$pdf->GetY();
 				$posY+=1;
 				$pdf->SetXY($this->marge_gauche, $posY);
@@ -332,14 +355,18 @@ 
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'RECUR') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'RECUR') {
+				    $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				}
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeRECUR").'  '.$langs->transnoentitiesnoconv("or");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
 				$posY+=6;
 				$pdf->Rect(80, $posY, 5, 5);
 				$pdf->SetXY(80, $posY);
-				if ($object->frstrecur == 'FRST') $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				if ($object->frstrecur == 'FRST') {
+				    $pdf->MultiCell(5, 3, 'X', 0, 'L');
+				}
 				$pdf->SetXY(86, $posY);
 				$txt = $langs->transnoentitiesnoconv("ModeFRST");
 				$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
@@ -362,8 +389,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -382,7 +408,9 @@ 
 				 * Pied de page
 				 */
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -399,14 +427,14 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
@@ -550,16 +578,16 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
+		} else {
+		    $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);
@@ -574,8 +602,10 @@ 
 		if (! empty($object->date_rum))
 		{
             $daterum = dol_print_date($object->date_rum,'day',false,$outputlangs,true);
+		} else {
+		    $daterum = dol_print_date($object->datec,'day',false,$outputlangs,true);
 		}
-		else $daterum = dol_print_date($object->datec,'day',false,$outputlangs,true);   // For old record, the date_rum was not saved.
+		// For old record, the date_rum was not saved.
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . $daterum, '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);

dolibarr/htdocs/core/modules/bank/doc/pdf_ban.modules.php

Indentation +295 added lines, -295 removed lines

@@ -35,128 +35,128 @@ 
 
 class pdf_ban extends ModeleBankAccountDoc
 {
-	/**
-	 * Issuer
-	 * @var Societe
-	 */
-	public $emetteur;
+    /**
+     * Issuer
+     * @var Societe
+     */
+    public $emetteur;
 
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'development';
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param		DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf,$langs,$mysoc;
-
-		// Load translation files required by the page
+    public $version = 'development';
+
+    /**
+     *	Constructor
+     *
+     *  @param		DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf,$langs,$mysoc;
+
+        // Load translation files required by the page
         $langs->loadLangs(array("main","bank","withdrawals","companies"));
 
-		$this->db = $db;
-		$this->name = "ban";
-		$this->description = $langs->trans("DocumentModelBan").' (Volunteer wanted to finish)';
-
-		// Dimension page pour format A4
-		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
-		$this->page_largeur = $formatarray['width'];
-		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
-
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
-
-		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
-
-		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxworkload=$this->marge_gauche+100;
-		$this->posxprogress=$this->marge_gauche+130;
-		$this->posxdatestart=$this->marge_gauche+150;
-		$this->posxdateend=$this->marge_gauche+170;
-	}
+        $this->db = $db;
+        $this->name = "ban";
+        $this->description = $langs->trans("DocumentModelBan").' (Volunteer wanted to finish)';
+
+        // Dimension page pour format A4
+        $this->type = 'pdf';
+        $formatarray=pdf_getFormat();
+        $this->page_largeur = $formatarray['width'];
+        $this->page_hauteur = $formatarray['height'];
+        $this->format = array($this->page_largeur,$this->page_hauteur);
+        $this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
+        $this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
+        $this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
+        $this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+
+        $this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
+        $this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
+        $this->option_codeproduitservice = 1;      // Affiche code produit-service
+
+        // Recupere emmetteur
+        $this->emetteur=$mysoc;
+        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+
+        // Defini position des colonnes
+        $this->posxref=$this->marge_gauche+1;
+        $this->posxlabel=$this->marge_gauche+25;
+        $this->posxworkload=$this->marge_gauche+100;
+        $this->posxprogress=$this->marge_gauche+130;
+        $this->posxdatestart=$this->marge_gauche+150;
+        $this->posxdateend=$this->marge_gauche+170;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Fonction generant le projet sur le disque
-	 *
-	 *	@param	Project		$object   		Object project a generer
-	 *	@param	Translate	$outputlangs	Lang output object
-	 *	@return	int         				1 if OK, <=0 if KO
-	 */
-	function write_file($object,$outputlangs)
-	{
+    /**
+     *	Fonction generant le projet sur le disque
+     *
+     *	@param	Project		$object   		Object project a generer
+     *	@param	Translate	$outputlangs	Lang output object
+     *	@return	int         				1 if OK, <=0 if KO
+     */
+    function write_file($object,$outputlangs)
+    {
         // phpcs:enable
-		global $conf, $hookmanager, $langs, $user;
-
-		if (! is_object($outputlangs)) $outputlangs=$langs;
-		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
-
-		// Load traductions files requiredby by page
-		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
-
-		if ($conf->bank->dir_output)
-		{
-			//$nblignes = count($object->lines);  // This is set later with array of tasks
-
-		    // Definition of $dir and $file
-		    if ($object->specimen)
-		    {
-		        $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
-		    {
-		        $objectref = dol_sanitizeFileName($object->ref);
-		        $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $objectref . ".pdf";
-		    }
-
-			if (! file_exists($dir))
-			{
-				if (dol_mkdir($dir) < 0)
-				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-					return 0;
-				}
-			}
-
-			if (file_exists($dir))
-			{
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+        global $conf, $hookmanager, $langs, $user;
+
+        if (! is_object($outputlangs)) $outputlangs=$langs;
+        // For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+
+        // Load traductions files requiredby by page
+        $outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
+
+        if ($conf->bank->dir_output)
+        {
+            //$nblignes = count($object->lines);  // This is set later with array of tasks
+
+            // Definition of $dir and $file
+            if ($object->specimen)
+            {
+                $dir = $conf->bank->dir_output;
+                $file = $dir . "/SPECIMEN.pdf";
+            }
+            else
+            {
+                $objectref = dol_sanitizeFileName($object->ref);
+                $dir = $conf->bank->dir_output . "/" . $objectref;
+                $file = $dir . "/" . $objectref . ".pdf";
+            }
+
+            if (! file_exists($dir))
+            {
+                if (dol_mkdir($dir) < 0)
+                {
+                    $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                    return 0;
+                }
+            }
+
+            if (file_exists($dir))
+            {
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
                 $pdf=pdf_getInstance($this->format);
                 $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+                $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+                $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+                if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -166,195 +166,195 @@ 
                 }
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
-
-				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
-				$pdf->SetSubject($outputlangs->transnoentities("BAN"));
-				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
-				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
-
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
-
-				// New page
-				$pdf->AddPage();
-				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
-
-				$tab_top = 50;
-				$tab_height = 200;
-				$tab_top_newpage = 40;
+                $pdf->Open();
+                $pagenb=0;
+                $pdf->SetDrawColor(128,128,128);
+
+                $pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+                $pdf->SetSubject($outputlangs->transnoentities("BAN"));
+                $pdf->SetCreator("Dolibarr ".DOL_VERSION);
+                $pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+                $pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
+                if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+                $pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+
+                // New page
+                $pdf->AddPage();
+                $pagenb++;
+                $this->_pagehead($pdf, $object, 1, $outputlangs);
+                $pdf->SetFont('','', $default_font_size - 1);
+                $pdf->MultiCell(0, 3, '');		// Set interline to 3
+                $pdf->SetTextColor(0,0,0);
+
+                $tab_top = 50;
+                $tab_height = 200;
+                $tab_top_newpage = 40;
                 $tab_height_newpage = 210;
 
-				// Affiche notes
-				if (! empty($object->note_public))
-				{
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
-					$nexY = $pdf->GetY();
-					$height_note=$nexY-($tab_top-2);
-
-					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
-
-					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
-				}
-				else
-				{
-					$height_note=0;
-				}
-
-				$iniY = $tab_top + 7;
-				$curY = $tab_top + 7;
-				$nexY = $tab_top + 7;
-
-				$pdf->SetXY($this->marge_gauche, $curY);
-				$pdf->MultiCell(200, 3, $outputlangs->trans("BAN").' : '.$object->account_number, 0, 'L');
-
-
-
-				// Show square
-				if ($pagenb == 1)
-				{
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
-				{
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-
-				/*
+                // Affiche notes
+                if (! empty($object->note_public))
+                {
+                    $pdf->SetFont('','', $default_font_size - 1);
+                    $pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+                    $nexY = $pdf->GetY();
+                    $height_note=$nexY-($tab_top-2);
+
+                    // Rect prend une longueur en 3eme param
+                    $pdf->SetDrawColor(192,192,192);
+                    $pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+
+                    $tab_height = $tab_height - $height_note;
+                    $tab_top = $nexY+6;
+                }
+                else
+                {
+                    $height_note=0;
+                }
+
+                $iniY = $tab_top + 7;
+                $curY = $tab_top + 7;
+                $nexY = $tab_top + 7;
+
+                $pdf->SetXY($this->marge_gauche, $curY);
+                $pdf->MultiCell(200, 3, $outputlangs->trans("BAN").' : '.$object->account_number, 0, 'L');
+
+
+
+                // Show square
+                if ($pagenb == 1)
+                {
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+                else
+                {
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+                    $bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+                }
+
+                /*
 				 * Pied de page
 				 */
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
-
-				$pdf->Close();
-
-				$pdf->Output($file,'F');
-
-				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
-				{
-					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
-				}
-				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
-				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
-
-				$this->result = array('fullpath'=>$file);
-
-				return 1;   // Pas d'erreur
-			}
-			else
-			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
-				return 0;
-			}
-		}
-
-		$this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
-		return 0;
-	}
-
-
-	/**
-	 *   Show table for lines
-	 *
-	 *   @param		PDF			$pdf     		Object PDF
-	 *   @param		string		$tab_top		Top position of table
-	 *   @param		string		$tab_height		Height of table (rectangle)
-	 *   @param		int			$nexY			Y
-	 *   @param		Translate	$outputlangs	Langs object
-	 *   @param		int			$hidetop		Hide top bar of array
-	 *   @param		int			$hidebottom		Hide bottom bar of array
-	 *   @return	void
-	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
-	{
-		global $conf,$mysoc;
+                $this->_pagefoot($pdf,$object,$outputlangs);
+                if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+
+                $pdf->Close();
+
+                $pdf->Output($file,'F');
+
+                // Add pdfgeneration hook
+                if (! is_object($hookmanager))
+                {
+                    include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+                    $hookmanager=new HookManager($this->db);
+                }
+                $hookmanager->initHooks(array('pdfgeneration'));
+                $parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+                global $action;
+                $reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+
+                if (! empty($conf->global->MAIN_UMASK))
+                @chmod($file, octdec($conf->global->MAIN_UMASK));
+
+                $this->result = array('fullpath'=>$file);
+
+                return 1;   // Pas d'erreur
+            }
+            else
+            {
+                $this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+                return 0;
+            }
+        }
+
+        $this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
+        return 0;
+    }
+
+
+    /**
+     *   Show table for lines
+     *
+     *   @param		PDF			$pdf     		Object PDF
+     *   @param		string		$tab_top		Top position of table
+     *   @param		string		$tab_height		Height of table (rectangle)
+     *   @param		int			$nexY			Y
+     *   @param		Translate	$outputlangs	Langs object
+     *   @param		int			$hidetop		Hide top bar of array
+     *   @param		int			$hidebottom		Hide bottom bar of array
+     *   @return	void
+     */
+    function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+    {
+        global $conf,$mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
-	}
+    }
 
-	/**
-	 *  Show top header of page.
-	 *
-	 *  @param	PDF			$pdf     		Object PDF
-	 *  @param  Project		$object     	Object to show
-	 *  @param  int	    	$showaddress    0=no, 1=yes
-	 *  @param  Translate	$outputlangs	Object lang for output
-	 *  @return	void
-	 */
-	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
-	{
-		global $langs,$conf,$mysoc;
+    /**
+     *  Show top header of page.
+     *
+     *  @param	PDF			$pdf     		Object PDF
+     *  @param  Project		$object     	Object to show
+     *  @param  int	    	$showaddress    0=no, 1=yes
+     *  @param  Translate	$outputlangs	Object lang for output
+     *  @return	void
+     */
+    function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+    {
+        global $langs,$conf,$mysoc;
 
-		$default_font_size = pdf_getPDFFontSize($outputlangs);
+        $default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+        pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->SetFont('','B', $default_font_size + 3);
 
         $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
-
-		$pdf->SetXY($this->marge_gauche,$posy);
-
-		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
-		if ($mysoc->logo)
-		{
-			if (is_readable($logo))
-			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
-			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
-			}
-		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
-
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BAN")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
-
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date(dol_now(),'day',false,$outputlangs,true), '', 'R');
-		/*$posy+=6;
+        $posy=$this->marge_haute;
+
+        $pdf->SetXY($this->marge_gauche,$posy);
+
+        // Logo
+        $logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+        if ($mysoc->logo)
+        {
+            if (is_readable($logo))
+            {
+                $height=pdf_getHeightForLogo($logo);
+                $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+            }
+            else
+            {
+                $pdf->SetTextColor(200,0,0);
+                $pdf->SetFont('','B', $default_font_size - 2);
+                $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+                $pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
+            }
+        }
+        else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
+
+        $pdf->SetFont('','B', $default_font_size + 3);
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("BAN")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+        $pdf->SetFont('','', $default_font_size + 2);
+
+        $posy+=6;
+        $pdf->SetXY($posx,$posy);
+        $pdf->SetTextColor(0,0,60);
+        $pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date(dol_now(),'day',false,$outputlangs,true), '', 'R');
+        /*$posy+=6;
 		$pdf->SetXY($posx,$posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
 		*/
 
-		$pdf->SetTextColor(0,0,60);
+        $pdf->SetTextColor(0,0,60);
 
-		// Add list of linked objects
-		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
+        // Add list of linked objects
+        /* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
 		$object->fetchObjectLinked();
 
 	    foreach($object->linkedObjects as $objecttype => $objects)
@@ -376,21 +376,21 @@ 
 	    	}
 	    }
         */
-	}
+    }
 
-	/**
-	 *   	Show footer of page. Need this->emetteur object
+    /**
+     *   	Show footer of page. Need this->emetteur object
      *
-	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Project		$object				Object to show
-	 *      @param	Translate	$outputlangs		Object lang for output
-	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	integer
-	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
-	{
-		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		//return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
-	}
+     *   	@param	PDF			$pdf     			PDF
+     * 		@param	Project		$object				Object to show
+     *      @param	Translate	$outputlangs		Object lang for output
+     *      @param	int			$hidefreetext		1=Hide free text
+     *      @return	integer
+     */
+    function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+    {
+        global $conf;
+        $showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+        //return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+    }
 }

Spacing +92 added lines, -92 removed lines

@@ -54,10 +54,10 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("main","bank","withdrawals","companies"));
+        $langs->loadLangs(array("main", "bank", "withdrawals", "companies"));
 
 		$this->db = $db;
 		$this->name = "ban";
@@ -65,30 +65,30 @@ 
 
 		// Dimension page pour format A4
 		$this->type = 'pdf';
-		$formatarray=pdf_getFormat();
+		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
 		$this->page_hauteur = $formatarray['height'];
-		$this->format = array($this->page_largeur,$this->page_hauteur);
-		$this->marge_gauche=isset($conf->global->MAIN_PDF_MARGIN_LEFT)?$conf->global->MAIN_PDF_MARGIN_LEFT:10;
-		$this->marge_droite=isset($conf->global->MAIN_PDF_MARGIN_RIGHT)?$conf->global->MAIN_PDF_MARGIN_RIGHT:10;
-		$this->marge_haute =isset($conf->global->MAIN_PDF_MARGIN_TOP)?$conf->global->MAIN_PDF_MARGIN_TOP:10;
-		$this->marge_basse =isset($conf->global->MAIN_PDF_MARGIN_BOTTOM)?$conf->global->MAIN_PDF_MARGIN_BOTTOM:10;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
-		$this->option_logo = 1;                    // Affiche logo FAC_PDF_LOGO
-		$this->option_tva = 1;                     // Gere option tva FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1;      // Affiche code produit-service
+		$this->option_logo = 1; // Affiche logo FAC_PDF_LOGO
+		$this->option_tva = 1; // Gere option tva FACTURE_TVAOPTION
+		$this->option_codeproduitservice = 1; // Affiche code produit-service
 
 		// Recupere emmetteur
-		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 
 		// Defini position des colonnes
-		$this->posxref=$this->marge_gauche+1;
-		$this->posxlabel=$this->marge_gauche+25;
-		$this->posxworkload=$this->marge_gauche+100;
-		$this->posxprogress=$this->marge_gauche+130;
-		$this->posxdatestart=$this->marge_gauche+150;
-		$this->posxdateend=$this->marge_gauche+170;
+		$this->posxref = $this->marge_gauche + 1;
+		$this->posxlabel = $this->marge_gauche + 25;
+		$this->posxworkload = $this->marge_gauche + 100;
+		$this->posxprogress = $this->marge_gauche + 130;
+		$this->posxdatestart = $this->marge_gauche + 150;
+		$this->posxdateend = $this->marge_gauche + 170;
 	}
 
 
@@ -100,14 +100,14 @@ 
 	 *	@param	Translate	$outputlangs	Lang output object
 	 *	@return	int         				1 if OK, <=0 if KO
 	 */
-	function write_file($object,$outputlangs)
+	function write_file($object, $outputlangs)
 	{
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (!is_object($outputlangs)) $outputlangs = $langs;
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -120,20 +120,20 @@ 
 		    if ($object->specimen)
 		    {
 		        $dir = $conf->bank->dir_output;
-		        $file = $dir . "/SPECIMEN.pdf";
+		        $file = $dir."/SPECIMEN.pdf";
 		    }
 		    else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
-		        $dir = $conf->bank->dir_output . "/" . $objectref;
-		        $file = $dir . "/" . $objectref . ".pdf";
+		        $dir = $conf->bank->dir_output."/".$objectref;
+		        $file = $dir."/".$objectref.".pdf";
 		    }
 
-			if (! file_exists($dir))
+			if (!file_exists($dir))
 			{
 				if (dol_mkdir($dir) < 0)
 				{
-					$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 					return 0;
 				}
 			}
@@ -141,23 +141,23 @@ 
 			if (file_exists($dir))
 			{
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 
-                $pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
-                $pdf->SetAutoPageBreak(1,0);
+                $pdf = pdf_getInstance($this->format);
+                $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+                $heightforinfotot = 50; // Height reserved to output the info and total part
+		        $heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+	            $heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+                $pdf->SetAutoPageBreak(1, 0);
 
                 if (class_exists('TCPDF'))
                 {
@@ -167,25 +167,25 @@ 
                 $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 				$pdf->Open();
-				$pagenb=0;
-				$pdf->SetDrawColor(128,128,128);
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
 
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("BAN"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
 
 				// New page
 				$pdf->AddPage();
 				$pagenb++;
 				$this->_pagehead($pdf, $object, 1, $outputlangs);
-				$pdf->SetFont('','', $default_font_size - 1);
-				$pdf->MultiCell(0, 3, '');		// Set interline to 3
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
 
 				$tab_top = 50;
 				$tab_height = 200;
@@ -193,23 +193,23 @@ 
                 $tab_height_newpage = 210;
 
 				// Affiche notes
-				if (! empty($object->note_public))
+				if (!empty($object->note_public))
 				{
-					$pdf->SetFont('','', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxref-1, $tab_top-2, dol_htmlentitiesbr($object->note_public), 0, 1);
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxref - 1, $tab_top - 2, dol_htmlentitiesbr($object->note_public), 0, 1);
 					$nexY = $pdf->GetY();
-					$height_note=$nexY-($tab_top-2);
+					$height_note = $nexY - ($tab_top - 2);
 
 					// Rect prend une longueur en 3eme param
-					$pdf->SetDrawColor(192,192,192);
-					$pdf->Rect($this->marge_gauche, $tab_top-3, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $height_note+1);
+					$pdf->SetDrawColor(192, 192, 192);
+					$pdf->Rect($this->marge_gauche, $tab_top - 3, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $nexY+6;
+					$tab_top = $nexY + 6;
 				}
 				else
 				{
-					$height_note=0;
+					$height_note = 0;
 				}
 
 				$iniY = $tab_top + 7;
@@ -225,50 +225,50 @@ 
 				if ($pagenb == 1)
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 				else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
-					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
 				/*
 				 * Pied de page
 				 */
-				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
 
 				$pdf->Close();
 
-				$pdf->Output($file,'F');
+				$pdf->Output($file, 'F');
 
 				// Add pdfgeneration hook
-				if (! is_object($hookmanager))
+				if (!is_object($hookmanager))
 				{
 					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
-					$hookmanager=new HookManager($this->db);
+					$hookmanager = new HookManager($this->db);
 				}
 				$hookmanager->initHooks(array('pdfgeneration'));
-				$parameters=array('file'=>$file,'object'=>$object,'outputlangs'=>$outputlangs);
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
 				global $action;
-				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 				@chmod($file, octdec($conf->global->MAIN_UMASK));
 
 				$this->result = array('fullpath'=>$file);
 
-				return 1;   // Pas d'erreur
+				return 1; // Pas d'erreur
 			}
 			else
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
 			}
 		}
 
-		$this->error=$langs->transnoentities("ErrorConstantNotDefined","LIVRAISON_OUTPUTDIR");
+		$this->error = $langs->transnoentities("ErrorConstantNotDefined", "LIVRAISON_OUTPUTDIR");
 		return 0;
 	}
 
@@ -285,9 +285,9 @@ 
 	 *   @param		int			$hidebottom		Hide bottom bar of array
 	 *   @return	void
 	 */
-	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0)
+	function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 	}
@@ -303,55 +303,55 @@ 
 	 */
 	function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
 	{
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$this->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-        $posx=$this->page_largeur-$this->marge_droite-100;
-		$posy=$this->marge_haute;
+        $posx = $this->page_largeur - $this->marge_droite - 100;
+		$posy = $this->marge_haute;
 
-		$pdf->SetXY($this->marge_gauche,$posy);
+		$pdf->SetXY($this->marge_gauche, $posy);
 
 		// Logo
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B', $default_font_size - 2);
-				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
 		}
 		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size + 3);
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("BAN")." ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
-		$pdf->SetFont('','', $default_font_size + 2);
+		$pdf->SetFont('', '', $default_font_size + 2);
 
-		$posy+=6;
-		$pdf->SetXY($posx,$posy);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : " . dol_print_date(dol_now(),'day',false,$outputlangs,true), '', 'R');
+		$posy += 6;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Date")." : ".dol_print_date(dol_now(), 'day', false, $outputlangs, true), '', 'R');
 		/*$posy+=6;
 		$pdf->SetXY($posx,$posy);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : " . dol_print_date($object->date_end,'day',false,$outputlangs,true), '', 'R');
 		*/
 
-		$pdf->SetTextColor(0,0,60);
+		$pdf->SetTextColor(0, 0, 60);
 
 		// Add list of linked objects
 		/* Removed: A project can have more than thousands linked objects (orders, invoices, proposals, etc....
@@ -387,10 +387,10 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	integer
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 		//return pdf_pagefoot($pdf,$outputlangs,'BANK_FREE_TEXT',$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
 	}
 }

Braces +29 added lines, -19 removed lines

@@ -80,7 +80,10 @@ 
 
 		// Recupere emmetteur
 		$this->emetteur=$mysoc;
-		if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		if (! $this->emetteur->country_code) {
+		    $this->emetteur->country_code=substr($langs->defaultlang,-2);
+		}
+		// By default if not defined
 
 		// Defini position des colonnes
 		$this->posxref=$this->marge_gauche+1;
@@ -105,9 +108,13 @@ 
         // phpcs:enable
 		global $conf, $hookmanager, $langs, $user;
 
-		if (! is_object($outputlangs)) $outputlangs=$langs;
+		if (! is_object($outputlangs)) {
+		    $outputlangs=$langs;
+		}
 		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
-		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		if (! empty($conf->global->MAIN_USE_FPDF)) {
+		    $outputlangs->charset_output='ISO-8859-1';
+		}
 
 		// Load traductions files requiredby by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
@@ -121,8 +128,7 @@ 
 		    {
 		        $dir = $conf->bank->dir_output;
 		        $file = $dir . "/SPECIMEN.pdf";
-		    }
-		    else
+		    } else
 		    {
 		        $objectref = dol_sanitizeFileName($object->ref);
 		        $dir = $conf->bank->dir_output . "/" . $objectref;
@@ -156,7 +162,9 @@ 
                 $heightforinfotot = 50;	// Height reserved to output the info and total part
 		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
 	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) $heightforfooter+= 6;
+	            if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS >0) {
+	                $heightforfooter+= 6;
+	            }
                 $pdf->SetAutoPageBreak(1,0);
 
                 if (class_exists('TCPDF'))
@@ -175,7 +183,9 @@ 
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("BAN"));
-				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+				if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+				    $pdf->SetCompression(false);
+				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite);   // Left, Top, Right
 
@@ -206,8 +216,7 @@ 
 
 					$tab_height = $tab_height - $height_note;
 					$tab_top = $nexY+6;
-				}
-				else
+				} else
 				{
 					$height_note=0;
 				}
@@ -226,8 +235,7 @@ 
 				{
 					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
-				}
-				else
+				} else
 				{
 					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
 					$bottomlasttab=$this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
@@ -237,7 +245,9 @@ 
 				 * Pied de page
 				 */
 				$this->_pagefoot($pdf,$object,$outputlangs);
-				if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+				if (method_exists($pdf,'AliasNbPages')) {
+				    $pdf->AliasNbPages();
+				}
 
 				$pdf->Close();
 
@@ -254,14 +264,14 @@ 
 				global $action;
 				$reshook=$hookmanager->executeHooks('afterPDFCreation',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 
-				if (! empty($conf->global->MAIN_UMASK))
-				@chmod($file, octdec($conf->global->MAIN_UMASK));
+				if (! empty($conf->global->MAIN_UMASK)) {
+								@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
 
 				$this->result = array('fullpath'=>$file);
 
 				return 1;   // Pas d'erreur
-			}
-			else
+			} else
 			{
 				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
 				return 0;
@@ -325,16 +335,16 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B', $default_font_size - 2);
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $langs->transnoentities("ErrorGoToModuleSetup"), 0, 'L');
 			}
+		} else {
+		    $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 		}
-		else $pdf->MultiCell(100, 4, $outputlangs->transnoentities($this->emetteur->name), 0, 'L');
 
 		$pdf->SetFont('','B', $default_font_size + 3);
 		$pdf->SetXY($posx,$posy);

dolibarr/htdocs/core/modules/bank/modules_bank.php

Indentation +16 added lines, -16 removed lines

@@ -31,31 +31,31 @@
  */
 abstract class ModeleBankAccountDoc extends CommonDocGenerator
 {
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return list of active generation modules
-	 *
+    /**
+     *  Return list of active generation modules
+     *
      *  @param	DoliDB	$db     			Database handler
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
-	{
+    static function liste_modeles($db, $maxfilenamelength=0)
+    {
         // phpcs:enable
-		global $conf;
+        global $conf;
 
-		$type = 'bankaccount';
-		$list = array();
+        $type = 'bankaccount';
+        $list = array();
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$list = getListOfModels($db, $type, $maxfilenamelength);
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+        $list = getListOfModels($db, $type, $maxfilenamelength);
 
-		return $list;
-	}
+        return $list;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -34,7 +34,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -45,7 +45,7 @@ 
      *  @param  integer	$maxfilenamelength  Max length of value to show
      *  @return	array						List of templates
      */
-	static function liste_modeles($db, $maxfilenamelength=0)
+	static function liste_modeles($db, $maxfilenamelength = 0)
 	{
         // phpcs:enable
 		global $conf;

dolibarr/htdocs/core/modules/modPropale.class.php

Indentation +245 added lines, -245 removed lines

@@ -36,257 +36,257 @@
 class modPropale extends DolibarrModules
 {
 
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-		$this->numero = 20;
-
-		$this->family = "crm";
-		$this->module_position = '20';
-		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Gestion des propositions commerciales";
-
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='propal';
-
-		// Data directories to create when module is enabled
-		$this->dirs = array("/propale/temp");
-
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modSociete");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->config_page_url = array("propal.php");
-		$this->langfiles = array("propal","bills","companies","deliveries","products");
-
-		// Constants
-		$this->const = array();
-		$r=0;
-
-		$this->const[$r][0] = "PROPALE_ADDON_PDF";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "azur";
-		$this->const[$r][3] = 'Name of the proposal generation manager in PDF format';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_ADDON";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "mod_propale_marbre";
-		$this->const[$r][3] = 'Name of proposal numbering manager';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_VALIDITY_DURATION";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "15";
-		$this->const[$r][3] = 'Duration of validity of business proposals';
-		$this->const[$r][4] = 0;
-		$r++;
-
-		$this->const[$r][0] = "PROPALE_ADDON_PDF_ODT_PATH";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
-		$this->const[$r][3] = "";
-		$this->const[$r][4] = 0;
-		$r++;
-
-		/*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
+        global $conf, $user;
+
+        $this->db = $db;
+        $this->numero = 20;
+
+        $this->family = "crm";
+        $this->module_position = '20';
+        // Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Gestion des propositions commerciales";
+
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->picto='propal';
+
+        // Data directories to create when module is enabled
+        $this->dirs = array("/propale/temp");
+
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modSociete");		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->config_page_url = array("propal.php");
+        $this->langfiles = array("propal","bills","companies","deliveries","products");
+
+        // Constants
+        $this->const = array();
+        $r=0;
+
+        $this->const[$r][0] = "PROPALE_ADDON_PDF";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "azur";
+        $this->const[$r][3] = 'Name of the proposal generation manager in PDF format';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_ADDON";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "mod_propale_marbre";
+        $this->const[$r][3] = 'Name of proposal numbering manager';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_VALIDITY_DURATION";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "15";
+        $this->const[$r][3] = 'Duration of validity of business proposals';
+        $this->const[$r][4] = 0;
+        $r++;
+
+        $this->const[$r][0] = "PROPALE_ADDON_PDF_ODT_PATH";
+        $this->const[$r][1] = "chaine";
+        $this->const[$r][2] = "DOL_DATA_ROOT/doctemplates/proposals";
+        $this->const[$r][3] = "";
+        $this->const[$r][4] = 0;
+        $r++;
+
+        /*$this->const[$r][0] = "PROPALE_DRAFT_WATERMARK";
 		$this->const[$r][2] = "__(Draft)__";
 		$this->const[$r][3] = 'Watermark to show on draft proposals';
 		$this->const[$r][4] = 0;
 		$r++;*/
 
-		// Boxes
-		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
-		);
-
-		// Permissions
-		$this->rights = array();
-		$this->rights_class = 'propale';
-		$r=0;
-
-		$r++;
-		$this->rights[$r][0] = 21; // id de la permission
-		$this->rights[$r][1] = 'Read commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'lire';
-
-		$r++;
-		$this->rights[$r][0] = 22; // id de la permission
-		$this->rights[$r][1] = 'Create and update commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'creer';
-
-		$r++;
-		$this->rights[$r][0] = 24; // id de la permission
-		$this->rights[$r][1] = 'Validate commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'propal_advance';
-		$this->rights[$r][5] = 'validate';
-
-		$r++;
-		$this->rights[$r][0] = 25; // id de la permission
-		$this->rights[$r][1] = 'Send commercial proposals to customers'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'propal_advance';
+        // Boxes
+        $this->boxes = array(
+                0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
+                1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
+        );
+
+        // Permissions
+        $this->rights = array();
+        $this->rights_class = 'propale';
+        $r=0;
+
+        $r++;
+        $this->rights[$r][0] = 21; // id de la permission
+        $this->rights[$r][1] = 'Read commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'lire';
+
+        $r++;
+        $this->rights[$r][0] = 22; // id de la permission
+        $this->rights[$r][1] = 'Create and update commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'creer';
+
+        $r++;
+        $this->rights[$r][0] = 24; // id de la permission
+        $this->rights[$r][1] = 'Validate commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'propal_advance';
+        $this->rights[$r][5] = 'validate';
+
+        $r++;
+        $this->rights[$r][0] = 25; // id de la permission
+        $this->rights[$r][1] = 'Send commercial proposals to customers'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'propal_advance';
         $this->rights[$r][5] = 'send';
 
-		$r++;
-		$this->rights[$r][0] = 26; // id de la permission
-		$this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'cloturer';
-
-		$r++;
-		$this->rights[$r][0] = 27; // id de la permission
-		$this->rights[$r][1] = 'Delete commercial proposals'; // libelle de la permission
-		$this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'supprimer';
-
-		$r++;
-		$this->rights[$r][0] = 28; // id de la permission
-		$this->rights[$r][1] = 'Exporting commercial proposals and attributes'; // libelle de la permission
-		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
-		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
-		$this->rights[$r][4] = 'export';
-
-
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
-
-
-		// Exports
-		//--------
-		$r=0;
-
-		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("propale","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
-			'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
-			'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
-			'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
-			'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
-			'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
-		);
-		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
-		//	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
-		//	'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
-		//	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
-		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
-			's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
-			'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
-			'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-			'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
-		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
-			'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
-			'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
-			'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
-			'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
-		);
-		$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
-		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
-
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
-	}
-
-
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+        $r++;
+        $this->rights[$r][0] = 26; // id de la permission
+        $this->rights[$r][1] = 'Close commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'cloturer';
+
+        $r++;
+        $this->rights[$r][0] = 27; // id de la permission
+        $this->rights[$r][1] = 'Delete commercial proposals'; // libelle de la permission
+        $this->rights[$r][2] = 'd'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'supprimer';
+
+        $r++;
+        $this->rights[$r][0] = 28; // id de la permission
+        $this->rights[$r][1] = 'Exporting commercial proposals and attributes'; // libelle de la permission
+        $this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
+        $this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+        $this->rights[$r][4] = 'export';
+
+
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+
+
+        // Exports
+        //--------
+        $r=0;
+
+        $r++;
+        $this->export_code[$r]=$this->rights_class.'_'.$r;
+        $this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+        $this->export_permission[$r]=array(array("propale","export"));
+        $this->export_fields_array[$r]=array(
+            's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
+            's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
+            'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
+            'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
+            'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
+            'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
+            'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
+            'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
+        );
+        //$this->export_TypeFields_array[$r]=array(
+        //	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
+        //	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",
+        //	'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
+        //	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
+        //	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
+        //);
+        $this->export_TypeFields_array[$r]=array(
+            's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
+            's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
+            'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
+            'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
+            'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
+        );
+        $this->export_entities_array[$r]=array(
+            's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
+            's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
+            'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
+            'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
+            'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
+            'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
+        );
+        $this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+        $keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+        $keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
+        include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+
+        $this->export_sql_start[$r]='SELECT DISTINCT ';
+        $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+        $this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
+        $this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
+        $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+        $this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
+        $this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
+        if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+    }
+
+
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-		global $conf,$langs;
-
-		// Remove permissions and default values
-		$this->remove($options);
-
-		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/proposals/template_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
-		$dest=$dirodt.'/template_proposal.odt';
-
-		if (file_exists($src) && ! file_exists($dest))
-		{
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
-			if ($result < 0)
-			{
-				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
-				return 0;
-			}
-		}
-
-		$sql = array(
-				"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".$conf->entity,
-				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
-		);
-
-		return $this->_init($sql,$options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $conf,$langs;
+
+        // Remove permissions and default values
+        $this->remove($options);
+
+        //ODT template
+        $src=DOL_DOCUMENT_ROOT.'/install/doctemplates/proposals/template_proposal.odt';
+        $dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
+        $dest=$dirodt.'/template_proposal.odt';
+
+        if (file_exists($src) && ! file_exists($dest))
+        {
+            require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+            dol_mkdir($dirodt);
+            $result=dol_copy($src,$dest,0,0);
+            if ($result < 0)
+            {
+                $langs->load("errors");
+                $this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+                return 0;
+            }
+        }
+
+        $sql = array(
+                "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'propal' AND entity = ".$conf->entity,
+                "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
+        );
+
+        return $this->_init($sql,$options);
+    }
 }

Spacing +72 added lines, -72 removed lines

@@ -27,7 +27,7 @@ 
  *	\ingroup    propale
  *	\brief      Fichier de description et activation du module Propale
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -51,30 +51,30 @@ 
 		$this->family = "crm";
 		$this->module_position = '20';
 		// Module label (no space allowed), used if translation string 'ModuleXXXName' not found (where XXX is value of numeric property 'numero' of module)
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Gestion des propositions commerciales";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
 		$this->version = 'dolibarr';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
-		$this->picto='propal';
+		$this->picto = 'propal';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/propale/temp");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modSociete");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array("modSociete"); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
 		$this->config_page_url = array("propal.php");
-		$this->langfiles = array("propal","bills","companies","deliveries","products");
+		$this->langfiles = array("propal", "bills", "companies", "deliveries", "products");
 
 		// Constants
 		$this->const = array();
-		$r=0;
+		$r = 0;
 
 		$this->const[$r][0] = "PROPALE_ADDON_PDF";
 		$this->const[$r][1] = "chaine";
@@ -112,14 +112,14 @@ 
 
 		// Boxes
 		$this->boxes = array(
-           	0=>array('file'=>'box_graph_propales_permonth.php','enabledbydefaulton'=>'Home'),
-           	1=>array('file'=>'box_propales.php','enabledbydefaulton'=>'Home'),
+           	0=>array('file'=>'box_graph_propales_permonth.php', 'enabledbydefaulton'=>'Home'),
+           	1=>array('file'=>'box_propales.php', 'enabledbydefaulton'=>'Home'),
 		);
 
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'propale';
-		$r=0;
+		$r = 0;
 
 		$r++;
 		$this->rights[$r][0] = 21; // id de la permission
@@ -175,26 +175,26 @@ 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
 		//--------
-		$r=0;
+		$r = 0;
 
 		$r++;
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
-		$this->export_label[$r]='ProposalsAndProposalsLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		$this->export_permission[$r]=array(array("propale","export"));
-		$this->export_fields_array[$r]=array(
-			's.rowid'=>"IdCompany",'s.nom'=>'CompanyName','s.address'=>'Address','s.zip'=>'Zip','s.town'=>'Town','co.code'=>'CountryCode','s.phone'=>'Phone',
-			's.siren'=>'ProfId1','s.siret'=>'ProfId2','s.ape'=>'ProfId3','s.idprof4'=>'ProfId4','c.rowid'=>"Id",'c.ref'=>"Ref",'c.ref_client'=>"RefCustomer",
-			'c.fk_soc'=>"IdCompany",'c.datec'=>"DateCreation",'c.datep'=>"DatePropal",'c.fin_validite'=>"DateEndPropal",'c.remise_percent'=>"GlobalDiscount",
-			'c.total_ht'=>"TotalHT",'c.total'=>"TotalTTC",'c.fk_statut'=>'Status','c.note_public'=>"Note",'c.date_livraison'=>'DeliveryDate',
-			'c.fk_user_author'=>'CreatedById','uc.login'=>'CreatedByLogin','c.fk_user_valid'=>'ValidatedById','uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId','cd.label'=>"Label",'cd.description'=>"LineDescription",'cd.product_type'=>'TypeOfLineServiceOrProduct',
-			'cd.tva_tx'=>"LineVATRate",'cd.qty'=>"LineQty",'cd.total_ht'=>"LineTotalHT",'cd.total_tva'=>"LineTotalVAT",'cd.total_ttc'=>"LineTotalTTC",
-			'p.rowid'=>'ProductId','p.ref'=>'ProductRef','p.label'=>'ProductLabel'
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
+		$this->export_label[$r] = 'ProposalsAndProposalsLines'; // Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_permission[$r] = array(array("propale", "export"));
+		$this->export_fields_array[$r] = array(
+			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
+			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer",
+			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal", 'c.remise_percent'=>"GlobalDiscount",
+			'c.total_ht'=>"TotalHT", 'c.total'=>"TotalTTC", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
+			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
+			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.label'=>"Label", 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
+			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
+			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
 		//$this->export_TypeFields_array[$r]=array(
 		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
@@ -203,49 +203,49 @@ 
 		//	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
 		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
-		$this->export_TypeFields_array[$r]=array(
-			's.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
-			's.ape'=>'Text','s.idprof4'=>'Text','c.ref'=>"Text",'c.ref_client'=>"Text",'c.datec'=>"Date",'c.datep'=>"Date",'c.fin_validite'=>"Date",
-			'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date',
-			'pj.ref'=>'Text', 'cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
-			'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.ref'=>'Text','p.label'=>'Text'
+		$this->export_TypeFields_array[$r] = array(
+			's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'co.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text',
+			's.ape'=>'Text', 's.idprof4'=>'Text', 'c.ref'=>"Text", 'c.ref_client'=>"Text", 'c.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
+			'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
+			'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric",
+			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text'
 		);
-		$this->export_entities_array[$r]=array(
-			's.rowid'=>"company",'s.nom'=>'company','s.address'=>'company','s.zip'=>'company','s.town'=>'company','co.code'=>'company','s.phone'=>'company',
-			's.siren'=>'company','s.ape'=>'company','s.idprof4'=>'company','s.siret'=>'company','c.rowid'=>"propal",'c.ref'=>"propal",'c.ref_client'=>"propal",
-			'c.fk_soc'=>"propal",'c.datec'=>"propal",'c.datep'=>"propal",'c.fin_validite'=>"propal",'c.remise_percent'=>"propal",'c.total_ht'=>"propal",
-			'c.total'=>"propal",'c.fk_statut'=>"propal",'c.note_public'=>"propal",'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
-			'cd.label'=>"propal_line",'cd.description'=>"propal_line",'cd.product_type'=>'propal_line','cd.tva_tx'=>"propal_line",'cd.qty'=>"propal_line",
-			'cd.total_ht'=>"propal_line",'cd.total_tva'=>"propal_line",'cd.total_ttc'=>"propal_line",'p.rowid'=>'product','p.ref'=>'product','p.label'=>'product'
+		$this->export_entities_array[$r] = array(
+			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
+			's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"propal", 'c.ref'=>"propal", 'c.ref_client'=>"propal",
+			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.remise_percent'=>"propal", 'c.total_ht'=>"propal",
+			'c.total'=>"propal", 'c.fk_statut'=>"propal", 'c.note_public'=>"propal", 'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
+			'cd.label'=>"propal_line", 'cd.description'=>"propal_line", 'cd.product_type'=>'propal_line', 'cd.tva_tx'=>"propal_line", 'cd.qty'=>"propal_line",
+			'cd.total_ht'=>"propal_line", 'cd.total_tva'=>"propal_line", 'cd.total_ttc'=>"propal_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'
 		);
-		$this->export_dependencies_array[$r]=array('propal_line'=>'cd.rowid','product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
-		$keyforselect='propal'; $keyforelement='propal'; $keyforaliasextra='extra';
+		$this->export_dependencies_array[$r] = array('propal_line'=>'cd.rowid', 'product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
+		$keyforselect = 'propal'; $keyforelement = 'propal'; $keyforaliasextra = 'extra';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='propaldet'; $keyforelement='propal_line'; $keyforaliasextra='extra2';
+		$keyforselect = 'propaldet'; $keyforelement = 'propal_line'; $keyforaliasextra = 'extra2';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='product'; $keyforelement='product'; $keyforaliasextra='extra3';
+		$keyforselect = 'product'; $keyforelement = 'product'; $keyforaliasextra = 'extra3';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		$keyforselect='societe'; $keyforelement='societe'; $keyforaliasextra='extra4';
+		$keyforselect = 'societe'; $keyforelement = 'societe'; $keyforaliasextra = 'extra4';
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
-		$this->export_sql_start[$r]='SELECT DISTINCT ';
-		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
-
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
-		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
-		$this->export_sql_end[$r] .=', '.MAIN_DB_PREFIX.'propaldet as cd';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
-		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
-		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
-		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s ';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
+
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
+		$this->export_sql_end[$r] .= ' '.MAIN_DB_PREFIX.'propal as c';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uc ON c.fk_user_author = uc.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user as uv ON c.fk_user_valid = uv.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propal_extrafields as extra ON c.rowid = extra.fk_object';
+		$this->export_sql_end[$r] .= ', '.MAIN_DB_PREFIX.'propaldet as cd';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'propaldet_extrafields as extra2 on cd.rowid = extra2.fk_object';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p on (cd.fk_product = p.rowid)';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
+		$this->export_sql_end[$r] .= ' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
+		$this->export_sql_end[$r] .= ' AND c.entity IN ('.getEntity('propal').')';
+		if (!$user->rights->societe->client->voir) $this->export_sql_end[$r] .= ' AND sc.fk_user = '.$user->id;
 	}
 
 
@@ -257,27 +257,27 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		// Remove permissions and default values
 		$this->remove($options);
 
 		//ODT template
-		$src=DOL_DOCUMENT_ROOT.'/install/doctemplates/proposals/template_proposal.odt';
-		$dirodt=DOL_DATA_ROOT.'/doctemplates/proposals';
-		$dest=$dirodt.'/template_proposal.odt';
+		$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/proposals/template_proposal.odt';
+		$dirodt = DOL_DATA_ROOT.'/doctemplates/proposals';
+		$dest = $dirodt.'/template_proposal.odt';
 
-		if (file_exists($src) && ! file_exists($dest))
+		if (file_exists($src) && !file_exists($dest))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 			dol_mkdir($dirodt);
-			$result=dol_copy($src,$dest,0,0);
+			$result = dol_copy($src, $dest, 0, 0);
 			if ($result < 0)
 			{
 				$langs->load("errors");
-				$this->error=$langs->trans('ErrorFailToCopyFile',$src,$dest);
+				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
 				return 0;
 			}
 		}
@@ -287,6 +287,6 @@ 
 				"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','propal',".$conf->entity.")",
 		);
 
-		return $this->_init($sql,$options);
+		return $this->_init($sql, $options);
 	}
 }

Braces +6 added lines, -2 removed lines

@@ -232,7 +232,9 @@ 
 		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'societe as s ';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
+		}
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON s.fk_pays = co.rowid,';
 		$this->export_sql_end[$r] .=' '.MAIN_DB_PREFIX.'propal as c';
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'projet as pj ON c.fk_projet = pj.rowid';
@@ -245,7 +247,9 @@ 
 		$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra3 on p.rowid = extra3.fk_object';
 		$this->export_sql_end[$r] .=' WHERE c.fk_soc = s.rowid AND c.rowid = cd.fk_propal';
 		$this->export_sql_end[$r] .=' AND c.entity IN ('.getEntity('propal').')';
-		if(!$user->rights->societe->client->voir) $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		if(!$user->rights->societe->client->voir) {
+		    $this->export_sql_end[$r] .=' AND sc.fk_user = '.$user->id;
+		}
 	}
 
 

dolibarr/htdocs/core/modules/modProductBatch.class.php

Indentation +68 added lines, -68 removed lines

@@ -33,101 +33,101 @@
  */
 class modProductBatch extends DolibarrModules
 {
-	/**
-	 *   Constructor. Define names, constants, directories, boxes, permissions
-	 *
-	 *   @param      DoliDB		$db      Database handler
-	 */
-	function __construct($db)
-	{
+    /**
+     *   Constructor. Define names, constants, directories, boxes, permissions
+     *
+     *   @param      DoliDB		$db      Database handler
+     */
+    function __construct($db)
+    {
         global $langs,$conf;
 
         $this->db = $db;
-		$this->numero = 39000;
+        $this->numero = 39000;
 
-		$this->family = "products";
-		$this->module_position = '45';
+        $this->family = "products";
+        $this->module_position = '45';
 
-		$this->name = preg_replace('/^mod/i','',get_class($this));
-		$this->description = "Batch number, eat-by and sell-by date management module";
+        $this->name = preg_replace('/^mod/i','',get_class($this));
+        $this->description = "Batch number, eat-by and sell-by date management module";
 
-		$this->rights_class = 'productbatch';
-		// Possible values for version are: 'development', 'experimental', 'dolibarr' or version
-		$this->version = 'dolibarr';
-		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
-		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+        $this->rights_class = 'productbatch';
+        // Possible values for version are: 'development', 'experimental', 'dolibarr' or version
+        $this->version = 'dolibarr';
+        // Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 
-		$this->picto='stock';
+        $this->picto='stock';
 
-		$this->module_parts = array();
+        $this->module_parts = array();
 
-		// Data directories to create when module is enabled.
-		$this->dirs = array();
+        // Data directories to create when module is enabled.
+        $this->dirs = array();
 
-		// Config pages. Put here list of php page, stored into productdluo/admin directory, to use to setup module.
-		$this->config_page_url = array("product_lot_extrafields.php@product");
+        // Config pages. Put here list of php page, stored into productdluo/admin directory, to use to setup module.
+        $this->config_page_url = array("product_lot_extrafields.php@product");
 
-		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modProduct","modStock","modExpedition","modFournisseur");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
-		$this->langfiles = array("productbatch");
+        // Dependencies
+        $this->hidden = false;			// A condition to hide module
+        $this->depends = array("modProduct","modStock","modExpedition","modFournisseur");		// List of module class names as string that must be enabled if this module is enabled
+        $this->requiredby = array();	// List of module ids to disable if this one is disabled
+        $this->conflictwith = array();	// List of module class names as string this module is in conflict with
+        $this->phpmin = array(5,4);		// Minimum version of PHP required by module
+        $this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+        $this->langfiles = array("productbatch");
 
-		// Constants
-		$this->const = array();
+        // Constants
+        $this->const = array();
 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
+        if (! isset($conf->productbatch->enabled))
         {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
+            $conf->productbatch=new stdClass();
+            $conf->productbatch->enabled=0;
         }
-		$this->dictionaries=array();
+        $this->dictionaries=array();
 
         // Boxes
         $this->boxes = array();			// List of boxes
 
-		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+        // Permissions
+        $this->rights = array();		// Permission array used by this module
+        $r=0;
 
 
-		// Menus
-		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+        // Menus
+        //-------
+        $this->menu = 1;        // This module add menu entries. They are coded into menu manager.
 
 
-		// Exports
-		$r=0;
-	}
+        // Exports
+        $r=0;
+    }
 
-	/**
-	 *		Function called when module is enabled.
-	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
-	 *		It also creates data directories
-	 *
+    /**
+     *		Function called when module is enabled.
+     *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+     *		It also creates data directories
+     *
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
-	 *      @return     int             	1 if OK, 0 if KO
-	 */
-	function init($options='')
-	{
-	    global $db,$conf;
-
-		$sql = array();
-
-		if (! empty($conf->cashdesk->enabled)) {
-    		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
-    		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
-    		}
-		}
-
-		return $this->_init($sql, $options);
-	}
+     *      @return     int             	1 if OK, 0 if KO
+     */
+    function init($options='')
+    {
+        global $db,$conf;
+
+        $sql = array();
+
+        if (! empty($conf->cashdesk->enabled)) {
+            if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+                $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+            }
+        }
+
+        return $this->_init($sql, $options);
+    }
 }
 

Spacing +23 added lines, -23 removed lines

@@ -25,7 +25,7 @@ 
  *  \ingroup    productbatch
  *  \brief      Description and activation file for module productbatch
  */
-include_once DOL_DOCUMENT_ROOT .'/core/modules/DolibarrModules.class.php';
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
 
 
 /**
@@ -40,7 +40,7 @@ 
 	 */
 	function __construct($db)
 	{
-        global $langs,$conf;
+        global $langs, $conf;
 
         $this->db = $db;
 		$this->numero = 39000;
@@ -48,7 +48,7 @@ 
 		$this->family = "products";
 		$this->module_position = '45';
 
-		$this->name = preg_replace('/^mod/i','',get_class($this));
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		$this->description = "Batch number, eat-by and sell-by date management module";
 
 		$this->rights_class = 'productbatch';
@@ -57,7 +57,7 @@ 
 		// Key used in llx_const table to save module status enabled/disabled (where dluo is value of property name of module in uppercase)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 
-		$this->picto='stock';
+		$this->picto = 'stock';
 
 		$this->module_parts = array();
 
@@ -68,12 +68,12 @@ 
 		$this->config_page_url = array("product_lot_extrafields.php@product");
 
 		// Dependencies
-		$this->hidden = false;			// A condition to hide module
-		$this->depends = array("modProduct","modStock","modExpedition","modFournisseur");		// List of module class names as string that must be enabled if this module is enabled
-		$this->requiredby = array();	// List of module ids to disable if this one is disabled
-		$this->conflictwith = array();	// List of module class names as string this module is in conflict with
-		$this->phpmin = array(5,4);		// Minimum version of PHP required by module
-		$this->need_dolibarr_version = array(3,0);	// Minimum version of Dolibarr required by module
+		$this->hidden = false; // A condition to hide module
+		$this->depends = array("modProduct", "modStock", "modExpedition", "modFournisseur"); // List of module class names as string that must be enabled if this module is enabled
+		$this->requiredby = array(); // List of module ids to disable if this one is disabled
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with
+		$this->phpmin = array(5, 4); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(3, 0); // Minimum version of Dolibarr required by module
 		$this->langfiles = array("productbatch");
 
 		// Constants
@@ -82,28 +82,28 @@ 
         $this->tabs = array();
 
         // Dictionaries
-	    if (! isset($conf->productbatch->enabled))
+	    if (!isset($conf->productbatch->enabled))
         {
-        	$conf->productbatch=new stdClass();
-        	$conf->productbatch->enabled=0;
+        	$conf->productbatch = new stdClass();
+        	$conf->productbatch->enabled = 0;
         }
-		$this->dictionaries=array();
+		$this->dictionaries = array();
 
         // Boxes
-        $this->boxes = array();			// List of boxes
+        $this->boxes = array(); // List of boxes
 
 		// Permissions
-		$this->rights = array();		// Permission array used by this module
-		$r=0;
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
 
 		// Menus
 		//-------
-		$this->menu = 1;        // This module add menu entries. They are coded into menu manager.
+		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
 		// Exports
-		$r=0;
+		$r = 0;
 	}
 
 	/**
@@ -114,16 +114,16 @@ 
      *      @param      string	$options    Options when enabling module ('', 'noboxes')
 	 *      @return     int             	1 if OK, 0 if KO
 	 */
-	function init($options='')
+	function init($options = '')
 	{
-	    global $db,$conf;
+	    global $db, $conf;
 
 		$sql = array();
 
-		if (! empty($conf->cashdesk->enabled)) {
+		if (!empty($conf->cashdesk->enabled)) {
     		if (empty($conf->global->CASHDESK_NO_DECREASE_STOCK)) {
     		    include_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-    		    $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+    		    $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
     		}
 		}
 

dolibarr/htdocs/core/modules/holiday/mod_holiday_immaculate.php

Indentation +91 added lines, -91 removed lines

@@ -30,122 +30,122 @@
  */
 class mod_holiday_immaculate extends ModelNumRefHolidays
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
-
-	/**
-	 * @var string Error message
-	 */
-	public $error = '';
-
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see $name
-	 */
-	public $nom='Immaculate';
-
-	/**
-	 * @var string model name
-	 */
-	public $name='Immaculate';
-
-	public $code_auto=1;
-
-	/**
-	 *	Return default description of numbering model
-	 *
-	 *	@return     string      text description
-	 */
-	function info()
+    public $version = 'dolibarr';
+
+    /**
+     * @var string Error message
+     */
+    public $error = '';
+
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see $name
+     */
+    public $nom='Immaculate';
+
+    /**
+     * @var string model name
+     */
+    public $name='Immaculate';
+
+    public $code_auto=1;
+
+    /**
+     *	Return default description of numbering model
+     *
+     *	@return     string      text description
+     */
+    function info()
     {
-    	global $conf, $langs;
+        global $conf, $langs;
 
-		$langs->load("bills");
+        $langs->load("bills");
 
-		$form = new Form($this->db);
+        $form = new Form($this->db);
 
-		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
+        $texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+        $texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+        $texte.= '<input type="hidden" name="action" value="updateMask">';
+        $texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
+        $texte.= '<table class="nobordernopadding" width="100%">';
 
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+        $tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
+        $tooltip.=$langs->trans("GenericMaskCodes2");
+        $tooltip.=$langs->trans("GenericMaskCodes3");
+        $tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
+        $tooltip.=$langs->trans("GenericMaskCodes5");
 
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-		$texte.= '</tr>';
-		$texte.= '</table>';
-		$texte.= '</form>';
+        $texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
+        $texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
+        $texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+        $texte.= '</tr>';
+        $texte.= '</table>';
+        $texte.= '</form>';
 
-		return $texte;
+        return $texte;
     }
 
-	/**
-	 *	Return numbering example
-	 *
-	 *	@return     string      Example
-	 */
+    /**
+     *	Return numbering example
+     *
+     *	@return     string      Example
+     */
     function getExample()
     {
-     	global $conf,$langs,$user;
-
-    	$old_login=$user->login;
-    	$user->login='UUUUUUU';
-     	$numExample = $this->getNextValue($user, '');
-		$user->login=$old_login;
-
-		if (! $numExample)
-		{
-			$numExample = $langs->trans('NotConfigured');
-		}
-		return $numExample;
+            global $conf,$langs,$user;
+
+        $old_login=$user->login;
+        $user->login='UUUUUUU';
+            $numExample = $this->getNextValue($user, '');
+        $user->login=$old_login;
+
+        if (! $numExample)
+        {
+            $numExample = $langs->trans('NotConfigured');
+        }
+        return $numExample;
     }
 
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$user     	user object
-	 *	@param	Object		$holiday	holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
+    /**
+     *	Return next value
+     *
+     *	@param	Societe		$user     	user object
+     *	@param	Object		$holiday	holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
     function getNextValue($user, $holiday)
     {
-		global $db,$conf;
+        global $db,$conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+        require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
 
-		$mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
+        $mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
 
-		if (! $mask)
-		{
-			$this->error='NotConfigured';
-			return 0;
-		}
+        if (! $mask)
+        {
+            $this->error='NotConfigured';
+            return 0;
+        }
 
-		$numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
+        $numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
 
-		return  $numFinal;
-	}
+        return  $numFinal;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return next value
-	 *
-	 *  @param  User		$fuser     	User object
-	 *  @param  Object		$objforref	Holiday object
-	 *  @return string      			Value if OK, 0 if KO
-	 */
+    /**
+     *  Return next value
+     *
+     *  @param  User		$fuser     	User object
+     *  @param  Object		$objforref	Holiday object
+     *  @return string      			Value if OK, 0 if KO
+     */
     function holiday_get_num($fuser, $objforref)
     {
         // phpcs:enable

Spacing +33 added lines, -33 removed lines

@@ -23,7 +23,7 @@ 
  *  \brief      File of class to manage contract numbering rules Magre
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 
 /**
  *	Class to manage contract numbering rules Magre
@@ -46,14 +46,14 @@ 
 	 * @deprecated
 	 * @see $name
 	 */
-	public $nom='Immaculate';
+	public $nom = 'Immaculate';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Immaculate';
+	public $name = 'Immaculate';
 
-	public $code_auto=1;
+	public $code_auto = 1;
 
 	/**
 	 *	Return default description of numbering model
@@ -69,24 +69,24 @@ 
 		$form = new Form($this->db);
 
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
-		$texte.= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-		$texte.= '<input type="hidden" name="action" value="updateMask">';
-		$texte.= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Holiday"),$langs->transnoentities("Holiday"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
-
-		$texte.= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">',$tooltip,1,1).'</td>';
-		$texte.= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
-		$texte.= '</tr>';
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstcontract" value="HOLIDAY_IMMACULATE_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Holiday"), $langs->transnoentities("Holiday"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Holiday"), $langs->transnoentities("Holiday"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '</tr>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -98,14 +98,14 @@ 
 	 */
     function getExample()
     {
-     	global $conf,$langs,$user;
+     	global $conf, $langs, $user;
 
-    	$old_login=$user->login;
-    	$user->login='UUUUUUU';
+    	$old_login = $user->login;
+    	$user->login = 'UUUUUUU';
      	$numExample = $this->getNextValue($user, '');
-		$user->login=$old_login;
+		$user->login = $old_login;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -121,19 +121,19 @@ 
 	 */
     function getNextValue($user, $holiday)
     {
-		global $db,$conf;
+		global $db, $conf;
 
-		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask=$conf->global->HOLIDAY_IMMACULATE_MASK;
+		$mask = $conf->global->HOLIDAY_IMMACULATE_MASK;
 
-		if (! $mask)
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal=get_next_value($db,$mask,'holiday','ref','', $user, $holiday->date_create);
+		$numFinal = get_next_value($db, $mask, 'holiday', 'ref', '', $user, $holiday->date_create);
 
 		return  $numFinal;
 	}

dolibarr/htdocs/core/modules/holiday/mod_holiday_madonna.php

Indentation +119 added lines, -119 removed lines

@@ -29,142 +29,142 @@
  */
 class mod_holiday_madonna extends ModelNumRefHolidays
 {
-	/**
+    /**
      * Dolibarr version of the loaded document
      * @public string
      */
-	public $version = 'dolibarr';
+    public $version = 'dolibarr';
 
-	public $prefix='HL';
+    public $prefix='HL';
 
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
-	/**
-	 * @var string Nom du modele
-	 * @deprecated
-	 * @see $name
-	 */
-	public $nom='Madonna';
+    /**
+     * @var string Nom du modele
+     * @deprecated
+     * @see $name
+     */
+    public $nom='Madonna';
 
-	/**
-	 * @var string model name
-	 */
-	public $name='Madonna';
+    /**
+     * @var string model name
+     */
+    public $name='Madonna';
 
-	public $code_auto=1;
+    public $code_auto=1;
 
 
-	/**
-	 *	Return default description of numbering model
-	 *
-	 *	@return     string      text description
-	 */
+    /**
+     *	Return default description of numbering model
+     *
+     *	@return     string      text description
+     */
     function info()
     {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+        global $langs;
+            return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
     }
 
 
-	/**
-	 *	Return numbering example
-	 *
-	 *	@return     string      Example
-	 */
-	function getExample()
-	{
-		return $this->prefix."0501-0001";
-	}
-
-
-	/**
-	 *	Test if existing numbers make problems with numbering
-	 *
-	 *	@return     boolean     false if conflit, true if ok
-	 */
-	function canBeActivated()
-	{
-		global $conf,$langs,$db;
-
-		$coyymm=''; $max='';
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
-		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
-		{
-			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 *	Return next value
-	 *
-	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$holiday	Holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
-	function getNextValue($objsoc, $holiday)
-	{
-		global $db,$conf;
-
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
-		{
-			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
-			return -1;
-		}
-
-		$date=$holiday->date_debut;
-		$yymm = strftime("%y%m",$date);
-
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
-
-		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
-		return $this->prefix.$yymm."-".$num;
-	}
+    /**
+     *	Return numbering example
+     *
+     *	@return     string      Example
+     */
+    function getExample()
+    {
+        return $this->prefix."0501-0001";
+    }
+
+
+    /**
+     *	Test if existing numbers make problems with numbering
+     *
+     *	@return     boolean     false if conflit, true if ok
+     */
+    function canBeActivated()
+    {
+        global $conf,$langs,$db;
+
+        $coyymm=''; $max='';
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."holiday";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $row = $db->fetch_row($resql);
+            if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+        }
+        if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+        {
+            $langs->load("errors");
+            $this->error=$langs->trans('ErrorNumRefModel', $max);
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     *	Return next value
+     *
+     *	@param	Societe		$objsoc     third party object
+     *	@param	Object		$holiday	Holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
+    function getNextValue($objsoc, $holiday)
+    {
+        global $db,$conf;
+
+        $posindice=8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+        $sql.= " FROM ".MAIN_DB_PREFIX."holiday";
+        $sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+        $sql.= " AND entity = ".$conf->entity;
+
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            $obj = $db->fetch_object($resql);
+            if ($obj) $max = intval($obj->max);
+            else $max=0;
+        }
+        else
+        {
+            dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
+            return -1;
+        }
+
+        $date=$holiday->date_debut;
+        $yymm = strftime("%y%m",$date);
+
+        if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+        else $num = sprintf("%04s",$max+1);
+
+        dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
+        return $this->prefix.$yymm."-".$num;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Return next value
-	 *
-	 *	@param	User		$fuser     	User object
-	 *	@param	Object		$objforref	Holiday object
-	 *	@return string      			Value if OK, 0 if KO
-	 */
-	function holiday_get_num($fuser,$objforref)
-	{
+    /**
+     *	Return next value
+     *
+     *	@param	User		$fuser     	User object
+     *	@param	Object		$objforref	Holiday object
+     *	@return string      			Value if OK, 0 if KO
+     */
+    function holiday_get_num($fuser,$objforref)
+    {
         // phpcs:enable
-		return $this->getNextValue($fuser,$objforref);
-	}
+        return $this->getNextValue($fuser,$objforref);
+    }
 }

Spacing +30 added lines, -30 removed lines

@@ -22,7 +22,7 @@ 
  *  \ingroup    contract
  *  \brief      File of class to manage contract numbering rules Serpis
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/holiday/modules_holiday.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/holiday/modules_holiday.php';
 
 /**
  * 	Class to manage contract numbering rules madonna
@@ -35,26 +35,26 @@ 
      */
 	public $version = 'dolibarr';
 
-	public $prefix='HL';
+	public $prefix = 'HL';
 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 	/**
 	 * @var string Nom du modele
 	 * @deprecated
 	 * @see $name
 	 */
-	public $nom='Madonna';
+	public $nom = 'Madonna';
 
 	/**
 	 * @var string model name
 	 */
-	public $name='Madonna';
+	public $name = 'Madonna';
 
-	public $code_auto=1;
+	public $code_auto = 1;
 
 
 	/**
@@ -65,7 +65,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -87,26 +87,26 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
-		$coyymm=''; $max='';
+		$coyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $coyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($coyymm && ! preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i',$coyymm))
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel', $max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
@@ -122,20 +122,20 @@ 
 	 */
 	function getNextValue($objsoc, $holiday)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."holiday";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."holiday";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
 			if ($obj) $max = intval($obj->max);
-			else $max=0;
+			else $max = 0;
 		}
 		else
 		{
@@ -143,11 +143,11 @@ 
 			return -1;
 		}
 
-		$date=$holiday->date_debut;
-		$yymm = strftime("%y%m",$date);
+		$date = $holiday->date_debut;
+		$yymm = strftime("%y%m", $date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -162,9 +162,9 @@ 
 	 *	@param	Object		$objforref	Holiday object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-	function holiday_get_num($fuser,$objforref)
+	function holiday_get_num($fuser, $objforref)
 	{
         // phpcs:enable
-		return $this->getNextValue($fuser,$objforref);
+		return $this->getNextValue($fuser, $objforref);
 	}
 }

Braces +13 added lines, -6 removed lines

@@ -134,10 +134,12 @@ 
 		if ($resql)
 		{
 			$obj = $db->fetch_object($resql);
-			if ($obj) $max = intval($obj->max);
-			else $max=0;
-		}
-		else
+			if ($obj) {
+			    $max = intval($obj->max);
+			} else {
+			    $max=0;
+			}
+		} else
 		{
 			dol_syslog("mod_holiday_madonna::getNextValue", LOG_DEBUG);
 			return -1;
@@ -146,8 +148,13 @@ 
 		$date=$holiday->date_debut;
 		$yymm = strftime("%y%m",$date);
 
-		if ($max >= (pow(10, 4) - 1)) $num=$max+1;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-		else $num = sprintf("%04s",$max+1);
+		if ($max >= (pow(10, 4) - 1)) {
+		    $num=$max+1;
+		}
+		// If counter > 9999, we do not format on 4 chars, we take number as it is
+		else {
+		    $num = sprintf("%04s",$max+1);
+		}
 
 		dol_syslog("mod_holiday_madonna::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;