Dolibarr / dolibarr

htdocs/core/modules/cheque/doc/pdf_blochet.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -366,10 +366,10 @@
 	 *   	Show footer of page. Need this->emetteur object
      *
 	 *   	@param	PDF			$pdf     			PDF
-	 * 		@param	Object		$object				Object to show
+	 * 		@param	string		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
 	 *      @param	int			$hidefreetext		1=Hide free text
-	 *      @return	void
+	 *      @return	integer
 	 */
 	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
 	{

Indentation +69 added lines, -69 removed lines

@@ -64,12 +64,12 @@ 
 		$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;
 
-        // Recupere emmetteur
-        $this->emetteur=$mysoc;
-        if (! $this->emetteur->country_code) $this->emetteur->country_code=substr($langs->defaultlang,-2);    // By default if not defined
+		// 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->line_height = 5;
+		// Defini position des colonnes
+		$this->line_height = 5;
 		$this->line_per_page = 40;
 		$this->tab_height = 200;	//$this->line_height * $this->line_per_page;
 	}
@@ -81,22 +81,22 @@ 
 	 *	@param	string			$_dir			Directory
 	 *	@param	string			$number			Number
 	 *	@param	Translate		$outputlangs	Lang output object
-     *	@return	int     						1=ok, 0=ko
+	 *	@return	int     						1=ok, 0=ko
 	 */
 	function write_file($object, $_dir, $number, $outputlangs)
 	{
 		global $user,$conf,$langs,$hookmanager;
 
-        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
-        $sav_charset_output=$outputlangs->charset_output;
-        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+		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
+		$sav_charset_output=$outputlangs->charset_output;
+		if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("companies");
 		$outputlangs->load("bills");
 		$outputlangs->load("products");
-        $outputlangs->load("compta");
+		$outputlangs->load("compta");
 
 		$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
 
@@ -125,18 +125,18 @@ 
 		$reshook=$hookmanager->executeHooks('beforePDFCreation',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
 
 		// Create PDF instance
-        $pdf=pdf_getInstance($this->format);
-        $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)
-        $pdf->SetAutoPageBreak(1,0);
-
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		$pdf=pdf_getInstance($this->format);
+		$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)
+		$pdf->SetAutoPageBreak(1,0);
+
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 		$pdf->Open();
 		$pagenb=0;
@@ -166,7 +166,7 @@ 
 		}
 
 		$pdf->AddPage();
-        $pagenb++;
+		$pagenb++;
 		$this->Header($pdf, $pagenb, $pages, $outputlangs);
 
 		$this->Body($pdf, $pagenb, $pages, $outputlangs);
@@ -195,8 +195,8 @@ 
 
 		$this->result = array('fullpath'=>$file);
 		
-        $outputlangs->charset_output=$sav_charset_output;
-	    return 1;   // Pas d'erreur
+		$outputlangs->charset_output=$sav_charset_output;
+		return 1;   // Pas d'erreur
 	}
 
 
@@ -219,47 +219,47 @@ 
 
 		$title = $outputlangs->transnoentities("CheckReceipt");
 		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(10,8);
-        $pdf->MultiCell(0,2,$title,0,'L');
+		$pdf->SetXY(10,8);
+		$pdf->MultiCell(0,2,$title,0,'L');
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,15);
+		$pdf->SetXY(10,15);
 		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
-        $pdf->SetXY(32,15);
+		$pdf->SetXY(32,15);
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
+		$pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,20);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
-        $pdf->SetXY(32,20);
-        $pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
+		$pdf->SetXY(10,20);
+		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
+		$pdf->SetXY(32,20);
+		$pdf->SetFont('','', $default_font_size);
+		$pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,26);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
+		$pdf->SetXY(10,26);
+		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(32,26);
-        $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
+		$pdf->SetXY(32,26);
+		$pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,32);
-        $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
-        pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
+		$pdf->SetXY(10,32);
+		$pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
+		pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(114,15);
+		$pdf->SetXY(114,15);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
-        $pdf->Rect(9, 14, 192, 35);
-        $pdf->line(9, 19, 112, 19);
-        $pdf->line(9, 25, 112, 25);
-        //$pdf->line(9, 31, 201, 31);
-        $pdf->line(9, 31, 112, 31);
+		$pdf->Rect(9, 14, 192, 35);
+		$pdf->line(9, 19, 112, 19);
+		$pdf->line(9, 25, 112, 25);
+		//$pdf->line(9, 31, 201, 31);
+		$pdf->line(9, 31, 112, 31);
 
-        $pdf->line(30, 14, 30, 49);
-        $pdf->line(112, 14, 112, 49);
+		$pdf->line(30, 14, 30, 49);
+		$pdf->line(112, 14, 112, 49);
 
 		// Number of cheques
 		$posy=51;
@@ -273,11 +273,11 @@ 
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
 		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(57,$posy+1);
-        $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
+		$pdf->SetXY(57,$posy+1);
+		$pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
 		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(148,$posy+1);
+		$pdf->SetXY(148,$posy+1);
 		$pdf->MultiCell(40, 2, $langs->trans("Total"));
 
 		$pdf->SetFont('','B', $default_font_size);
@@ -291,11 +291,11 @@ 
 		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
 		$pdf->SetXY(41, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
+		$pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
 		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
-        $pdf->SetXY(101, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
+		$pdf->SetXY(101, $this->tab_top+2);
+		$pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
 		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
 		$pdf->SetXY(180, $this->tab_top+2);
@@ -329,7 +329,7 @@ 
 		$num=count($this->lines);
 		for ($j = 0; $j < $num; $j++)
 		{
-		    $lineinpage++;
+			$lineinpage++;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
@@ -350,15 +350,15 @@ 
 
 			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
 			{
-			    $lineinpage=0; $yp=0;
-
-                // New page
-                $pdf->AddPage();
-                $pagenb++;
-                $this->Header($pdf, $pagenb, $pages, $outputlangs);
-                $pdf->SetFont('','', $default_font_size - 1);
-                $pdf->MultiCell(0, 3, '');      // Set interline to 3
-                $pdf->SetTextColor(0,0,0);
+				$lineinpage=0; $yp=0;
+
+				// New page
+				$pdf->AddPage();
+				$pagenb++;
+				$this->Header($pdf, $pagenb, $pages, $outputlangs);
+				$pdf->SetFont('','', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, '');      // Set interline to 3
+				$pdf->SetTextColor(0,0,0);
 			}
 		}
 	}
@@ -366,7 +366,7 @@ 
 
 	/**
 	 *   	Show footer of page. Need this->emetteur object
-     *
+	 *
 	 *   	@param	PDF			$pdf     			PDF
 	 * 		@param	Object		$object				Object to show
 	 *      @param	Translate	$outputlangs		Object lang for output
@@ -385,7 +385,7 @@ 
 		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
 		if (! empty($conf->global->$paramfreetext))
 		{
-		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+			$newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
 		}
 		
 		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);

Spacing +118 added lines, -118 removed lines

@@ -34,7 +34,7 @@ 
  */
 class BordereauChequeBlochet extends ModeleChequeReceipts
 {
-	var $emetteur;	// Objet societe qui emet
+	var $emetteur; // Objet societe qui emet
 
 	/**
 	 *	Constructor
@@ -43,7 +43,7 @@ 
 	 */
 	function __construct($db)
 	{
-		global $conf,$langs,$mysoc;
+		global $conf, $langs, $mysoc;
 
 		$langs->load("main");
 		$langs->load("bills");
@@ -55,23 +55,23 @@ 
 
 		// 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;
 
         // 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->line_height = 5;
 		$this->line_per_page = 40;
-		$this->tab_height = 200;	//$this->line_height * $this->line_per_page;
+		$this->tab_height = 200; //$this->line_height * $this->line_per_page;
 	}
 
 	/**
@@ -85,12 +85,12 @@ 
 	 */
 	function write_file($object, $_dir, $number, $outputlangs)
 	{
-		global $user,$conf,$langs,$hookmanager;
+		global $user, $conf, $langs, $hookmanager;
 
-        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
-        $sav_charset_output=$outputlangs->charset_output;
-        if (! empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output='ISO-8859-1';
+        $sav_charset_output = $outputlangs->charset_output;
+        if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
 
 		$outputlangs->load("main");
 		$outputlangs->load("companies");
@@ -98,38 +98,38 @@ 
 		$outputlangs->load("products");
         $outputlangs->load("compta");
 
-		$dir = $_dir . "/".get_exdir($number,0,1,0,$object,'cheque').$number;
+		$dir = $_dir."/".get_exdir($number, 0, 1, 0, $object, 'cheque').$number;
 
-		if (! is_dir($dir))
+		if (!is_dir($dir))
 		{
-			$result=dol_mkdir($dir);
+			$result = dol_mkdir($dir);
 
 			if ($result < 0)
 			{
-				$this->error=$langs->transnoentities("ErrorCanNotCreateDir",$dir);
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return -1;
 			}
 		}
 
-		$file = $dir . "/bordereau-".$number.".pdf";
+		$file = $dir."/bordereau-".$number.".pdf";
 
 		// 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, 'outputlangs'=>$outputlangs);
+		$parameters = array('file'=>$file, '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
 
 		// Create PDF instance
-        $pdf=pdf_getInstance($this->format);
-        $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)
-        $pdf->SetAutoPageBreak(1,0);
+        $pdf = pdf_getInstance($this->format);
+        $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)
+        $pdf->SetAutoPageBreak(1, 0);
 
         if (class_exists('TCPDF'))
         {
@@ -139,23 +139,23 @@ 
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
 		$pdf->Open();
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 		$pdf->SetTitle($outputlangs->transnoentities("CheckReceipt")." ".$number);
 		$pdf->SetSubject($outputlangs->transnoentities("CheckReceipt"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		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
 
-		$nboflines=count($this->lines);
+		$nboflines = count($this->lines);
 
 		// Define nb of page
 		$pages = intval($nboflines / $this->line_per_page);
-		if (($nboflines % $this->line_per_page)>0)
+		if (($nboflines % $this->line_per_page) > 0)
 		{
 			$pages++;
 		}
@@ -172,31 +172,31 @@ 
 		$this->Body($pdf, $pagenb, $pages, $outputlangs);
 
 		// Pied de page
-		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+		$this->_pagefoot($pdf, '', $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);
 		
-        $outputlangs->charset_output=$sav_charset_output;
-	    return 1;   // Pas d'erreur
+        $outputlangs->charset_output = $sav_charset_output;
+	    return 1; // Pas d'erreur
 	}
 
 
@@ -218,38 +218,38 @@ 
 		$outputlangs->load("banks");
 
 		$title = $outputlangs->transnoentities("CheckReceipt");
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(10,8);
-        $pdf->MultiCell(0,2,$title,0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,15);
-		$pdf->MultiCell(22,2,$outputlangs->transnoentities("Ref"),0,'L');
-        $pdf->SetXY(32,15);
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext?" - ".$this->ref_ext:'')), 0, 'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,20);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Date"),0,'L');
-        $pdf->SetXY(32,20);
-        $pdf->SetFont('','', $default_font_size);
-        $pdf->MultiCell(60, 2, dol_print_date($this->date,"day",false,$outputlangs));
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,26);
-        $pdf->MultiCell(22,2,$outputlangs->transnoentities("Owner"),0,'L');
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(32,26);
-        $pdf->MultiCell(60,2,$outputlangs->convToOutputCharset($this->account->proprio),0,'L');
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(10,32);
-        $pdf->MultiCell(0,2,$outputlangs->transnoentities("Account"),0,'L');
-        pdf_bank($pdf,$outputlangs,32,32,$this->account,1);
-
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(114,15);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(10, 8);
+        $pdf->MultiCell(0, 2, $title, 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 15);
+		$pdf->MultiCell(22, 2, $outputlangs->transnoentities("Ref"), 0, 'L');
+        $pdf->SetXY(32, 15);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->ref.($this->ref_ext ? " - ".$this->ref_ext : '')), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 20);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Date"), 0, 'L');
+        $pdf->SetXY(32, 20);
+        $pdf->SetFont('', '', $default_font_size);
+        $pdf->MultiCell(60, 2, dol_print_date($this->date, "day", false, $outputlangs));
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 26);
+        $pdf->MultiCell(22, 2, $outputlangs->transnoentities("Owner"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(32, 26);
+        $pdf->MultiCell(60, 2, $outputlangs->convToOutputCharset($this->account->proprio), 0, 'L');
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(10, 32);
+        $pdf->MultiCell(0, 2, $outputlangs->transnoentities("Account"), 0, 'L');
+        pdf_bank($pdf, $outputlangs, 32, 32, $this->account, 1);
+
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(114, 15);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Signature"), 0, 'L');
 
         $pdf->Rect(9, 14, 192, 35);
@@ -262,44 +262,44 @@ 
         $pdf->line(112, 14, 112, 49);
 
 		// Number of cheques
-		$posy=51;
+		$posy = 51;
 		$pdf->Rect(9, $posy, 192, 6);
-		$pdf->line(55, $posy, 55, $posy+6);
-		$pdf->line(140, $posy, 140, $posy+6);
-		$pdf->line(170, $posy, 170, $posy+6);
+		$pdf->line(55, $posy, 55, $posy + 6);
+		$pdf->line(140, $posy, 140, $posy + 6);
+		$pdf->line(170, $posy, 170, $posy + 6);
 
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY(10,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY(10, $posy + 1);
 		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("NumberOfCheques"), 0, 'L');
 
-		$pdf->SetFont('','B', $default_font_size);
-        $pdf->SetXY(57,$posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+        $pdf->SetXY(57, $posy + 1);
         $pdf->MultiCell(40, 2, $this->nbcheque, 0, 'L');
 
-		$pdf->SetFont('','', $default_font_size);
-        $pdf->SetXY(148,$posy+1);
+		$pdf->SetFont('', '', $default_font_size);
+        $pdf->SetXY(148, $posy + 1);
 		$pdf->MultiCell(40, 2, $langs->trans("Total"));
 
-		$pdf->SetFont('','B', $default_font_size);
-		$pdf->SetXY(170, $posy+1);
+		$pdf->SetFont('', 'B', $default_font_size);
+		$pdf->SetXY(170, $posy + 1);
 		$pdf->MultiCell(31, 2, price($this->amount), 0, 'C', 0);
 
 		// Tableau
-		$pdf->SetFont('','', $default_font_size - 2);
-		$pdf->SetXY(11, $this->tab_top+2);
-		$pdf->MultiCell(40,2,$outputlangs->transnoentities("Num"), 0, 'L');
+		$pdf->SetFont('', '', $default_font_size - 2);
+		$pdf->SetXY(11, $this->tab_top + 2);
+		$pdf->MultiCell(40, 2, $outputlangs->transnoentities("Num"), 0, 'L');
 		$pdf->line(40, $this->tab_top, 40, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(41, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("Bank"), 0, 'L');
+		$pdf->SetXY(41, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("Bank"), 0, 'L');
 		$pdf->line(100, $this->tab_top, 100, $this->tab_top + $this->tab_height + 10);
 
-        $pdf->SetXY(101, $this->tab_top+2);
-        $pdf->MultiCell(40,2,$outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
+        $pdf->SetXY(101, $this->tab_top + 2);
+        $pdf->MultiCell(40, 2, $outputlangs->transnoentities("CheckTransmitter"), 0, 'L');
 		$pdf->line(180, $this->tab_top, 180, $this->tab_top + $this->tab_height + 10);
 
-		$pdf->SetXY(180, $this->tab_top+2);
-		$pdf->MultiCell(20,2,$outputlangs->transnoentities("Amount"), 0, 'R');
+		$pdf->SetXY(180, $this->tab_top + 2);
+		$pdf->MultiCell(20, 2, $outputlangs->transnoentities("Amount"), 0, 'R');
 		$pdf->line(9, $this->tab_top + 8, 201, $this->tab_top + 8);
 
 		$pdf->Rect(9, $this->tab_top, 192, $this->tab_height + 10);
@@ -321,44 +321,44 @@ 
 		// x=30 - Banque
 		// x=100 - Emetteur
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 		$oldprowid = 0;
-		$pdf->SetFillColor(220,220,220);
+		$pdf->SetFillColor(220, 220, 220);
 		$yp = 0;
-		$lineinpage=0;
-		$num=count($this->lines);
+		$lineinpage = 0;
+		$num = count($this->lines);
 		for ($j = 0; $j < $num; $j++)
 		{
 		    $lineinpage++;
 
 			$pdf->SetXY(1, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(8, $this->line_height, $j+1, 0, 'R', 0);
+			$pdf->MultiCell(8, $this->line_height, $j + 1, 0, 'R', 0);
 
 			$pdf->SetXY(10, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq?$this->lines[$j]->num_chq:'', 0, 'L', 0);
+			$pdf->MultiCell(30, $this->line_height, $this->lines[$j]->num_chq ? $this->lines[$j]->num_chq : '', 0, 'L', 0);
 
 			$pdf->SetXY(40, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq),44), 0, 'L', 0);
+			$pdf->MultiCell(70, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->bank_chq), 44), 0, 'L', 0);
 
 			$pdf->SetXY(100, $this->tab_top + 10 + $yp);
-			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq),50), 0, 'L', 0);
+			$pdf->MultiCell(80, $this->line_height, dol_trunc($outputlangs->convToOutputCharset($this->lines[$j]->emetteur_chq), 50), 0, 'L', 0);
 
 			$pdf->SetXY(180, $this->tab_top + 10 + $yp);
 			$pdf->MultiCell(20, $this->line_height, price($this->lines[$j]->amount_chq), 0, 'R', 0);
 
 			$yp = $yp + $this->line_height;
 
-			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines)-1))
+			if ($lineinpage >= $this->line_per_page && $j < (count($this->lines) - 1))
 			{
-			    $lineinpage=0; $yp=0;
+			    $lineinpage = 0; $yp = 0;
 
                 // New page
                 $pdf->AddPage();
                 $pagenb++;
                 $this->Header($pdf, $pagenb, $pages, $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);
 			}
 		}
 	}
@@ -373,22 +373,22 @@ 
 	 *      @param	int			$hidefreetext		1=Hide free text
 	 *      @return	void
 	 */
-	function _pagefoot(&$pdf,$object,$outputlangs,$hidefreetext=0)
+	function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
 	{
 		global $conf;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		$showdetails=$conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
 
 		// Line of free text
-		$newfreetext='';
-		$paramfreetext='BANK_CHEQUERECEIPT_FREE_TEXT';
-		if (! empty($conf->global->$paramfreetext))
+		$newfreetext = '';
+		$paramfreetext = 'BANK_CHEQUERECEIPT_FREE_TEXT';
+		if (!empty($conf->global->$paramfreetext))
 		{
-		    $newfreetext=make_substitutions($conf->global->$paramfreetext,$substitutionarray);
+		    $newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
 		}
 		
-		return pdf_pagefoot($pdf,$outputlangs,$newfreetext,$this->emetteur,$this->marge_basse,$this->marge_gauche,$this->page_hauteur,$object,$showdetails,$hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, $newfreetext, $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
 	}
 }
 

Braces +19 added lines, -7 removed lines

@@ -66,7 +66,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->line_height = 5;
@@ -87,10 +90,14 @@ 
 	{
 		global $user,$conf,$langs,$hookmanager;
 
-        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
         $sav_charset_output=$outputlangs->charset_output;
-        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';
+        }
 
 		$outputlangs->load("main");
 		$outputlangs->load("companies");
@@ -147,7 +154,9 @@ 
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->transnoentities("CheckReceipt")." ".$number);
-		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
 
@@ -173,7 +182,9 @@ 
 
 		// Pied de page
 		$this->_pagefoot($pdf,'',$outputlangs);
-		if (method_exists($pdf,'AliasNbPages')) $pdf->AliasNbPages();
+		if (method_exists($pdf,'AliasNbPages')) {
+			$pdf->AliasNbPages();
+		}
 
 		$pdf->Close();
 
@@ -190,8 +201,9 @@ 
 		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);
 		

htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php

Doc Comments +1 added lines, -1 removed lines

@@ -125,7 +125,7 @@
 	 * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
-	 * @param  	Object	    $object		Object invoice
+	 * @param  	string	    $object		Object invoice
      * @param	string		$mode       'next' for next value or 'last' for last value
      * @return 	string      			Value if OK, 0 if KO
 	 */

Indentation +48 added lines, -48 removed lines

@@ -41,14 +41,14 @@ 
 	var $nom = 'Tulip';
 
 
-    /**
-     *  Returns the description of the model numbering
-     *
-     * 	@return     string      Description Text
-     */
+	/**
+	 *  Returns the description of the model numbering
+	 *
+	 * 	@return     string      Description Text
+	 */
 	function info()
-    {
-    	global $conf,$langs;
+	{
+		global $conf,$langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -60,8 +60,8 @@ 
 		$texte.= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 		$texte.= '<input type="hidden" name="action" value="updateMask">';
 		$texte.= '<input type="hidden" name="maskconstinvoice" value="SUPPLIER_INVOICE_TULIP_MASK">';
-        $texte.= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
-        $texte.= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
+		$texte.= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
+		$texte.= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
 		$texte.= '<input type="hidden" name="maskconstdeposit" value="SUPPLIER_DEPOSIT_TULIP_MASK">';
 		$texte.= '<table class="nobordernopadding" width="100%">';
 
@@ -83,40 +83,40 @@ 
 
 		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
 		{
-    		// Parametrage du prefix des replacement
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
-
-    		// Parametrage du prefix des avoirs
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
-
-    		// Parametrage du prefix des acomptes
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
+			// Parametrage du prefix des replacement
+			$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+			$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+			$texte.= '</tr>';
+
+			// Parametrage du prefix des avoirs
+			$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+			$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+			$texte.= '</tr>';
+
+			// Parametrage du prefix des acomptes
+			$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+			$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+			$texte.= '</tr>';
 		}
 
 		$texte.= '</table>';
 		$texte.= '</form>';
 
 		return $texte;
-    }
-
-    /**
-     *  Returns a numbering example
-     *
-     *  @return     string     Example
-     */
-    function getExample()
-    {
-    	global $conf,$langs,$mysoc;
-
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
+	}
+
+	/**
+	 *  Returns a numbering example
+	 *
+	 *  @return     string     Example
+	 */
+	function getExample()
+	{
+		global $conf,$langs,$mysoc;
+
+		$old_code_client=$mysoc->code_client;
+		$mysoc->code_client='CCCCCCCCCC';
+		$numExample = $this->getNextValue($mysoc,'');
 		$mysoc->code_client=$old_code_client;
 
 		if (! $numExample)
@@ -124,18 +124,18 @@ 
 			$numExample = $langs->trans('NotConfigured');
 		}
 		return $numExample;
-    }
+	}
 
 	/**
 	 * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
 	 * @param  	Object	    $object		Object invoice
-     * @param	string		$mode       'next' for next value or 'last' for last value
-     * @return 	string      			Value if OK, 0 if KO
+	 * @param	string		$mode       'next' for next value or 'last' for last value
+	 * @return 	string      			Value if OK, 0 if KO
 	 */
-    function getNextValue($objsoc,$object,$mode='next')
-    {
+	function getNextValue($objsoc,$object,$mode='next')
+	{
 		global $db,$conf;
 
 		require_once DOL_DOCUMENT_ROOT .'/core/lib/functions2.lib.php';
@@ -165,14 +165,14 @@ 
 		return  $numFinal;
 	}
 
-    /**
+	/**
 	 * Return next free value
 	 *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
 	function getNumRef($objsoc,$objforref,$mode='next')
 	{
 		return $this->getNextValue($objsoc,$objforref,$mode);

Spacing +53 added lines, -53 removed lines

@@ -27,7 +27,7 @@ 
  *	\brief      File containing the Tulip Class of numbering models of suppliers invoices references
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 
 
 /**
@@ -36,7 +36,7 @@ 
 */
 class mod_facture_fournisseur_tulip extends ModeleNumRefSuppliersInvoices
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Tulip';
 
@@ -48,7 +48,7 @@ 
      */
 	function info()
     {
-    	global $conf,$langs;
+    	global $conf, $langs;
 
 		$langs->load("bills");
 		$langs->load("admin");
@@ -56,51 +56,51 @@ 
 		$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="maskconstinvoice" value="SUPPLIER_INVOICE_TULIP_MASK">';
-        $texte.= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
-        $texte.= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
-		$texte.= '<input type="hidden" name="maskconstdeposit" value="SUPPLIER_DEPOSIT_TULIP_MASK">';
-		$texte.= '<table class="nobordernopadding" width="100%">';
-
-		$tooltip=$langs->trans("GenericMaskCodes",$langs->transnoentities("Invoice"),$langs->transnoentities("Invoice"));
-		$tooltip.=$langs->trans("GenericMaskCodes2");
-		$tooltip.=$langs->trans("GenericMaskCodes3");
-		$tooltip.=$langs->trans("GenericMaskCodes4a",$langs->transnoentities("Invoice"),$langs->transnoentities("Invoice"));
-		$tooltip.=$langs->trans("GenericMaskCodes5");
+		$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="maskconstinvoice" value="SUPPLIER_INVOICE_TULIP_MASK">';
+        $texte .= '<input type="hidden" name="maskconstreplacement" value="SUPPLIER_REPLACEMENT_TULIP_MASK">';
+        $texte .= '<input type="hidden" name="maskconstcredit" value="SUPPLIER_CREDIT_TULIP_MASK">';
+		$texte .= '<input type="hidden" name="maskconstdeposit" value="SUPPLIER_DEPOSIT_TULIP_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Invoice"), $langs->transnoentities("Invoice"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		// Parametrage du prefix
-		$texte.= '<tr><td>'.$langs->trans("Mask");
+		$texte .= '<tr><td>'.$langs->trans("Mask");
 		//$texte.= ' ('.$langs->trans("InvoiceStandard").')';
-		$texte.= ':</td>';
-		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_MASK.'">',$tooltip,1,1).'</td>';
+		$texte .= ':</td>';
+		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskinvoice" value="'.$conf->global->SUPPLIER_INVOICE_TULIP_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 .= '<td align="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
-		$texte.= '</tr>';
+		$texte .= '</tr>';
 
 		if ($conf->global->MAIN_FEATURE_LEVEL >= 2)
 		{
     		// Parametrage du prefix des replacement
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
+    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceReplacement").'):</td>';
+    		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskreplacement" value="'.$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+    		$texte .= '</tr>';
 
     		// Parametrage du prefix des avoirs
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
+    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceAvoir").'):</td>';
+    		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskcredit" value="'.$conf->global->SUPPLIER_CREDIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+    		$texte .= '</tr>';
 
     		// Parametrage du prefix des acomptes
-    		$texte.= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
-    		$texte.= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">',$tooltip,1,1).'</td>';
-    		$texte.= '</tr>';
+    		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("InvoiceDeposit").'):</td>';
+    		$texte .= '<td align="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskdeposit" value="'.$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK.'">', $tooltip, 1, 1).'</td>';
+    		$texte .= '</tr>';
 		}
 
-		$texte.= '</table>';
-		$texte.= '</form>';
+		$texte .= '</table>';
+		$texte .= '</form>';
 
 		return $texte;
     }
@@ -112,14 +112,14 @@ 
      */
     function getExample()
     {
-    	global $conf,$langs,$mysoc;
+    	global $conf, $langs, $mysoc;
 
-    	$old_code_client=$mysoc->code_client;
-    	$mysoc->code_client='CCCCCCCCCC';
-    	$numExample = $this->getNextValue($mysoc,'');
-		$mysoc->code_client=$old_code_client;
+    	$old_code_client = $mysoc->code_client;
+    	$mysoc->code_client = 'CCCCCCCCCC';
+    	$numExample = $this->getNextValue($mysoc, '');
+		$mysoc->code_client = $old_code_client;
 
-		if (! $numExample)
+		if (!$numExample)
 		{
 			$numExample = $langs->trans('NotConfigured');
 		}
@@ -134,33 +134,33 @@ 
      * @param	string		$mode       'next' for next value or 'last' for last value
      * @return 	string      			Value if OK, 0 if KO
 	 */
-    function getNextValue($objsoc,$object,$mode='next')
+    function getNextValue($objsoc, $object, $mode = 'next')
     {
-		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';
 
 		// Get Mask value
 		$mask = '';
 		if (is_object($object) && $object->type == 1)
 		{
-			$mask=$conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
-			if (! $mask)
+			$mask = $conf->global->SUPPLIER_REPLACEMENT_TULIP_MASK;
+			if (!$mask)
 			{
-				$mask=$conf->global->SUPPLIER_INVOICE_TULIP_MASK;
+				$mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
 		}
-		else if (is_object($object) && $object->type == 2) $mask=$conf->global->SUPPLIER_CREDIT_TULIP_MASK;
-		else if (is_object($object) && $object->type == 3) $mask=$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
-		else $mask=$conf->global->SUPPLIER_INVOICE_TULIP_MASK;
-		if (! $mask)
+		else if (is_object($object) && $object->type == 2) $mask = $conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		else if (is_object($object) && $object->type == 3) $mask = $conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
+		else $mask = $conf->global->SUPPLIER_INVOICE_TULIP_MASK;
+		if (!$mask)
 		{
-			$this->error='NotConfigured';
+			$this->error = 'NotConfigured';
 			return 0;
 		}
 
 		// Supplier invoices take invoice date instead of creation date for the mask
-		$numFinal=get_next_value($db,$mask,'facture_fourn','ref','',$objsoc,$object->date);
+		$numFinal = get_next_value($db, $mask, 'facture_fourn', 'ref', '', $objsoc, $object->date);
 
 		return  $numFinal;
 	}
@@ -173,9 +173,9 @@ 
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
      */
-	function getNumRef($objsoc,$objforref,$mode='next')
+	function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
+		return $this->getNextValue($objsoc, $objforref, $mode);
 	}
 }
 

Braces +6 added lines, -3 removed lines

@@ -149,10 +149,13 @@
 			{
 				$mask=$conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 			}
+		} else if (is_object($object) && $object->type == 2) {
+			$mask=$conf->global->SUPPLIER_CREDIT_TULIP_MASK;
+		} else if (is_object($object) && $object->type == 3) {
+			$mask=$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
+		} else {
+			$mask=$conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 		}
-		else if (is_object($object) && $object->type == 2) $mask=$conf->global->SUPPLIER_CREDIT_TULIP_MASK;
-		else if (is_object($object) && $object->type == 3) $mask=$conf->global->SUPPLIER_DEPOSIT_TULIP_MASK;
-		else $mask=$conf->global->SUPPLIER_INVOICE_TULIP_MASK;
 		if (! $mask)
 		{
 			$this->error='NotConfigured';

htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_cactus.php

Doc Comments +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
 	/**
 	 * 	Tests if the numbers already in force in the database do not cause conflicts that would prevent this numbering.
 	 *
-	 *  @return     boolean     false if conflict, true if ok
+	 *  @return     false|null     false if conflict, true if ok
 	 */
 	function canBeActivated()
 	{
@@ -144,7 +144,7 @@ 
      * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
-	 * @param  	Object		$object		Object invoice
+	 * @param  	string		$object		Object invoice
      * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return 	string      			Value if OK, 0 if KO
      */

Braces +35 added lines, -16 removed lines

@@ -152,9 +152,13 @@ 
     {
         global $db,$conf;
 
-        if ($object->type == 2) $prefix=$this->prefixcreditnote;
-        else if ($facture->type == 3) $prefix=$this->prefixdeposit;
-        else $prefix=$this->prefixinvoice;
+        if ($object->type == 2) {
+        	$prefix=$this->prefixcreditnote;
+        } else if ($facture->type == 3) {
+        	$prefix=$this->prefixdeposit;
+        } else {
+        	$prefix=$this->prefixinvoice;
+        }
 
         // D'abord on recupere la valeur max
         $posindice=8;
@@ -168,18 +172,25 @@ 
         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
         {
         	return -1;
         }
 
         if ($mode == 'last')
         {
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) {
+    			$num=$max;
+    		}
+    		// If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else {
+    			$num = sprintf("%04s",$max);
+    		}
 
         	$ref='';
         	$sql = "SELECT ref as ref";
@@ -192,24 +203,32 @@ 
         	if ($resql)
         	{
         		$obj = $db->fetch_object($resql);
-        		if ($obj) $ref = $obj->ref;
+        		if ($obj) {
+        			$ref = $obj->ref;
+        		}
+        	} else {
+        		dol_print_error($db);
         	}
-        	else dol_print_error($db);
 
         	return $ref;
-        }
-        else if ($mode == 'next')
+        } else if ($mode == 'next')
         {
         	$date=$object->date;	// This is invoice date (not creation date)
         	$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(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
         	return $prefix.$yymm."-".$num;
+        } else {
+        	dol_print_error('','Bad parameter for getNextValue');
         }
-        else dol_print_error('','Bad parameter for getNextValue');
     }
 
 

Indentation +95 added lines, -95 removed lines

@@ -41,28 +41,28 @@ 
 	var $prefixdeposit='SD';
 
 
-    /**
-     * 	Return description of numbering model
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
+	/**
+	 * 	Return description of numbering model
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
 		$langs->load("bills");
-      	return $langs->trans("CactusNumRefModelDesc1",$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
-    }
+	  	return $langs->trans("CactusNumRefModelDesc1",$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
+	}
 
 
-    /**
-     * 	Returns a numbering example
-     *
-     *  @return     string      Example
-     */
-    function getExample()
-    {
-        return $this->prefixinvoice."1301-0001";
-    }
+	/**
+	 * 	Returns a numbering example
+	 *
+	 *  @return     string      Example
+	 */
+	function getExample()
+	{
+		return $this->prefixinvoice."1301-0001";
+	}
 
 
 	/**
@@ -138,89 +138,89 @@ 
 			$this->error=$langs->trans('ErrorNumRefModel',$max);
 			return false;
 		}
-    }
+	}
 
-    /**
-     * Return next value
+	/**
+	 * Return next value
 	 *
 	 * @param	Societe		$objsoc     Object third party
 	 * @param  	Object		$object		Object invoice
-     * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return 	string      			Value if OK, 0 if KO
-     */
-    function getNextValue($objsoc,$object,$mode='next')
-    {
-        global $db,$conf;
-
-        if ($object->type == 2) $prefix=$this->prefixcreditnote;
-        else if ($facture->type == 3) $prefix=$this->prefixdeposit;
-        else $prefix=$this->prefixinvoice;
-
-        // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
-
-        $resql=$db->query($sql);
-        dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        if ($resql)
-        {
-        	$obj = $db->fetch_object($resql);
-        	if ($obj) $max = intval($obj->max);
-        	else $max=0;
-        }
-        else
-        {
-        	return -1;
-        }
-
-        if ($mode == 'last')
-        {
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
-
-        	$ref='';
-        	$sql = "SELECT ref as ref";
-        	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
-        	$sql.= " AND entity = ".$conf->entity;
-
-        	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        	$resql=$db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $db->fetch_object($resql);
-        		if ($obj) $ref = $obj->ref;
-        	}
-        	else dol_print_error($db);
-
-        	return $ref;
-        }
-        else if ($mode == 'next')
-        {
-        	$date=$object->date;	// This is invoice date (not creation date)
-        	$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(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
-        	return $prefix.$yymm."-".$num;
-        }
-        else dol_print_error('','Bad parameter for getNextValue');
-    }
-
-
-    /**
+	 */
+	function getNextValue($objsoc,$object,$mode='next')
+	{
+		global $db,$conf;
+
+		if ($object->type == 2) $prefix=$this->prefixcreditnote;
+		else if ($facture->type == 3) $prefix=$this->prefixdeposit;
+		else $prefix=$this->prefixinvoice;
+
+		// D'abord on recupere la valeur max
+		$posindice=8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql.= " WHERE ref LIKE '".$prefix."____-%'";
+		$sql.= " AND entity = ".$conf->entity;
+
+		$resql=$db->query($sql);
+		dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+		if ($resql)
+		{
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max=0;
+		}
+		else
+		{
+			return -1;
+		}
+
+		if ($mode == 'last')
+		{
+			if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
+			else $num = sprintf("%04s",$max);
+
+			$ref='';
+			$sql = "SELECT ref as ref";
+			$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+			$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
+			$sql.= " AND entity = ".$conf->entity;
+
+			dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
+			$resql=$db->query($sql);
+			if ($resql)
+			{
+				$obj = $db->fetch_object($resql);
+				if ($obj) $ref = $obj->ref;
+			}
+			else dol_print_error($db);
+
+			return $ref;
+		}
+		else if ($mode == 'next')
+		{
+			$date=$object->date;	// This is invoice date (not creation date)
+			$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(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
+			return $prefix.$yymm."-".$num;
+		}
+		else dol_print_error('','Bad parameter for getNextValue');
+	}
+
+
+	/**
 	 * Return next free value
 	 *
-     * @param	Societe		$objsoc     	Object third party
-     * @param	string		$objforref		Object for number to search
-     * @param   string		$mode       	'next' for next value or 'last' for last value
-     * @return  string      				Next free value
-     */
+	 * @param	Societe		$objsoc     	Object third party
+	 * @param	string		$objforref		Object for number to search
+	 * @param   string		$mode       	'next' for next value or 'last' for last value
+	 * @return  string      				Next free value
+	 */
 	function getNumRef($objsoc,$objforref,$mode='next')
 	{
 		return $this->getNextValue($objsoc,$objforref,$mode);

Spacing +62 added lines, -62 removed lines

@@ -25,7 +25,7 @@ 
  *		\brief      File containing class for the numbering module Cactus
  */
 
-require_once DOL_DOCUMENT_ROOT .'/core/modules/supplier_invoice/modules_facturefournisseur.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 
 
 /**
@@ -33,12 +33,12 @@ 
  */
 class mod_facture_fournisseur_cactus extends ModeleNumRefSuppliersInvoices
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
 	var $error = '';
 	var $nom = 'Cactus';
-	var $prefixinvoice='SI';
-	var $prefixcreditnote='SA';
-	var $prefixdeposit='SD';
+	var $prefixinvoice = 'SI';
+	var $prefixcreditnote = 'SA';
+	var $prefixdeposit = 'SD';
 
 
     /**
@@ -50,7 +50,7 @@ 
     {
     	global $langs;
 		$langs->load("bills");
-      	return $langs->trans("CactusNumRefModelDesc1",$this->prefixinvoice,$this->prefixcreditnote,$this->prefixdeposit);
+      	return $langs->trans("CactusNumRefModelDesc1", $this->prefixinvoice, $this->prefixcreditnote, $this->prefixdeposit);
     }
 
 
@@ -72,70 +72,70 @@ 
 	 */
 	function canBeActivated()
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 
 		$langs->load("bills");
 
 		// Check invoice num
-		$siyymm=''; $max='';
+		$siyymm = ''; $max = '';
 
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
-		$resql=$db->query($sql);
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixinvoice)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($siyymm && ! preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i',$siyymm))
+		if ($siyymm && !preg_match('/'.$this->prefixinvoice.'[0-9][0-9][0-9][0-9]/i', $siyymm))
 		{
 			$langs->load("errors");
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
 		// Check credit note num
-		$siyymm='';
+		$siyymm = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixcreditnote)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($siyymm && ! preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i',$siyymm))
+		if ($siyymm && !preg_match('/'.$this->prefixcreditnote.'[0-9][0-9][0-9][0-9]/i', $siyymm))
 		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
 
 		// Check deposit num
-		$siyymm='';
+		$siyymm = '';
 
-		$posindice=8;
-		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$posindice = 8;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefixdeposit)."____-%'";
+		$sql .= " AND entity = ".$conf->entity;
 
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			$row = $db->fetch_row($resql);
-			if ($row) { $siyymm = substr($row[0],0,6); $max=$row[0]; }
+			if ($row) { $siyymm = substr($row[0], 0, 6); $max = $row[0]; }
 		}
-		if ($siyymm && ! preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i',$siyymm))
+		if ($siyymm && !preg_match('/'.$this->prefixdeposit.'[0-9][0-9][0-9][0-9]/i', $siyymm))
 		{
-			$this->error=$langs->trans('ErrorNumRefModel',$max);
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
 			return false;
 		}
     }
@@ -148,28 +148,28 @@ 
      * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return 	string      			Value if OK, 0 if KO
      */
-    function getNextValue($objsoc,$object,$mode='next')
+    function getNextValue($objsoc, $object, $mode = 'next')
     {
-        global $db,$conf;
+        global $db, $conf;
 
-        if ($object->type == 2) $prefix=$this->prefixcreditnote;
-        else if ($facture->type == 3) $prefix=$this->prefixdeposit;
-        else $prefix=$this->prefixinvoice;
+        if ($object->type == 2) $prefix = $this->prefixcreditnote;
+        else if ($facture->type == 3) $prefix = $this->prefixdeposit;
+        else $prefix = $this->prefixinvoice;
 
         // D'abord on recupere la valeur max
-        $posindice=8;
-        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";	// This is standard SQL
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        $sql.= " WHERE ref LIKE '".$prefix."____-%'";
-        $sql.= " AND entity = ".$conf->entity;
+        $posindice = 8;
+        $sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max"; // This is standard SQL
+        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+        $sql .= " WHERE ref LIKE '".$prefix."____-%'";
+        $sql .= " AND entity = ".$conf->entity;
 
-        $resql=$db->query($sql);
+        $resql = $db->query($sql);
         dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
         if ($resql)
         {
         	$obj = $db->fetch_object($resql);
         	if ($obj) $max = intval($obj->max);
-        	else $max=0;
+        	else $max = 0;
         }
         else
         {
@@ -178,17 +178,17 @@ 
 
         if ($mode == 'last')
         {
-    		if ($max >= (pow(10, 4) - 1)) $num=$max;	// If counter > 9999, we do not format on 4 chars, we take number as it is
-    		else $num = sprintf("%04s",$max);
+    		if ($max >= (pow(10, 4) - 1)) $num = $max; // If counter > 9999, we do not format on 4 chars, we take number as it is
+    		else $num = sprintf("%04s", $max);
 
-        	$ref='';
+        	$ref = '';
         	$sql = "SELECT ref as ref";
-        	$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn";
-        	$sql.= " WHERE ref LIKE '".$prefix."____-".$num."'";
-        	$sql.= " AND entity = ".$conf->entity;
+        	$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn";
+        	$sql .= " WHERE ref LIKE '".$prefix."____-".$num."'";
+        	$sql .= " AND entity = ".$conf->entity;
 
         	dol_syslog(get_class($this)."::getNextValue", LOG_DEBUG);
-        	$resql=$db->query($sql);
+        	$resql = $db->query($sql);
         	if ($resql)
         	{
         		$obj = $db->fetch_object($resql);
@@ -200,16 +200,16 @@ 
         }
         else if ($mode == 'next')
         {
-        	$date=$object->date;	// This is invoice date (not creation date)
-        	$yymm = strftime("%y%m",$date);
+        	$date = $object->date; // This is invoice date (not creation date)
+        	$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(get_class($this)."::getNextValue return ".$prefix.$yymm."-".$num);
         	return $prefix.$yymm."-".$num;
         }
-        else dol_print_error('','Bad parameter for getNextValue');
+        else dol_print_error('', 'Bad parameter for getNextValue');
     }
 
 
@@ -221,9 +221,9 @@ 
      * @param   string		$mode       	'next' for next value or 'last' for last value
      * @return  string      				Next free value
      */
-	function getNumRef($objsoc,$objforref,$mode='next')
+	function getNumRef($objsoc, $objforref, $mode = 'next')
 	{
-		return $this->getNextValue($objsoc,$objforref,$mode);
+		return $this->getNextValue($objsoc, $objforref, $mode);
 	}
 }
 

htdocs/expedition/class/expedition.class.php

Doc Comments +4 added lines, -4 removed lines

@@ -365,7 +365,7 @@ 
 	 * @param 	int		$entrepot_id		Id of warehouse
 	 * @param 	int		$origin_line_id		Id of source line
 	 * @param 	int		$qty				Quantity
-	 * @param	array	$array_options		extrafields array
+	 * @param	integer	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
 	function create_line($entrepot_id, $origin_line_id, $qty,$array_options=0)
@@ -419,7 +419,7 @@ 
 	 * Create the detail (eat-by date) of the expedition line
 	 *
 	 * @param 	object		$line_ext		full line informations
-	 * @param	array		$array_options		extrafields array
+	 * @param	integer		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function create_line_batch($line_ext,$array_options=0)
@@ -857,7 +857,7 @@ 
 	 * @param 	int		$entrepot_id		Id of warehouse
 	 * @param 	int		$id					Id of source line (order line)
 	 * @param 	int		$qty				Quantity
-	 * @param	array	$array_options		extrafields array
+	 * @param	integer	$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
 	function addline($entrepot_id, $id, $qty,$array_options=0)
@@ -927,7 +927,7 @@ 
 	 * Add a shipment line with batch record
 	 *
 	 * @param 	array		$dbatch		Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index)
-	 * @param	array		$array_options		extrafields array
+	 * @param	integer		$array_options		extrafields array
 	 * @return	int						<0 if KO, >0 if OK
 	 */
 	function addline_batch($dbatch,$array_options=0)

Indentation +300 added lines, -300 removed lines

@@ -48,7 +48,7 @@ 
 	public $table_element="expedition";
 	public $table_element_line="expeditiondet";
 	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-    public $picto = 'sending';
+	public $picto = 'sending';
 
 	var $socid;
 	var $ref_customer;
@@ -131,29 +131,29 @@ 
 		global $langs, $conf;
 		$langs->load("sendings");
 
-	    if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
-        {
+		if (!empty($conf->global->EXPEDITION_ADDON_NUMBER))
+		{
 			$mybool = false;
 
 			$file = $conf->global->EXPEDITION_ADDON_NUMBER.".php";
 			$classname = $conf->global->EXPEDITION_ADDON_NUMBER;
 
-	        // Include file with class
-	        $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-	        foreach ($dirmodels as $reldir) {
+			foreach ($dirmodels as $reldir) {
 
-		        $dir = dol_buildpath($reldir."core/modules/expedition/");
+				$dir = dol_buildpath($reldir."core/modules/expedition/");
 
-		        // Load file with numbering class (if found)
-		        $mybool|=@include_once $dir.$file;
-	        }
+				// Load file with numbering class (if found)
+				$mybool|=@include_once $dir.$file;
+			}
 
-	        if (! $mybool)
-	        {
-		        dol_print_error('',"Failed to include file ".$file);
-		        return '';
-	        }
+			if (! $mybool)
+			{
+				dol_print_error('',"Failed to include file ".$file);
+				return '';
+			}
 
 			$obj = new $classname();
 			$numref = "";
@@ -168,19 +168,19 @@ 
 				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else
-	    {
-		    print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
-		    return "";
-	    }
+		}
+		else
+		{
+			print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
+			return "";
+		}
 	}
 
 	/**
 	 *  Create expedition en base
 	 *
 	 *  @param	User	$user       Objet du user qui cree
-   * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
+	 * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id expedition creee si ok
 	 */
 	function create($user, $notrigger=0)
@@ -249,8 +249,8 @@ 
 		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
 		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
 		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql.= ", ".(int) $this->fk_incoterms;
+		$sql.= ", '".$this->db->escape($this->location_incoterms)."'";
 		$sql.= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -315,10 +315,10 @@ 
 
 				if (! $error && ! $notrigger)
 				{
-                    // Call trigger
-                    $result=$this->call_trigger('SHIPPING_CREATE',$user);
-                    if ($result < 0) { $error++; }
-                    // End call triggers
+					// Call trigger
+					$result=$this->call_trigger('SHIPPING_CREATE',$user);
+					if ($result < 0) { $error++; }
+					// End call triggers
 
 					if (! $error)
 					{
@@ -393,7 +393,7 @@ 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-		    $line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
+			$line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
 		}
 		else
 		{
@@ -471,7 +471,7 @@ 
 	 *	@param	int		$id       	Id of object to load
 	 * 	@param	string	$ref		Ref of object
 	 * 	@param	string	$ref_ext	External reference of object
-     * 	@param	string	$ref_int	Internal reference of other object
+	 * 	@param	string	$ref_int	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
 	function fetch($id, $ref='', $ref_ext='', $ref_int='')
@@ -487,16 +487,16 @@ 
 		$sql.= ", e.fk_shipping_method, e.tracking_number";
 		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
 		$sql.= ", e.note_private, e.note_public";
-        $sql.= ', e.fk_incoterms, e.location_incoterms';
-        $sql.= ', i.libelle as libelle_incoterms';
+		$sql.= ', e.fk_incoterms, e.location_incoterms';
+		$sql.= ', i.libelle as libelle_incoterms';
 		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
 		if ($id)   	  $sql.= " AND e.rowid=".$id;
-        if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
+		if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+		if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -600,14 +600,14 @@ 
 	 *  Validate object and update stock if option enabled
 	 *
 	 *  @param      User		$user       Object user that validate
-     *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
+	 *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
 	function valid($user, $notrigger=0)
 	{
 		global $conf, $langs;
 
-        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		dol_syslog(get_class($this)."::valid");
 
@@ -618,8 +618,8 @@ 
 			return 0;
 		}
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate))))
+		if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
+	   	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate))))
 		{
 			$this->error='Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
@@ -646,7 +646,7 @@ 
 		{
 			$numref = "EXP".$this->id;
 		}
-        $this->newref = $numref;
+		$this->newref = $numref;
 
 		$now=dol_now();
 
@@ -725,7 +725,7 @@ 
 						// line with batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
+						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
 						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 						if ($result < 0) {
 							$error++;
@@ -748,22 +748,22 @@ 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
 
-        if (! $ret)
+		if (! $ret)
 		{
-		    $error++;
+			$error++;
 		}
 
 		if (! $error && ! $notrigger)
 		{
-            // Call trigger
-            $result=$this->call_trigger('SHIPPING_VALIDATE',$user);
-            if ($result < 0) { $error++; }
-            // End call triggers
+			// Call trigger
+			$result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+			if ($result < 0) { $error++; }
+			// End call triggers
 		}
 
 		if (! $error)
 		{
-            $this->oldref = $this->ref;
+			$this->oldref = $this->ref;
 
 			// Rename directory if dir was a temporary ref
 			if (preg_match('/^[\(]?PROV/i', $this->ref))
@@ -780,17 +780,17 @@ 
 
 					if (@rename($dirsource, $dirdest))
 					{
-					    dol_syslog("Rename ok");
-                        // Rename docs starting with $oldref with $newref
-                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-                        foreach($listoffiles as $fileentry)
-                        {
-                        	$dirsource=$fileentry['name'];
-                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-                        	$dirdest=$fileentry['path'].'/'.$dirdest;
-                        	@rename($dirsource, $dirdest);
-                        }
+						dol_syslog("Rename ok");
+						// Rename docs starting with $oldref with $newref
+						$listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
+						foreach($listoffiles as $fileentry)
+						{
+							$dirsource=$fileentry['name'];
+							$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
+							$dirsource=$fileentry['path'].'/'.$dirsource;
+							$dirdest=$fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
 					}
 				}
 			}
@@ -812,8 +812,8 @@ 
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -885,14 +885,14 @@ 
 
 			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
 			{
-			    $langs->load("errors");
+				$langs->load("errors");
 				$this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
 			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 			{
-			    // Check must be done for stock of product into warehouse if $entrepot_id defined
+				// Check must be done for stock of product into warehouse if $entrepot_id defined
 				$product=new Product($this->db);
 				$result=$product->fetch($fk_product);
 
@@ -906,8 +906,8 @@ 
 				$product_type=$product->type;
 				if ($product_type == 0 && $product_stock < $qty)
 				{
-                    $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+					$langs->load("errors");
+					$this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -917,8 +917,8 @@ 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
 		if (! empty($conf->productbatch->enabled) && ! empty($orderline->fk_product) && ! empty($orderline->product_tobatch))
 		{
-		    $this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
-		    return -4;
+			$this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
+			return -4;
 		}
 
 		// extrafields
@@ -928,7 +928,7 @@ 
 		$this->lines[$num] = $line;
 	}
 
-    /**
+	/**
 	 * Add a shipment line with batch record
 	 *
 	 * @param 	array		$dbatch		Array of value (key 'detail' -> Array, key 'qty' total quantity for line, key ix_l : original line index)
@@ -952,7 +952,7 @@ 
 					// $value['id_batch']=id into llx_product_batch of record to move
 					//var_dump($value);
 
-				    $linebatch = new ExpeditionLineBatch($this->db);
+					$linebatch = new ExpeditionLineBatch($this->db);
 					$ret=$linebatch->fetchFromStock($value['id_batch']);	// load serial, sellby, eatby
 					if ($ret<0)
 					{
@@ -970,8 +970,8 @@ 
 
 						if ($prod_batch->qty < $linebatch->dluo_qty)
 						{
-                            $langs->load("errors");
-        				    $this->errors[]=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
+							$langs->load("errors");
+							$this->errors[]=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
 							dol_syslog(get_class($this)."::addline_batch error=Product ".$prod_batch->batch.": ".$this->errorsToString(), LOG_ERR);
 							$this->db->rollback();
 							return -1;
@@ -996,16 +996,16 @@ 
 		}
 	}
 
-    /**
-     *  Update database
-     *
-     *  @param	User	$user        	User that modify
-     *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
-     *  @return int 			       	<0 if KO, >0 if OK
-     */
-    function update($user=null, $notrigger=0)
-    {
-    	global $conf;
+	/**
+	 *  Update database
+	 *
+	 *  @param	User	$user        	User that modify
+	 *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
+	 *  @return int 			       	<0 if KO, >0 if OK
+	 */
+	function update($user=null, $notrigger=0)
+	{
+		global $conf;
 		$error=0;
 
 		// Clean parameters
@@ -1035,8 +1035,8 @@ 
 		// Check parameters
 		// Put here code to add control on parameters values
 
-        // Update request
-        $sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
+		// Update request
+		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 
 		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
 		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
@@ -1063,32 +1063,32 @@ 
 		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
 		$sql.= " entity=".$conf->entity;
 
-        $sql.= " WHERE rowid=".$this->id;
+		$sql.= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		$resql = $this->db->query($sql);
+		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
 
 		if (! $error)
 		{
 			if (! $notrigger)
 			{
-                // Call trigger
-                $result=$this->call_trigger('SHIPPING_MODIFY',$user);
-                if ($result < 0) { $error++; }
-                // End call triggers
-	    	}
+				// Call trigger
+				$result=$this->call_trigger('SHIPPING_MODIFY',$user);
+				if ($result < 0) { $error++; }
+				// End call triggers
+			}
 		}
 
-        // Commit or rollback
+		// Commit or rollback
 		if ($error)
 		{
 			foreach($this->errors as $errmsg)
 			{
-	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error.=($this->error?', '.$errmsg:$errmsg);
 			}
 			$this->db->rollback();
 			return -1*$error;
@@ -1098,7 +1098,7 @@ 
 			$this->db->commit();
 			return 1;
 		}
-    }
+	}
 
 	/**
 	 * 	Delete shipment.
@@ -1231,18 +1231,18 @@ 
 
 						if (! empty($this->origin) && $this->origin_id > 0)
 						{
-						    $this->fetch_origin();
-						    $origin=$this->origin;
-						    if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
-						    {
-                                // Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
-						        $this->$origin->loadExpeditions();
-						        //var_dump($this->$origin->expeditions);exit;
-						        if (count($this->$origin->expeditions) <= 0)
-						        {
-                                    $this->$origin->setStatut(Commande::STATUS_VALIDATED);
-						        }
-						    }
+							$this->fetch_origin();
+							$origin=$this->origin;
+							if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
+							{
+								// Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
+								$this->$origin->loadExpeditions();
+								//var_dump($this->$origin->expeditions);exit;
+								if (count($this->$origin->expeditions) <= 0)
+								{
+									$this->$origin->setStatut(Commande::STATUS_VALIDATED);
+								}
+							}
 						}
 
 						if (! $error)
@@ -1354,13 +1354,13 @@ 
 			{
 				$obj = $this->db->fetch_object($resql);
 
-			    if ($originline == $obj->fk_origin_line) {
-			        $line->entrepot_id       = 0; // entrepod_id in details_entrepot
-				    $line->qty_shipped    	+= $obj->qty_shipped;
+				if ($originline == $obj->fk_origin_line) {
+					$line->entrepot_id       = 0; // entrepod_id in details_entrepot
+					$line->qty_shipped    	+= $obj->qty_shipped;
 				} else {
-				    $line = new ExpeditionLigne($this->db);
-				    $line->entrepot_id    	= $obj->fk_entrepot;
-				    $line->qty_shipped    	= $obj->qty_shipped;
+					$line = new ExpeditionLigne($this->db);
+					$line->entrepot_id    	= $obj->fk_entrepot;
+					$line->qty_shipped    	= $obj->qty_shipped;
 				}
 
 				$detail_entrepot              = new stdClass;
@@ -1368,13 +1368,13 @@ 
 				$detail_entrepot->qty_shipped = $obj->qty_shipped;
 				$line->details_entrepot[]     = $detail_entrepot;
 
-                $line->line_id          = $obj->line_id;
-                $line->rowid            = $obj->line_id;    // TODO deprecated
-                $line->id               = $obj->line_id;
+				$line->line_id          = $obj->line_id;
+				$line->rowid            = $obj->line_id;    // TODO deprecated
+				$line->id               = $obj->line_id;
 
-                $line->fk_origin     	= 'orderline';
-                $line->fk_origin_line 	= $obj->fk_origin_line;
-                $line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+				$line->fk_origin     	= 'orderline';
+				$line->fk_origin_line 	= $obj->fk_origin_line;
+				$line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
 
 				$line->fk_expedition    = $this->id;                // id of parent
 
@@ -1382,8 +1382,8 @@ 
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
 				$line->ref				= $obj->product_ref;		// TODO deprecated
-                $line->product_ref		= $obj->product_ref;
-                $line->product_label	= $obj->product_label;
+				$line->product_ref		= $obj->product_ref;
+				$line->product_label	= $obj->product_label;
 				$line->libelle        	= $obj->product_label;		// TODO deprecated
 				$line->product_tobatch  = $obj->product_tobatch;
 				$line->label			= $obj->custom_label;
@@ -1440,34 +1440,34 @@ 
 				// Eat-by date
 				if (! empty($conf->productbatch->enabled) && $obj->line_id > 0)
 				{
-                    require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
-
-                    $newdetailbatch = ExpeditionLineBatch::fetchAll($this->db,$obj->line_id);
-                    if (is_array($newdetailbatch))
-                    {
-	                    if ($originline != $obj->fk_origin_line)
-	                    {
-	                        $line->detail_batch = $newdetailbatch;
-	                    }
-	                    else
+					require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+
+					$newdetailbatch = ExpeditionLineBatch::fetchAll($this->db,$obj->line_id);
+					if (is_array($newdetailbatch))
+					{
+						if ($originline != $obj->fk_origin_line)
+						{
+							$line->detail_batch = $newdetailbatch;
+						}
+						else
 						{
-	                        $line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
-	                    }
-                    }
+							$line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
+						}
+					}
 				}
 
 				if ($originline != $obj->fk_origin_line)
 				{
-				    $this->lines[$lineindex] = $line;
-				    $lineindex++;
+					$this->lines[$lineindex] = $line;
+					$lineindex++;
 				}
 				else
 				{
-				    $line->total_ht			+= $tabprice[0];
-				    $line->total_localtax1 	+= $tabprice[9];
-				    $line->total_localtax2 	+= $tabprice[10];
-				    $line->total_ttc	 	+= $tabprice[2];
-				    $line->total_tva	 	+= $tabprice[1];
+					$line->total_ht			+= $tabprice[0];
+					$line->total_localtax1 	+= $tabprice[9];
+					$line->total_localtax2 	+= $tabprice[10];
+					$line->total_ttc	 	+= $tabprice[2];
+					$line->total_tva	 	+= $tabprice[1];
 				}
 
 				$i++;
@@ -1484,24 +1484,24 @@ 
 	}
 
 	/**
-     *	Return clicable link of object (with eventually picto)
-     *
-     *	@param      int			$withpicto      			Add picto into link
-     *	@param      int			$option         			Where point the link
-     *	@param      int			$max          				Max length to show
-     *	@param      int			$short						Use short labels
-     *  @param      int         $notooltip      			1=No tooltip
-     *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-     *	@return     string          						String with URL
-     */
+	 *	Return clicable link of object (with eventually picto)
+	 *
+	 *	@param      int			$withpicto      			Add picto into link
+	 *	@param      int			$option         			Where point the link
+	 *	@param      int			$max          				Max length to show
+	 *	@param      int			$short						Use short labels
+	 *  @param      int         $notooltip      			1=No tooltip
+	 *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *	@return     string          						String with URL
+	 */
 	function getNomUrl($withpicto=0, $option=0, $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
 	{
 		global $langs;
 
 		$result='';
-        $label = '<u>' . $langs->trans("ShowSending") . '</u>';
-        $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
-        $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
+		$label = '<u>' . $langs->trans("ShowSending") . '</u>';
+		$label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+		$label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
@@ -1518,16 +1518,16 @@ 
 		$linkclose='';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
-		    {
-		        $label=$langs->trans("ShowSending");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
-		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+			if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+			{
+				$label=$langs->trans("ShowSending");
+				$linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose.=' class="classfortooltip"';
 		}
 
-        $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
 		$linkend='</a>';
 
 		$picto='sending';
@@ -1539,11 +1539,11 @@ 
 	}
 
 	/**
-     *	Return status label
-     *
-     *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
-     *	@return     string      		Libelle
-     */
+	 *	Return status label
+	 *
+	 *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
+	 *	@return     string      		Libelle
+	 */
 	function getLibStatut($mode=0)
 	{
 		return $this->LibStatut($this->statut,$mode);
@@ -1593,11 +1593,11 @@ 
 	}
 
 	/**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
 	 */
 	function initAsSpecimen()
 	{
@@ -1607,7 +1607,7 @@ 
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
-        // Load array of products prodids
+		// Load array of products prodids
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
@@ -1648,11 +1648,11 @@ 
 		$this->commande_id          = 0;
 		$this->commande             = $order;
 
-        $this->origin_id            = 1;
-        $this->origin               = 'commande';
+		$this->origin_id            = 1;
+		$this->origin               = 'commande';
 
-        $this->note_private			= 'Private note';
-        $this->note_public			= 'Public note';
+		$this->note_private			= 'Private note';
+		$this->note_public			= 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
@@ -1732,99 +1732,99 @@ 
 		}
 	}
 
-    /**
-     *  Fetch all deliveries method and return an array. Load array this->listmeths.
-     *
-     *  @param  id      $id     only this carrier, all if none
-     *  @return void
-     */
-    function list_delivery_methods($id='')
-    {
-        global $langs;
-
-        $this->listmeths = array();
-        $i=0;
-
-        $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id!='') $sql.= " WHERE em.rowid=".$id;
-
-        $resql = $this->db->query($sql);
-        if ($resql)
-        {
-            while ($obj = $this->db->fetch_object($resql))
-            {
-                $this->listmeths[$i]['rowid'] = $obj->rowid;
-                $this->listmeths[$i]['code'] = $obj->code;
-                $label=$langs->trans('SendingMethod'.$obj->code);
-                $this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
-                $this->listmeths[$i]['description'] = $obj->description;
-                $this->listmeths[$i]['tracking'] = $obj->tracking;
-                $this->listmeths[$i]['active'] = $obj->active;
-                $i++;
-            }
-        }
-    }
-
-    /**
-     *  Update/create delivery method.
-     *
-     *  @param	string      $id     id method to activate
-     *
-     *  @return void
-     */
-    function update_delivery_method($id='')
-    {
-        if ($id=='')
-        {
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-            $sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
-            $resql = $this->db->query($sql);
-        }
-        else
-        {
-            $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql.= " code='".$this->db->escape($this->update['code'])."'";
-            $sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-            $sql.= ",description='".$this->db->escape($this->update['description'])."'";
-            $sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-            $sql.= " WHERE rowid=".$id;
-            $resql = $this->db->query($sql);
-        }
-        if ($resql < 0) dol_print_error($this->db,'');
-    }
-
-    /**
-     *  Activate delivery method.
-     *
-     *  @param      id      $id     id method to activate
-     *
-     *  @return void
-     */
-    function activ_delivery_method($id)
-    {
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-        $sql.= ' WHERE rowid='.$id;
-
-        $resql = $this->db->query($sql);
-
-    }
-
-    /**
-     *  DesActivate delivery method.
-     *
-     *  @param      id      $id     id method to desactivate
-     *
-     *  @return void
-     */
-    function disable_delivery_method($id)
-    {
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-        $sql.= ' WHERE rowid='.$id;
-
-        $resql = $this->db->query($sql);
-
-    }
+	/**
+	 *  Fetch all deliveries method and return an array. Load array this->listmeths.
+	 *
+	 *  @param  id      $id     only this carrier, all if none
+	 *  @return void
+	 */
+	function list_delivery_methods($id='')
+	{
+		global $langs;
+
+		$this->listmeths = array();
+		$i=0;
+
+		$sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
+		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		if ($id!='') $sql.= " WHERE em.rowid=".$id;
+
+		$resql = $this->db->query($sql);
+		if ($resql)
+		{
+			while ($obj = $this->db->fetch_object($resql))
+			{
+				$this->listmeths[$i]['rowid'] = $obj->rowid;
+				$this->listmeths[$i]['code'] = $obj->code;
+				$label=$langs->trans('SendingMethod'.$obj->code);
+				$this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+				$this->listmeths[$i]['description'] = $obj->description;
+				$this->listmeths[$i]['tracking'] = $obj->tracking;
+				$this->listmeths[$i]['active'] = $obj->active;
+				$i++;
+			}
+		}
+	}
+
+	/**
+	 *  Update/create delivery method.
+	 *
+	 *  @param	string      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	function update_delivery_method($id='')
+	{
+		if ($id=='')
+		{
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
+			$sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+			$resql = $this->db->query($sql);
+		}
+		else
+		{
+			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
+			$sql.= " code='".$this->db->escape($this->update['code'])."'";
+			$sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+			$sql.= ",description='".$this->db->escape($this->update['description'])."'";
+			$sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+			$sql.= " WHERE rowid=".$id;
+			$resql = $this->db->query($sql);
+		}
+		if ($resql < 0) dol_print_error($this->db,'');
+	}
+
+	/**
+	 *  Activate delivery method.
+	 *
+	 *  @param      id      $id     id method to activate
+	 *
+	 *  @return void
+	 */
+	function activ_delivery_method($id)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
+		$sql.= ' WHERE rowid='.$id;
+
+		$resql = $this->db->query($sql);
+
+	}
+
+	/**
+	 *  DesActivate delivery method.
+	 *
+	 *  @param      id      $id     id method to desactivate
+	 *
+	 *  @return void
+	 */
+	function disable_delivery_method($id)
+	{
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
+		$sql.= ' WHERE rowid='.$id;
+
+		$resql = $this->db->query($sql);
+
+	}
 
 
 	/**
@@ -1959,8 +1959,8 @@ 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						}
@@ -1971,9 +1971,9 @@ 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -1988,27 +1988,27 @@ 
 			// Call trigger
 			if (! $error)
 			{
-    			$result=$this->call_trigger('SHIPPING_CLOSED',$user);
-    			if ($result < 0) {
-    			    $error++;
-    			}
+				$result=$this->call_trigger('SHIPPING_CLOSED',$user);
+				if ($result < 0) {
+					$error++;
+				}
 			}
 		}
 		else
 		{
 			dol_print_error($this->db);
-            $error++;
+			$error++;
 		}
 
 		if (! $error)
 		{
-		    $this->db->commit();
-		    return 1;
+			$this->db->commit();
+			return 1;
 		}
 		else
 		{
-		    $this->db->rollback();
-		    return -1;
+			$this->db->rollback();
+			return -1;
 		}
 	}
 
@@ -2019,7 +2019,7 @@ 
 	 */
 	function set_billed()
 	{
-	    global $user;
+		global $user;
 		$error=0;
 
 		$this->db->begin();
@@ -2125,8 +2125,8 @@ 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref));
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
 								$error++; break;
 							}
 						}
@@ -2137,9 +2137,9 @@ 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
-							    $this->error = $mouvS->error;
-							    $this->errors = $mouvS->errors;
-							    $error++; break;
+								$this->error = $mouvS->error;
+								$this->errors = $mouvS->errors;
+								$error++; break;
 							}
 						}
 					}
@@ -2153,11 +2153,11 @@ 
 
 			if (! $error)
 			{
-    			// Call trigger
-    			$result=$this->call_trigger('SHIPPING_REOPEN',$user);
-    			if ($result < 0) {
-    				$error++;
-    			}
+				// Call trigger
+				$result=$this->call_trigger('SHIPPING_REOPEN',$user);
+				if ($result < 0) {
+					$error++;
+				}
    			}
 
 		} else {
@@ -2280,11 +2280,11 @@ 
 	 */
 	var $libelle;
 
-    /**
-     *	Constructor
-     *
-     *  @param		DoliDB		$db      Database handler
-     */
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
 	function __construct($db)
 	{
 		$this->db=$db;

Spacing +505 added lines, -505 removed lines

@@ -33,9 +33,9 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+if (!empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+if (!empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+if (!empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
 
 /**
@@ -43,11 +43,11 @@ 
  */
 class Expedition extends CommonObject
 {
-	public $element="shipping";
-	public $fk_element="fk_expedition";
-	public $table_element="expedition";
-	public $table_element_line="expeditiondet";
-	protected $ismultientitymanaged = 1;	// 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	public $element = "shipping";
+	public $fk_element = "fk_expedition";
+	public $table_element = "expedition";
+	public $table_element_line = "expeditiondet";
+	protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
     public $picto = 'sending';
 
 	var $socid;
@@ -55,7 +55,7 @@ 
 	var $ref_int;
 	var $brouillon;
 	var $entrepot_id;
-	var $lines=array();
+	var $lines = array();
 	var $tracking_number;
 	var $tracking_url;
 	var $billed;
@@ -72,7 +72,7 @@ 
 	// A denormalized value
 	var $trueSize;
 
-	var $date_delivery;		// Date delivery planed
+	var $date_delivery; // Date delivery planed
 	/**
 	 * @deprecated
 	 * @see date_shipping
@@ -92,7 +92,7 @@ 
 	var $date_valid;
 
 	var $meths;
-	var $listmeths;			// List of carriers
+	var $listmeths; // List of carriers
 
 
 	const STATUS_DRAFT = 0;
@@ -146,26 +146,26 @@ 
 		        $dir = dol_buildpath($reldir."core/modules/expedition/");
 
 		        // Load file with numbering class (if found)
-		        $mybool|=@include_once $dir.$file;
+		        $mybool |= @include_once $dir.$file;
 	        }
 
-	        if (! $mybool)
+	        if (!$mybool)
 	        {
-		        dol_print_error('',"Failed to include file ".$file);
+		        dol_print_error('', "Failed to include file ".$file);
 		        return '';
 	        }
 
 			$obj = new $classname();
 			$numref = "";
-			$numref = $obj->getNextValue($soc,$this);
+			$numref = $obj->getNextValue($soc, $this);
 
-			if ( $numref != "")
+			if ($numref != "")
 			{
 				return $numref;
 			}
 			else
 			{
-				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+				dol_print_error($this->db, get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
         }
@@ -183,13 +183,13 @@ 
    * 	@param		int		$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return int 				<0 si erreur, id expedition creee si ok
 	 */
-	function create($user, $notrigger=0)
+	function create($user, $notrigger = 0)
 	{
 		global $conf, $hookmanager;
 
-		$now=dol_now();
+		$now = dol_now();
 
-		require_once DOL_DOCUMENT_ROOT .'/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 		$error = 0;
 
 		// Clean parameters
@@ -203,90 +203,90 @@ 
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expedition (";
-		$sql.= "ref";
-		$sql.= ", entity";
-		$sql.= ", ref_customer";
-		$sql.= ", ref_int";
-		$sql.= ", date_creation";
-		$sql.= ", fk_user_author";
-		$sql.= ", date_expedition";
-		$sql.= ", date_delivery";
-		$sql.= ", fk_soc";
-		$sql.= ", fk_projet";
-		$sql.= ", fk_address";
-		$sql.= ", fk_shipping_method";
-		$sql.= ", tracking_number";
-		$sql.= ", weight";
-		$sql.= ", size";
-		$sql.= ", width";
-		$sql.= ", height";
-		$sql.= ", weight_units";
-		$sql.= ", size_units";
-		$sql.= ", note_private";
-		$sql.= ", note_public";
-		$sql.= ", model_pdf";
-		$sql.= ", fk_incoterms, location_incoterms";
-		$sql.= ") VALUES (";
-		$sql.= "'(PROV)'";
-		$sql.= ", ".$conf->entity;
-		$sql.= ", ".($this->ref_customer?"'".$this->db->escape($this->ref_customer)."'":"null");
-		$sql.= ", ".($this->ref_int?"'".$this->db->escape($this->ref_int)."'":"null");
-		$sql.= ", '".$this->db->idate($now)."'";
-		$sql.= ", ".$user->id;
-		$sql.= ", ".($this->date_expedition>0?"'".$this->db->idate($this->date_expedition)."'":"null");
-		$sql.= ", ".($this->date_delivery>0?"'".$this->db->idate($this->date_delivery)."'":"null");
-		$sql.= ", ".$this->socid;
-		$sql.= ", ".$this->fk_project;
-		$sql.= ", ".($this->fk_delivery_address>0?$this->fk_delivery_address:"null");
-		$sql.= ", ".($this->shipping_method_id>0?$this->shipping_method_id:"null");
-		$sql.= ", '".$this->db->escape($this->tracking_number)."'";
-		$sql.= ", ".$this->weight;
-		$sql.= ", ".$this->sizeS;	// TODO Should use this->trueDepth
-		$sql.= ", ".$this->sizeW;	// TODO Should use this->trueWidth
-		$sql.= ", ".$this->sizeH;	// TODO Should use this->trueHeight
-		$sql.= ", ".$this->weight_units;
-		$sql.= ", ".$this->size_units;
-		$sql.= ", ".(!empty($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null");
-		$sql.= ", ".(!empty($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null");
-		$sql.= ", ".(!empty($this->model_pdf)?"'".$this->db->escape($this->model_pdf)."'":"null");
-        $sql.= ", ".(int) $this->fk_incoterms;
-        $sql.= ", '".$this->db->escape($this->location_incoterms)."'";
-		$sql.= ")";
+		$sql .= "ref";
+		$sql .= ", entity";
+		$sql .= ", ref_customer";
+		$sql .= ", ref_int";
+		$sql .= ", date_creation";
+		$sql .= ", fk_user_author";
+		$sql .= ", date_expedition";
+		$sql .= ", date_delivery";
+		$sql .= ", fk_soc";
+		$sql .= ", fk_projet";
+		$sql .= ", fk_address";
+		$sql .= ", fk_shipping_method";
+		$sql .= ", tracking_number";
+		$sql .= ", weight";
+		$sql .= ", size";
+		$sql .= ", width";
+		$sql .= ", height";
+		$sql .= ", weight_units";
+		$sql .= ", size_units";
+		$sql .= ", note_private";
+		$sql .= ", note_public";
+		$sql .= ", model_pdf";
+		$sql .= ", fk_incoterms, location_incoterms";
+		$sql .= ") VALUES (";
+		$sql .= "'(PROV)'";
+		$sql .= ", ".$conf->entity;
+		$sql .= ", ".($this->ref_customer ? "'".$this->db->escape($this->ref_customer)."'" : "null");
+		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
+		$sql .= ", '".$this->db->idate($now)."'";
+		$sql .= ", ".$user->id;
+		$sql .= ", ".($this->date_expedition > 0 ? "'".$this->db->idate($this->date_expedition)."'" : "null");
+		$sql .= ", ".($this->date_delivery > 0 ? "'".$this->db->idate($this->date_delivery)."'" : "null");
+		$sql .= ", ".$this->socid;
+		$sql .= ", ".$this->fk_project;
+		$sql .= ", ".($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
+		$sql .= ", ".($this->shipping_method_id > 0 ? $this->shipping_method_id : "null");
+		$sql .= ", '".$this->db->escape($this->tracking_number)."'";
+		$sql .= ", ".$this->weight;
+		$sql .= ", ".$this->sizeS; // TODO Should use this->trueDepth
+		$sql .= ", ".$this->sizeW; // TODO Should use this->trueWidth
+		$sql .= ", ".$this->sizeH; // TODO Should use this->trueHeight
+		$sql .= ", ".$this->weight_units;
+		$sql .= ", ".$this->size_units;
+		$sql .= ", ".(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null");
+		$sql .= ", ".(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null");
+		$sql .= ", ".(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : "null");
+        $sql .= ", ".(int) $this->fk_incoterms;
+        $sql .= ", '".$this->db->escape($this->location_incoterms)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."expedition");
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
-			$sql.= " SET ref = '(PROV".$this->id.")'";
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET ref = '(PROV".$this->id.")'";
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			if ($this->db->query($sql))
 			{
 				// Insertion des lignes
-				$num=count($this->lines);
+				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++)
 				{
-					if (! isset($this->lines[$i]->detail_batch))
+					if (!isset($this->lines[$i]->detail_batch))
 					{	// no batch management
-						if (! $this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
+						if (!$this->create_line($this->lines[$i]->entrepot_id, $this->lines[$i]->origin_line_id, $this->lines[$i]->qty, $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
 					}
 					else
 					{	// with batch management
-						if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
+						if (!$this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) > 0)
 						{
 							$error++;
 						}
 					}
 				}
 
-				if (! $error && $this->id && $this->origin_id)
+				if (!$error && $this->id && $this->origin_id)
 				{
 					$ret = $this->add_object_linked();
 					if (!$ret)
@@ -298,13 +298,13 @@ 
 				// Actions on extra fields (by external module or standard code)
 				// TODO le hook fait double emploi avec le trigger !!
 				$hookmanager->initHooks(array('expeditiondao'));
-				$parameters=array('socid'=>$this->id);
-				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
+				$parameters = array('socid'=>$this->id);
+				$reshook = $hookmanager->executeHooks('insertExtraFields', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
 					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
 					{
-						$result=$this->insertExtraFields();
+						$result = $this->insertExtraFields();
 						if ($result < 0)
 						{
 							$error++;
@@ -313,34 +313,34 @@ 
 				}
 				else if ($reshook < 0) $error++;
 
-				if (! $error && ! $notrigger)
+				if (!$error && !$notrigger)
 				{
                     // Call trigger
-                    $result=$this->call_trigger('SHIPPING_CREATE',$user);
+                    $result = $this->call_trigger('SHIPPING_CREATE', $user);
                     if ($result < 0) { $error++; }
                     // End call triggers
 
-					if (! $error)
+					if (!$error)
 					{
 						$this->db->commit();
 						return $this->id;
 					}
 					else
 					{
-						foreach($this->errors as $errmsg)
+						foreach ($this->errors as $errmsg)
 						{
 							dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-							$this->error.=($this->error?', '.$errmsg:$errmsg);
+							$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 						}
 						$this->db->rollback();
-						return -1*$error;
+						return -1 * $error;
 					}
 
 				}
 				else
 				{
 					$error++;
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
@@ -348,7 +348,7 @@ 
 			else
 			{
 				$error++;
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
@@ -356,7 +356,7 @@ 
 		else
 		{
 			$error++;
-			$this->error=$this->db->error()." - sql=$sql";
+			$this->error = $this->db->error()." - sql=$sql";
 			$this->db->rollback();
 			return -1;
 		}
@@ -371,23 +371,23 @@ 
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, line_id if OK
 	 */
-	function create_line($entrepot_id, $origin_line_id, $qty,$array_options=0)
+	function create_line($entrepot_id, $origin_line_id, $qty, $array_options = 0)
 	{
 		global $conf;
 		$error = 0;
 		$line_id = 0;
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."expeditiondet (";
-		$sql.= "fk_expedition";
-		$sql.= ", fk_entrepot";
-		$sql.= ", fk_origin_line";
-		$sql.= ", qty";
-		$sql.= ") VALUES (";
-		$sql.= $this->id;
-		$sql.= ", ".($entrepot_id?$entrepot_id:'null');
-		$sql.= ", ".$origin_line_id;
-		$sql.= ", ".$qty;
-		$sql.= ")";
+		$sql .= "fk_expedition";
+		$sql .= ", fk_entrepot";
+		$sql .= ", fk_origin_line";
+		$sql .= ", qty";
+		$sql .= ") VALUES (";
+		$sql .= $this->id;
+		$sql .= ", ".($entrepot_id ? $entrepot_id : 'null');
+		$sql .= ", ".$origin_line_id;
+		$sql .= ", ".$qty;
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create_line", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -400,20 +400,20 @@ 
 			$error++;
 		}
 
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (!$error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 		{
 			$expeditionline = new ExpeditionLigne($this->db);
-			$expeditionline->array_options=$array_options;
-			$expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
-			$result=$expeditionline->insertExtraFields();
+			$expeditionline->array_options = $array_options;
+			$expeditionline->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
+			$result = $expeditionline->insertExtraFields();
 			if ($result < 0)
 			{
-				$this->error[]=$expeditionline->error;
+				$this->error[] = $expeditionline->error;
 				$error++;
 			}
 		}
 
-		if (! $error) return $line_id;
+		if (!$error) return $line_id;
 		else return -1;
 	}
 
@@ -425,12 +425,12 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function create_line_batch($line_ext,$array_options=0)
+	function create_line_batch($line_ext, $array_options = 0)
 	{
 		$error = 0;
 		$stockLocationQty = array(); // associated array with batch qty in stock location
 
-		$tab=$line_ext->detail_batch;
+		$tab = $line_ext->detail_batch;
 		// create stockLocation Qty array
 		foreach ($tab as $detbatch)
 		{
@@ -442,7 +442,7 @@ 
 		// create shipment lines
 		foreach ($stockLocationQty as $stockLocation => $qty)
 		{
-			if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
+			if (($line_id = $this->create_line($stockLocation, $line_ext->origin_line_id, $qty, $array_options)) < 0)
 			{
 				$error++;
 			}
@@ -451,8 +451,8 @@ 
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
-					if ($detbatch->entrepot_id == $stockLocation){
-						if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
+					if ($detbatch->entrepot_id == $stockLocation) {
+						if (!($detbatch->create($line_id) > 0))		// Create an expeditionlinebatch
 						{
 							$error++;
 						}
@@ -461,7 +461,7 @@ 
 			}
 		}
 
-		if (! $error) return 1;
+		if (!$error) return 1;
 		else return -1;
 	}
 
@@ -474,7 +474,7 @@ 
      * 	@param	string	$ref_int	Internal reference of other object
 	 *	@return int			        >0 if OK, 0 if not found, <0 if KO
 	 */
-	function fetch($id, $ref='', $ref_ext='', $ref_int='')
+	function fetch($id, $ref = '', $ref_ext = '', $ref_int = '')
 	{
 		global $conf;
 
@@ -482,21 +482,21 @@ 
 		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
-		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
-		$sql.= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
-		$sql.= ", e.fk_shipping_method, e.tracking_number";
-		$sql.= ", el.fk_source as origin_id, el.sourcetype as origin";
-		$sql.= ", e.note_private, e.note_public";
-        $sql.= ', e.fk_incoterms, e.location_incoterms';
-        $sql.= ', i.libelle as libelle_incoterms';
-		$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
-		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-        if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		$sql .= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
+		$sql .= ", e.date_expedition as date_expedition, e.model_pdf, e.fk_address, e.date_delivery";
+		$sql .= ", e.fk_shipping_method, e.tracking_number";
+		$sql .= ", el.fk_source as origin_id, el.sourcetype as origin";
+		$sql .= ", e.note_private, e.note_public";
+        $sql .= ', e.fk_incoterms, e.location_incoterms';
+        $sql .= ', i.libelle as libelle_incoterms';
+		$sql .= " FROM ".MAIN_DB_PREFIX."expedition as e";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
+		$sql .= " WHERE e.entity IN (".getEntity('expedition').")";
+		if ($id)   	  $sql .= " AND e.rowid=".$id;
+        if ($ref)     $sql .= " AND e.ref='".$this->db->escape($ref)."'";
+        if ($ref_ext) $sql .= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+        if ($ref_int) $sql .= " AND e.ref_int='".$this->db->escape($ref_int)."'";
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -509,23 +509,23 @@ 
 				$this->id                   = $obj->rowid;
 				$this->ref                  = $obj->ref;
 				$this->socid                = $obj->socid;
-				$this->ref_customer			= $obj->ref_customer;
+				$this->ref_customer = $obj->ref_customer;
 				$this->ref_ext				= $obj->ref_ext;
 				$this->ref_int				= $obj->ref_int;
 				$this->statut               = $obj->fk_statut;
 				$this->user_author_id       = $obj->fk_user_author;
 				$this->date_creation        = $this->db->jdate($obj->date_creation);
-				$this->date                 = $this->db->jdate($obj->date_expedition);	// TODO deprecated
-				$this->date_expedition      = $this->db->jdate($obj->date_expedition);	// TODO deprecated
-				$this->date_shipping        = $this->db->jdate($obj->date_expedition);	// Date real
-				$this->date_delivery        = $this->db->jdate($obj->date_delivery);	// Date planed
+				$this->date                 = $this->db->jdate($obj->date_expedition); // TODO deprecated
+				$this->date_expedition      = $this->db->jdate($obj->date_expedition); // TODO deprecated
+				$this->date_shipping        = $this->db->jdate($obj->date_expedition); // Date real
+				$this->date_delivery        = $this->db->jdate($obj->date_delivery); // Date planed
 				$this->fk_delivery_address  = $obj->fk_address;
 				$this->modelpdf             = $obj->model_pdf;
-				$this->shipping_method_id	= $obj->fk_shipping_method;
+				$this->shipping_method_id = $obj->fk_shipping_method;
 				$this->tracking_number      = $obj->tracking_number;
-				$this->origin               = ($obj->origin?$obj->origin:'commande'); // For compatibility
+				$this->origin               = ($obj->origin ? $obj->origin : 'commande'); // For compatibility
 				$this->origin_id            = $obj->origin_id;
-				$this->billed				= ($obj->fk_statut==2?1:0);
+				$this->billed = ($obj->fk_statut == 2 ? 1 : 0);
 
 				$this->trueWeight           = $obj->weight;
 				$this->weight_units         = $obj->weight_units;
@@ -541,8 +541,8 @@ 
 				$this->note_private         = $obj->note_private;
 
 				// A denormalized value
-				$this->trueSize           	= $obj->size."x".$obj->width."x".$obj->height;
-				$this->size_units           = $obj->size_units;
+				$this->trueSize = $obj->size."x".$obj->width."x".$obj->height;
+				$this->size_units = $obj->size_units;
 
 				//Incoterms
 				$this->fk_incoterms = $obj->fk_incoterms;
@@ -553,7 +553,7 @@ 
 
 				if ($this->statut == 0) $this->brouillon = 1;
 
-				$file = $conf->expedition->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'shipment') . "/" . $this->id.".pdf";
+				$file = $conf->expedition->dir_output."/".get_exdir($this->id, 2, 0, 0, $this, 'shipment')."/".$this->id.".pdf";
 				$this->pdf_filename = $file;
 
 				// Tracking url
@@ -562,19 +562,19 @@ 
 				/*
 				 * Thirparty
 				 */
-				$result=$this->fetch_thirdparty();
+				$result = $this->fetch_thirdparty();
 
 				// Retrieve all extrafields for expedition
 				// fetch optionals attributes and labels
 				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-				$extrafields=new ExtraFields($this->db);
-				$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
-				$this->fetch_optionals($this->id,$extralabels);
+				$extrafields = new ExtraFields($this->db);
+				$extralabels = $extrafields->fetch_name_optionals_label($this->table_element, true);
+				$this->fetch_optionals($this->id, $extralabels);
 
 				/*
 				 * Lines
 				 */
-				$result=$this->fetch_lines();
+				$result = $this->fetch_lines();
 				if ($result < 0)
 				{
 					return -3;
@@ -585,13 +585,13 @@ 
 			else
 			{
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
-				$this->error='Delivery with id '.$id.' not found';
+				$this->error = 'Delivery with id '.$id.' not found';
 				return 0;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -1;
 		}
 	}
@@ -603,7 +603,7 @@ 
      *  @param		int			$notrigger	1=Does not execute triggers, 0= execute triggers
 	 *  @return     int						<0 if OK, >0 if KO
 	 */
-	function valid($user, $notrigger=0)
+	function valid($user, $notrigger = 0)
 	{
 		global $conf, $langs;
 
@@ -618,10 +618,10 @@ 
 			return 0;
 		}
 
-        if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->creer))
-       	|| (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->expedition->shipping_advance->validate))))
+        if (!((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
+       	|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate))))
 		{
-			$this->error='Permission denied';
+			$this->error = 'Permission denied';
 			dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -635,10 +635,10 @@ 
 		$soc->fetch($this->socid);
 
 		// Class of company linked to order
-		$result=$soc->set_as_client();
+		$result = $soc->set_as_client();
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
@@ -648,26 +648,26 @@ 
 		}
         $this->newref = $numref;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		// Validate
 		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
-		$sql.= " ref='".$numref."'";
-		$sql.= ", fk_statut = 1";
-		$sql.= ", date_valid = '".$this->db->idate($now)."'";
-		$sql.= ", fk_user_valid = ".$user->id;
-		$sql.= " WHERE rowid = ".$this->id;
+		$sql .= " ref='".$numref."'";
+		$sql .= ", fk_statut = 1";
+		$sql .= ", date_valid = '".$this->db->idate($now)."'";
+		$sql .= ", fk_user_valid = ".$user->id;
+		$sql .= " WHERE rowid = ".$this->id;
 
 		dol_syslog(get_class($this)."::valid update expedition", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if (! $resql)
+		$resql = $this->db->query($sql);
+		if (!$resql)
 		{
-			$this->error=$this->db->lasterror();
+			$this->error = $this->db->lasterror();
 			$error++;
 		}
 
 		// If stock increment is done on sending (recommanded choice)
-		if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
+		if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT))
 		{
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -676,16 +676,16 @@ 
 			// Loop on each product line to add a stock movement
 			// TODO in future, shipment lines may not be linked to order line
 			$sql = "SELECT cd.fk_product, cd.subprice,";
-			$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-			$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-			$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-			$sql.= " WHERE ed.fk_expedition = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_origin_line";
+			$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+			$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+			$sql .= " WHERE ed.fk_expedition = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 			dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -712,10 +712,10 @@ 
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref));
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -726,10 +726,10 @@ 
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 					    // Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
-						$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 						if ($result < 0) {
 							$error++;
-							$this->errors[]=$mouvS->error;
+							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
@@ -739,7 +739,7 @@ 
 			else
 			{
 				$this->db->rollback();
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -2;
 			}
 
@@ -748,20 +748,20 @@ 
 		// Change status of order to "shipment in process"
 		$ret = $this->setStatut(Commande::STATUS_SHIPMENTONPROCESS, $this->origin_id, $this->origin);
 
-        if (! $ret)
+        if (!$ret)
 		{
 		    $error++;
 		}
 
-		if (! $error && ! $notrigger)
+		if (!$error && !$notrigger)
 		{
             // Call trigger
-            $result=$this->call_trigger('SHIPPING_VALIDATE',$user);
+            $result = $this->call_trigger('SHIPPING_VALIDATE', $user);
             if ($result < 0) { $error++; }
             // End call triggers
 		}
 
-		if (! $error)
+		if (!$error)
 		{
             $this->oldref = $this->ref;
 
@@ -782,13 +782,13 @@ 
 					{
 					    dol_syslog("Rename ok");
                         // Rename docs starting with $oldref with $newref
-                        $listoffiles=dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref,'/'));
-                        foreach($listoffiles as $fileentry)
+                        $listoffiles = dol_dir_list($conf->expedition->dir_output.'/sending/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+                        foreach ($listoffiles as $fileentry)
                         {
-                        	$dirsource=$fileentry['name'];
-                        	$dirdest=preg_replace('/^'.preg_quote($oldref,'/').'/',$newref, $dirsource);
-                        	$dirsource=$fileentry['path'].'/'.$dirsource;
-                        	$dirdest=$fileentry['path'].'/'.$dirdest;
+                        	$dirsource = $fileentry['name'];
+                        	$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+                        	$dirsource = $fileentry['path'].'/'.$dirsource;
+                        	$dirdest = $fileentry['path'].'/'.$dirdest;
                         	@rename($dirsource, $dirdest);
                         }
 					}
@@ -797,26 +797,26 @@ 
 		}
 
 		// Set new ref and current status
-		if (! $error)
+		if (!$error)
 		{
 			$this->ref = $numref;
 			$this->statut = 1;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
 		}
 		else
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::valid ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 	}
 
@@ -838,14 +838,14 @@ 
 				// Expedition validee
 				include_once DOL_DOCUMENT_ROOT.'/livraison/class/livraison.class.php';
 				$delivery = new Livraison($this->db);
-				$result=$delivery->create_from_sending($user, $this->id);
+				$result = $delivery->create_from_sending($user, $this->id);
 				if ($result > 0)
 				{
 					return $result;
 				}
 				else
 				{
-					$this->error=$delivery->error;
+					$this->error = $delivery->error;
 					return $result;
 				}
 			}
@@ -865,7 +865,7 @@ 
 	 * @param	array	$array_options		extrafields array
 	 * @return	int							<0 if KO, >0 if OK
 	 */
-	function addline($entrepot_id, $id, $qty,$array_options=0)
+	function addline($entrepot_id, $id, $qty, $array_options = 0)
 	{
 		global $conf, $langs;
 
@@ -879,22 +879,22 @@ 
 		$orderline = new OrderLine($this->db);
 		$orderline->fetch($id);
 
-		if (! empty($conf->stock->enabled) && ! empty($orderline->fk_product))
+		if (!empty($conf->stock->enabled) && !empty($orderline->fk_product))
 		{
 			$fk_product = $orderline->fk_product;
 
-			if (! ($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
+			if (!($entrepot_id > 0) && empty($conf->global->STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS))
 			{
 			    $langs->load("errors");
-				$this->error=$langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
+				$this->error = $langs->trans("ErrorWarehouseRequiredIntoShipmentLine");
 				return -1;
 			}
 
 			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 			{
 			    // Check must be done for stock of product into warehouse if $entrepot_id defined
-				$product=new Product($this->db);
-				$result=$product->fetch($fk_product);
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
 
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
@@ -903,11 +903,11 @@ 
 				else
 					$product_stock = $product->stock_reel;
 
-				$product_type=$product->type;
+				$product_type = $product->type;
 				if ($product_type == 0 && $product_stock < $qty)
 				{
                     $langs->load("errors");
-				    $this->error=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
+				    $this->error = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $product->ref);
 					$this->db->rollback();
 					return -3;
 				}
@@ -915,14 +915,14 @@ 
 		}
 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
-		if (! empty($conf->productbatch->enabled) && ! empty($orderline->fk_product) && ! empty($orderline->product_tobatch))
+		if (!empty($conf->productbatch->enabled) && !empty($orderline->fk_product) && !empty($orderline->product_tobatch))
 		{
-		    $this->error='ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
+		    $this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH';
 		    return -4;
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 			$line->array_options = $array_options;
 
 		$this->lines[$num] = $line;
@@ -935,32 +935,32 @@ 
 	 * @param	array		$array_options		extrafields array
 	 * @return	int						<0 if KO, >0 if OK
 	 */
-	function addline_batch($dbatch,$array_options=0)
+	function addline_batch($dbatch, $array_options = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$num = count($this->lines);
-		if ($dbatch['qty']>0)
+		if ($dbatch['qty'] > 0)
 		{
 			$line = new ExpeditionLigne($this->db);
-			$tab=array();
+			$tab = array();
 			foreach ($dbatch['detail'] as $key=>$value)
 			{
-				if ($value['q']>0)
+				if ($value['q'] > 0)
 				{
 					// $value['q']=qty to move
 					// $value['id_batch']=id into llx_product_batch of record to move
 					//var_dump($value);
 
 				    $linebatch = new ExpeditionLineBatch($this->db);
-					$ret=$linebatch->fetchFromStock($value['id_batch']);	// load serial, sellby, eatby
-					if ($ret<0)
+					$ret = $linebatch->fetchFromStock($value['id_batch']); // load serial, sellby, eatby
+					if ($ret < 0)
 					{
-						$this->error=$linebatch->error;
+						$this->error = $linebatch->error;
 						return -1;
 					}
-					$linebatch->dluo_qty=$value['q'];
-					$tab[]=$linebatch;
+					$linebatch->dluo_qty = $value['q'];
+					$tab[] = $linebatch;
 
 					if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)
 					{
@@ -971,7 +971,7 @@ 
 						if ($prod_batch->qty < $linebatch->dluo_qty)
 						{
                             $langs->load("errors");
-        				    $this->errors[]=$langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
+        				    $this->errors[] = $langs->trans('ErrorStockIsNotEnoughToAddProductOnShipment', $prod_batch->fk_product);
 							dol_syslog(get_class($this)."::addline_batch error=Product ".$prod_batch->batch.": ".$this->errorsToString(), LOG_ERR);
 							$this->db->rollback();
 							return -1;
@@ -984,10 +984,10 @@ 
 			$line->entrepot_id = $linebatch->entrepot_id;
 			$line->origin_line_id = $dbatch['ix_l'];
 			$line->qty = $dbatch['qty'];
-			$line->detail_batch=$tab;
+			$line->detail_batch = $tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) // For avoid conflicts if trigger used
 				$line->array_options = $array_options;
 
 			//var_dump($line);
@@ -1003,32 +1003,32 @@ 
      *  @param  int		$notrigger	    0=launch triggers after, 1=disable triggers
      *  @return int 			       	<0 if KO, >0 if OK
      */
-    function update($user=null, $notrigger=0)
+    function update($user = null, $notrigger = 0)
     {
     	global $conf;
-		$error=0;
+		$error = 0;
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) $this->ref = trim($this->ref);
+		if (isset($this->entity)) $this->entity = trim($this->entity);
+		if (isset($this->ref_customer)) $this->ref_customer = trim($this->ref_customer);
+		if (isset($this->socid)) $this->socid = trim($this->socid);
+		if (isset($this->fk_user_author)) $this->fk_user_author = trim($this->fk_user_author);
+		if (isset($this->fk_user_valid)) $this->fk_user_valid = trim($this->fk_user_valid);
+		if (isset($this->fk_delivery_address)) $this->fk_delivery_address = trim($this->fk_delivery_address);
+		if (isset($this->shipping_method_id)) $this->shipping_method_id = trim($this->shipping_method_id);
+		if (isset($this->tracking_number)) $this->tracking_number = trim($this->tracking_number);
+		if (isset($this->statut)) $this->statut = (int) $this->statut;
+		if (isset($this->trueDepth)) $this->trueDepth = trim($this->trueDepth);
+		if (isset($this->trueWidth)) $this->trueWidth = trim($this->trueWidth);
+		if (isset($this->trueHeight)) $this->trueHeight = trim($this->trueHeight);
+		if (isset($this->size_units)) $this->size_units = trim($this->size_units);
+		if (isset($this->weight_units)) $this->weight_units = trim($this->weight_units);
+		if (isset($this->trueWeight)) $this->weight = trim($this->trueWeight);
+		if (isset($this->note_private)) $this->note = trim($this->note_private);
+		if (isset($this->note_public)) $this->note = trim($this->note_public);
+		if (isset($this->modelpdf)) $this->modelpdf = trim($this->modelpdf);
 
 
 
@@ -1038,45 +1038,45 @@ 
         // Update request
         $sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET";
 
-		$sql.= " tms=".(dol_strlen($this->tms)!=0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
-		$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
-		$sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
-		$sql.= " fk_soc=".(isset($this->socid)?$this->socid:"null").",";
-		$sql.= " date_creation=".(dol_strlen($this->date_creation)!=0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
-		$sql.= " fk_user_author=".(isset($this->fk_user_author)?$this->fk_user_author:"null").",";
-		$sql.= " date_valid=".(dol_strlen($this->date_valid)!=0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
-		$sql.= " fk_user_valid=".(isset($this->fk_user_valid)?$this->fk_user_valid:"null").",";
-		$sql.= " date_expedition=".(dol_strlen($this->date_expedition)!=0 ? "'".$this->db->idate($this->date_expedition)."'" : 'null').",";
-		$sql.= " date_delivery=".(dol_strlen($this->date_delivery)!=0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
-		$sql.= " fk_address=".(isset($this->fk_delivery_address)?$this->fk_delivery_address:"null").",";
-		$sql.= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0)?$this->shipping_method_id:"null").",";
-		$sql.= " tracking_number=".(isset($this->tracking_number)?"'".$this->db->escape($this->tracking_number)."'":"null").",";
-		$sql.= " fk_statut=".(isset($this->statut)?$this->statut:"null").",";
-		$sql.= " height=".(($this->trueHeight != '')?$this->trueHeight:"null").",";
-		$sql.= " width=".(($this->trueWidth != '')?$this->trueWidth:"null").",";
-		$sql.= " size_units=".(isset($this->size_units)?$this->size_units:"null").",";
-		$sql.= " size=".(($this->trueDepth != '')?$this->trueDepth:"null").",";
-		$sql.= " weight_units=".(isset($this->weight_units)?$this->weight_units:"null").",";
-		$sql.= " weight=".(($this->trueWeight != '')?$this->trueWeight:"null").",";
-		$sql.= " note_private=".(isset($this->note_private)?"'".$this->db->escape($this->note_private)."'":"null").",";
-		$sql.= " note_public=".(isset($this->note_public)?"'".$this->db->escape($this->note_public)."'":"null").",";
-		$sql.= " model_pdf=".(isset($this->modelpdf)?"'".$this->db->escape($this->modelpdf)."'":"null").",";
-		$sql.= " entity=".$conf->entity;
-
-        $sql.= " WHERE rowid=".$this->id;
+		$sql .= " tms=".(dol_strlen($this->tms) != 0 ? "'".$this->db->idate($this->tms)."'" : 'null').",";
+		$sql .= " ref=".(isset($this->ref) ? "'".$this->db->escape($this->ref)."'" : "null").",";
+		$sql .= " ref_customer=".(isset($this->ref_customer) ? "'".$this->db->escape($this->ref_customer)."'" : "null").",";
+		$sql .= " fk_soc=".(isset($this->socid) ? $this->socid : "null").",";
+		$sql .= " date_creation=".(dol_strlen($this->date_creation) != 0 ? "'".$this->db->idate($this->date_creation)."'" : 'null').",";
+		$sql .= " fk_user_author=".(isset($this->fk_user_author) ? $this->fk_user_author : "null").",";
+		$sql .= " date_valid=".(dol_strlen($this->date_valid) != 0 ? "'".$this->db->idate($this->date_valid)."'" : 'null').",";
+		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
+		$sql .= " date_expedition=".(dol_strlen($this->date_expedition) != 0 ? "'".$this->db->idate($this->date_expedition)."'" : 'null').",";
+		$sql .= " date_delivery=".(dol_strlen($this->date_delivery) != 0 ? "'".$this->db->idate($this->date_delivery)."'" : 'null').",";
+		$sql .= " fk_address=".(isset($this->fk_delivery_address) ? $this->fk_delivery_address : "null").",";
+		$sql .= " fk_shipping_method=".((isset($this->shipping_method_id) && $this->shipping_method_id > 0) ? $this->shipping_method_id : "null").",";
+		$sql .= " tracking_number=".(isset($this->tracking_number) ? "'".$this->db->escape($this->tracking_number)."'" : "null").",";
+		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " height=".(($this->trueHeight != '') ? $this->trueHeight : "null").",";
+		$sql .= " width=".(($this->trueWidth != '') ? $this->trueWidth : "null").",";
+		$sql .= " size_units=".(isset($this->size_units) ? $this->size_units : "null").",";
+		$sql .= " size=".(($this->trueDepth != '') ? $this->trueDepth : "null").",";
+		$sql .= " weight_units=".(isset($this->weight_units) ? $this->weight_units : "null").",";
+		$sql .= " weight=".(($this->trueWeight != '') ? $this->trueWeight : "null").",";
+		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
+		$sql .= " note_public=".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : "null").",";
+		$sql .= " model_pdf=".(isset($this->modelpdf) ? "'".$this->db->escape($this->modelpdf)."'" : "null").",";
+		$sql .= " entity=".$conf->entity;
+
+        $sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
-    	if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+    	if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
                 // Call trigger
-                $result=$this->call_trigger('SHIPPING_MODIFY',$user);
+                $result = $this->call_trigger('SHIPPING_MODIFY', $user);
                 if ($result < 0) { $error++; }
                 // End call triggers
 	    	}
@@ -1085,13 +1085,13 @@ 
         // Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 	            dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
-	            $this->error.=($this->error?', '.$errmsg:$errmsg);
+	            $this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -1114,14 +1114,14 @@ 
 		{
 		require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 		}
-		$error=0;
-		$this->error='';
+		$error = 0;
+		$this->error = '';
 
 		// Add a protection to refuse deleting if shipment has at least one delivery
-		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery');	// Get deliveries linked to this shipment
+		$this->fetchObjectLinked($this->id, 'shipping', 0, 'delivery'); // Get deliveries linked to this shipment
 		if (count($this->linkedObjectsIds) > 0)
 		{
-			$this->error='ErrorThereIsSomeDeliveries';
+			$this->error = 'ErrorThereIsSomeDeliveries';
 			return -1;
 		}
 
@@ -1135,13 +1135,13 @@ 
 
 			// Loop on each product line to add a stock movement
 			$sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
-			$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-			$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-			$sql.= " WHERE ed.fk_expedition = ".$this->id;
-			$sql.= " AND cd.rowid = ed.fk_origin_line";
+			$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+			$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+			$sql .= " WHERE ed.fk_expedition = ".$this->id;
+			$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 			dol_syslog(get_class($this)."::delete select details", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$cpt = $this->db->num_rows($resql);
@@ -1157,20 +1157,20 @@ 
 					$lotArray = null;
 					if ($conf->productbatch->enabled)
 					{
-						$lotArray = ExpeditionLineBatch::fetchAll($this->db,$obj->expeditiondet_id);
-						if (! is_array($lotArray))
+						$lotArray = ExpeditionLineBatch::fetchAll($this->db, $obj->expeditiondet_id);
+						if (!is_array($lotArray))
 						{
-							$error++;$this->errors[]="Error ".$this->db->lasterror();
+							$error++; $this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
 					if (empty($lotArray)) {
 						// no lot/serial
 						// We increment stock of product (and sub-products)
 						// We use warehouse selected for each line
-						$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref));  // Price is set to 0, because we don't want to see WAP changed
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
 						if ($result < 0)
 						{
-							$error++;$this->errors=$this->errors + $mouvS->errors;
+							$error++; $this->errors = $this->errors + $mouvS->errors;
 							break;
 						}
 					}
@@ -1178,12 +1178,12 @@ 
 					{
 						// We increment stock of batches
 						// We use warehouse selected for each line
-						foreach($lotArray as $lot)
+						foreach ($lotArray as $lot)
 						{
-							$result=$mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->dluo_qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch);  // Price is set to 0, because we don't want to see WAP changed
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->dluo_qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
 							if ($result < 0)
 							{
-								$error++;$this->errors=$this->errors + $mouvS->errors;
+								$error++; $this->errors = $this->errors + $mouvS->errors;
 								break;
 							}
 						}
@@ -1193,46 +1193,46 @@ 
 			}
 			else
 			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
 		// delete batch expedition line
-		if (! $error && $conf->productbatch->enabled)
+		if (!$error && $conf->productbatch->enabled)
 		{
-			if (ExpeditionLineBatch::deletefromexp($this->db,$this->id) < 0)
+			if (ExpeditionLineBatch::deletefromexp($this->db, $this->id) < 0)
 			{
-				$error++;$this->errors[]="Error ".$this->db->lasterror();
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet";
-			$sql.= " WHERE fk_expedition = ".$this->id;
+			$sql .= " WHERE fk_expedition = ".$this->id;
 
-			if ( $this->db->query($sql) )
+			if ($this->db->query($sql))
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
 				if ($res < 0) $error++;
 
-				if (! $error)
+				if (!$error)
 				{
 					$sql = "DELETE FROM ".MAIN_DB_PREFIX."expedition";
-					$sql.= " WHERE rowid = ".$this->id;
+					$sql .= " WHERE rowid = ".$this->id;
 
 					if ($this->db->query($sql))
 					{
 						// Call trigger
-						$result=$this->call_trigger('SHIPPING_DELETE',$user);
+						$result = $this->call_trigger('SHIPPING_DELETE', $user);
 						if ($result < 0) { $error++; }
 						// End call triggers
 
-						if (! empty($this->origin) && $this->origin_id > 0)
+						if (!empty($this->origin) && $this->origin_id > 0)
 						{
 						    $this->fetch_origin();
-						    $origin=$this->origin;
+						    $origin = $this->origin;
 						    if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
 						    {
                                 // Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
@@ -1245,19 +1245,19 @@ 
 						    }
 						}
 
-						if (! $error)
+						if (!$error)
 						{
 							$this->db->commit();
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
-							if (! empty($conf->expedition->dir_output))
+							if (!empty($conf->expedition->dir_output))
 							{
-								$dir = $conf->expedition->dir_output . '/sending/' . $ref ;
-								$file = $dir . '/' . $ref . '.pdf';
+								$dir = $conf->expedition->dir_output.'/sending/'.$ref;
+								$file = $dir.'/'.$ref.'.pdf';
 								if (file_exists($file))
 								{
-									if (! dol_delete_file($file))
+									if (!dol_delete_file($file))
 									{
 										return 0;
 									}
@@ -1266,7 +1266,7 @@ 
 								{
 									if (!dol_delete_dir_recursive($dir))
 									{
-										$this->error=$langs->trans("ErrorCanNotDeleteDir",$dir);
+										$this->error = $langs->trans("ErrorCanNotDeleteDir", $dir);
 										return 0;
 									}
 								}
@@ -1282,21 +1282,21 @@ 
 					}
 					else
 					{
-						$this->error=$this->db->lasterror()." - sql=$sql";
+						$this->error = $this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
 				}
 				else
 				{
-					$this->error=$this->db->lasterror()." - sql=$sql";
+					$this->error = $this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
 			}
 			else
 			{
-				$this->error=$this->db->lasterror()." - sql=$sql";
+				$this->error = $this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
@@ -1320,18 +1320,18 @@ 
 		// TODO: recuperer les champs du document associe a part
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type";
-		$sql.= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
-		$sql.= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
-		$sql.= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
-		$sql.= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
-		$sql.= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
-		$sql.= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
-		$sql.= " FROM (".MAIN_DB_PREFIX."expeditiondet as ed,";
-		$sql.= " ".MAIN_DB_PREFIX."commandedet as cd)";
-		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
-		$sql.= " WHERE ed.fk_expedition = ".$this->id;
-		$sql.= " AND ed.fk_origin_line = cd.rowid";
-		$sql.= " ORDER BY cd.rang, ed.fk_origin_line";
+		$sql .= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
+		$sql .= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
+		$sql .= ", cd.fk_multicurrency, cd.multicurrency_code, cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc";
+		$sql .= ", ed.rowid as line_id, ed.qty as qty_shipped, ed.fk_origin_line, ed.fk_entrepot";
+		$sql .= ", p.ref as product_ref, p.label as product_label, p.fk_product_type";
+		$sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tobatch as product_tobatch";
+		$sql .= " FROM (".MAIN_DB_PREFIX."expeditiondet as ed,";
+		$sql .= " ".MAIN_DB_PREFIX."commandedet as cd)";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
+		$sql .= " WHERE ed.fk_expedition = ".$this->id;
+		$sql .= " AND ed.fk_origin_line = cd.rowid";
+		$sql .= " ORDER BY cd.rang, ed.fk_origin_line";
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1355,8 +1355,8 @@ 
 				$obj = $this->db->fetch_object($resql);
 
 			    if ($originline == $obj->fk_origin_line) {
-			        $line->entrepot_id       = 0; // entrepod_id in details_entrepot
-				    $line->qty_shipped    	+= $obj->qty_shipped;
+			        $line->entrepot_id = 0; // entrepod_id in details_entrepot
+				    $line->qty_shipped += $obj->qty_shipped;
 				} else {
 				    $line = new ExpeditionLigne($this->db);
 				    $line->entrepot_id    	= $obj->fk_entrepot;
@@ -1369,24 +1369,24 @@ 
 				$line->details_entrepot[]     = $detail_entrepot;
 
                 $line->line_id          = $obj->line_id;
-                $line->rowid            = $obj->line_id;    // TODO deprecated
+                $line->rowid            = $obj->line_id; // TODO deprecated
                 $line->id               = $obj->line_id;
 
-                $line->fk_origin     	= 'orderline';
+                $line->fk_origin = 'orderline';
                 $line->fk_origin_line 	= $obj->fk_origin_line;
-                $line->origin_line_id 	= $obj->fk_origin_line;	    // TODO deprecated
+                $line->origin_line_id 	= $obj->fk_origin_line; // TODO deprecated
 
-				$line->fk_expedition    = $this->id;                // id of parent
+				$line->fk_expedition    = $this->id; // id of parent
 
 				$line->product_type     = $obj->product_type;
 				$line->fk_product     	= $obj->fk_product;
 				$line->fk_product_type	= $obj->fk_product_type;
-				$line->ref				= $obj->product_ref;		// TODO deprecated
-                $line->product_ref		= $obj->product_ref;
-                $line->product_label	= $obj->product_label;
-				$line->libelle        	= $obj->product_label;		// TODO deprecated
-				$line->product_tobatch  = $obj->product_tobatch;
-				$line->label			= $obj->custom_label;
+				$line->ref = $obj->product_ref; // TODO deprecated
+                $line->product_ref = $obj->product_ref;
+                $line->product_label = $obj->product_label;
+				$line->libelle        	= $obj->product_label; // TODO deprecated
+				$line->product_tobatch = $obj->product_tobatch;
+				$line->label = $obj->custom_label;
 				$line->description    	= $obj->description;
 				$line->qty_asked      	= $obj->qty_asked;
 				$line->weight         	= $obj->weight;
@@ -1394,40 +1394,40 @@ 
 				$line->length         	= $obj->length;
 				$line->length_units   	= $obj->length_units;
 				$line->surface        	= $obj->surface;
-				$line->surface_units   	= $obj->surface_units;
+				$line->surface_units = $obj->surface_units;
 				$line->volume         	= $obj->volume;
 				$line->volume_units   	= $obj->volume_units;
 
-				$line->pa_ht 			= $obj->pa_ht;
+				$line->pa_ht = $obj->pa_ht;
 
-				$localtax_array=array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
+				$localtax_array = array(0=>$obj->localtax1_type, 1=>$obj->localtax1_tx, 2=>$obj->localtax2_type, 3=>$obj->localtax2_tx);
 
 				// For invoicing
-				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array);	// We force type to 0
-				$line->desc	         	= $obj->description;		// We need ->desc because some code into CommonObject use desc (property defined for other elements)
-				$line->qty 				= $line->qty_shipped;
-				$line->total_ht			= $tabprice[0];
+				$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type, $mysoc, $localtax_array); // We force type to 0
+				$line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements)
+				$line->qty = $line->qty_shipped;
+				$line->total_ht = $tabprice[0];
 				$line->total_localtax1 	= $tabprice[9];
 				$line->total_localtax2 	= $tabprice[10];
 				$line->total_ttc	 	= $tabprice[2];
 				$line->total_tva	 	= $tabprice[1];
-				$line->vat_src_code	 	= $obj->vat_src_code;
-				$line->tva_tx 		 	= $obj->tva_tx;
+				$line->vat_src_code = $obj->vat_src_code;
+				$line->tva_tx = $obj->tva_tx;
 				$line->localtax1_tx 	= $obj->localtax1_tx;
 				$line->localtax2_tx 	= $obj->localtax2_tx;
-				$line->price			= $obj->price;
-				$line->subprice			= $obj->subprice;
-				$line->remise_percent	= $obj->remise_percent;
+				$line->price = $obj->price;
+				$line->subprice = $obj->subprice;
+				$line->remise_percent = $obj->remise_percent;
 
-				$this->total_ht+= $tabprice[0];
-				$this->total_tva+= $tabprice[1];
-				$this->total_ttc+= $tabprice[2];
-				$this->total_localtax1+= $tabprice[9];
-				$this->total_localtax2+= $tabprice[10];
+				$this->total_ht += $tabprice[0];
+				$this->total_tva += $tabprice[1];
+				$this->total_ttc += $tabprice[2];
+				$this->total_localtax1 += $tabprice[9];
+				$this->total_localtax2 += $tabprice[10];
 
 				// Multicurrency
-				$this->fk_multicurrency 		= $obj->fk_multicurrency;
-				$this->multicurrency_code 		= $obj->multicurrency_code;
+				$this->fk_multicurrency = $obj->fk_multicurrency;
+				$this->multicurrency_code = $obj->multicurrency_code;
 				$this->multicurrency_subprice 	= $obj->multicurrency_subprice;
 				$this->multicurrency_total_ht 	= $obj->multicurrency_total_ht;
 				$this->multicurrency_total_tva 	= $obj->multicurrency_total_tva;
@@ -1438,11 +1438,11 @@ 
 					$line->detail_batch = array();
 				}
 				// Eat-by date
-				if (! empty($conf->productbatch->enabled) && $obj->line_id > 0)
+				if (!empty($conf->productbatch->enabled) && $obj->line_id > 0)
 				{
                     require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
 
-                    $newdetailbatch = ExpeditionLineBatch::fetchAll($this->db,$obj->line_id);
+                    $newdetailbatch = ExpeditionLineBatch::fetchAll($this->db, $obj->line_id);
                     if (is_array($newdetailbatch))
                     {
 	                    if ($originline != $obj->fk_origin_line)
@@ -1463,7 +1463,7 @@ 
 				}
 				else
 				{
-				    $line->total_ht			+= $tabprice[0];
+				    $line->total_ht += $tabprice[0];
 				    $line->total_localtax1 	+= $tabprice[9];
 				    $line->total_localtax2 	+= $tabprice[10];
 				    $line->total_ttc	 	+= $tabprice[2];
@@ -1478,7 +1478,7 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->error();
+			$this->error = $this->db->error();
 			return -3;
 		}
 	}
@@ -1494,13 +1494,13 @@ 
      *  @param      int     	$save_lastsearch_value		-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
      *	@return     string          						String with URL
      */
-	function getNomUrl($withpicto=0, $option=0, $max=0, $short=0, $notooltip=0, $save_lastsearch_value=-1)
+	function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
 		global $langs;
 
-		$result='';
-        $label = '<u>' . $langs->trans("ShowSending") . '</u>';
-        $label .= '<br><b>' . $langs->trans('Ref') . ':</b> '.$this->ref;
+		$result = '';
+        $label = '<u>'.$langs->trans("ShowSending").'</u>';
+        $label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
         $label .= '<br><b>'.$langs->trans('RefCustomer').':</b> '.($this->ref_customer ? $this->ref_customer : $this->ref_client);
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
@@ -1510,31 +1510,31 @@ 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
-			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
 		}
 
-		$linkclose='';
+		$linkclose = '';
 		if (empty($notooltip))
 		{
-		    if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
+		    if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
 		    {
-		        $label=$langs->trans("ShowSending");
-		        $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+		        $label = $langs->trans("ShowSending");
+		        $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 		    }
-		    $linkclose.= ' title="'.dol_escape_htmltag($label, 1).'"';
-		    $linkclose.=' class="classfortooltip"';
+		    $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+		    $linkclose .= ' class="classfortooltip"';
 		}
 
         $linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend='</a>';
+		$linkend = '</a>';
 
-		$picto='sending';
+		$picto = 'sending';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
-		$result.=$linkstart.$this->ref.$linkend;
+		if ($withpicto) $result .= ($linkstart.img_object(($notooltip ? '' : $label), $picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend);
+		if ($withpicto && $withpicto != 2) $result .= ' ';
+		$result .= $linkstart.$this->ref.$linkend;
 		return $result;
 	}
 
@@ -1544,9 +1544,9 @@ 
      *	@param      int		$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
      *	@return     string      		Libelle
      */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->statut,$mode);
+		return $this->LibStatut($this->statut, $mode);
 	}
 
 	/**
@@ -1556,39 +1556,39 @@ 
 	 * @param      int		$mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
 	 * @return     string				Label of status
 	 */
-	function LibStatut($statut,$mode)
+	function LibStatut($statut, $mode)
 	{
 		global $langs;
 
-		if ($mode==0)
+		if ($mode == 0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==2)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 0) return $langs->trans($this->statuts[$statut]);
+			if ($statut == 1)  return $langs->trans($this->statuts[$statut]);
+			if ($statut == 2)  return $langs->trans($this->statuts[$statut]);
 		}
-		if ($mode==1)
+		if ($mode == 1)
 		{
-			if ($statut==0) return $langs->trans('StatusSendingDraftShort');
-			if ($statut==1) return $langs->trans('StatusSendingValidatedShort');
-			if ($statut==2) return $langs->trans('StatusSendingProcessedShort');
+			if ($statut == 0) return $langs->trans('StatusSendingDraftShort');
+			if ($statut == 1) return $langs->trans('StatusSendingValidatedShort');
+			if ($statut == 2) return $langs->trans('StatusSendingProcessedShort');
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans('StatusSendingProcessed'),'statut6');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			if ($statut == 2) return img_picto($langs->trans('StatusSendingProcessed'), 'statut6');
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans('StatusSendingProcessed'),'statut6').' '.$langs->trans('StatusSendingProcessed');
+			if ($statut == 0) return img_picto($langs->trans($this->statuts[$statut]), 'statut0').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 1) return img_picto($langs->trans($this->statuts[$statut]), 'statut4').' '.$langs->trans($this->statuts[$statut]);
+			if ($statut == 2) return img_picto($langs->trans('StatusSendingProcessed'), 'statut6').' '.$langs->trans('StatusSendingProcessed');
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return $langs->trans('StatusSendingProcessedShort').' '.img_picto($langs->trans('StatusSendingProcessedShort'),'statut6');
+			if ($statut == 0) return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]), 'statut0');
+			if ($statut == 1) return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]), 'statut4');
+			if ($statut == 2) return $langs->trans('StatusSendingProcessedShort').' '.img_picto($langs->trans('StatusSendingProcessedShort'), 'statut6');
 		}
 	}
 
@@ -1603,7 +1603,7 @@ 
 	{
 		global $langs;
 
-		$now=dol_now();
+		$now = dol_now();
 
 		dol_syslog(get_class($this)."::initAsSpecimen");
 
@@ -1611,8 +1611,8 @@ 
 		$num_prods = 0;
 		$prodids = array();
 		$sql = "SELECT rowid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."product";
-		$sql.= " WHERE entity IN (".getEntity('product').")";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product";
+		$sql .= " WHERE entity IN (".getEntity('product').")";
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
@@ -1626,20 +1626,20 @@ 
 			}
 		}
 
-		$order=new Commande($this->db);
+		$order = new Commande($this->db);
 		$order->initAsSpecimen();
 
 		// Initialise parametres
-		$this->id=0;
+		$this->id = 0;
 		$this->ref = 'SPECIMEN';
-		$this->specimen=1;
+		$this->specimen = 1;
 		$this->statut               = 1;
 		$this->livraison_id         = 0;
 		$this->date                 = $now;
 		$this->date_creation        = $now;
 		$this->date_valid           = $now;
 		$this->date_delivery        = $now;
-		$this->date_expedition      = $now + 24*3600;
+		$this->date_expedition      = $now + 24 * 3600;
 
 		$this->entrepot_id          = 0;
 		$this->fk_delivery_address  = 0;
@@ -1651,22 +1651,22 @@ 
         $this->origin_id            = 1;
         $this->origin               = 'commande';
 
-        $this->note_private			= 'Private note';
-        $this->note_public			= 'Public note';
+        $this->note_private = 'Private note';
+        $this->note_public = 'Public note';
 
 		$nbp = 5;
 		$xnbp = 0;
 		while ($xnbp < $nbp)
 		{
-			$line=new ExpeditionLigne($this->db);
-			$line->desc=$langs->trans("Description")." ".$xnbp;
-			$line->libelle=$langs->trans("Description")." ".$xnbp;
-			$line->qty=10;
-			$line->qty_asked=5;
-			$line->qty_shipped=4;
-			$line->fk_product=$this->commande->lines[$xnbp]->fk_product;
-
-			$this->lines[]=$line;
+			$line = new ExpeditionLigne($this->db);
+			$line->desc = $langs->trans("Description")." ".$xnbp;
+			$line->libelle = $langs->trans("Description")." ".$xnbp;
+			$line->qty = 10;
+			$line->qty_asked = 5;
+			$line->qty_shipped = 4;
+			$line->fk_product = $this->commande->lines[$xnbp]->fk_product;
+
+			$this->lines[] = $line;
 			$xnbp++;
 		}
 
@@ -1684,11 +1684,11 @@ 
 		if ($user->rights->expedition->creer)
 		{
 			$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
-			$sql.= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
-			$sql.= " WHERE rowid = ".$this->id;
+			$sql .= " SET date_delivery = ".($date_livraison ? "'".$this->db->idate($date_livraison)."'" : 'null');
+			$sql .= " WHERE rowid = ".$this->id;
 
 			dol_syslog(get_class($this)."::set_date_livraison", LOG_DEBUG);
-			$resql=$this->db->query($sql);
+			$resql = $this->db->query($sql);
 			if ($resql)
 			{
 				$this->date_delivery = $date_livraison;
@@ -1696,7 +1696,7 @@ 
 			}
 			else
 			{
-				$this->error=$this->db->error();
+				$this->error = $this->db->error();
 				return -1;
 			}
 		}
@@ -1717,17 +1717,17 @@ 
 		$this->meths = array();
 
 		$sql = "SELECT em.rowid, em.code, em.libelle";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-		$sql.= " WHERE em.active = 1";
-		$sql.= " ORDER BY em.libelle ASC";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+		$sql .= " WHERE em.active = 1";
+		$sql .= " ORDER BY em.libelle ASC";
 
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			while ($obj = $this->db->fetch_object($resql))
 			{
-				$label=$langs->trans('SendingMethod'.$obj->code);
-				$this->meths[$obj->rowid] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+				$label = $langs->trans('SendingMethod'.$obj->code);
+				$this->meths[$obj->rowid] = ($label != 'SendingMethod'.$obj->code ? $label : $obj->libelle);
 			}
 		}
 	}
@@ -1738,16 +1738,16 @@ 
      *  @param  id      $id     only this carrier, all if none
      *  @return void
      */
-    function list_delivery_methods($id='')
+    function list_delivery_methods($id = '')
     {
         global $langs;
 
         $this->listmeths = array();
-        $i=0;
+        $i = 0;
 
         $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
-        $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id!='') $sql.= " WHERE em.rowid=".$id;
+        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+        if ($id != '') $sql .= " WHERE em.rowid=".$id;
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1756,8 +1756,8 @@ 
             {
                 $this->listmeths[$i]['rowid'] = $obj->rowid;
                 $this->listmeths[$i]['code'] = $obj->code;
-                $label=$langs->trans('SendingMethod'.$obj->code);
-                $this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code?$label:$obj->libelle);
+                $label = $langs->trans('SendingMethod'.$obj->code);
+                $this->listmeths[$i]['libelle'] = ($label != 'SendingMethod'.$obj->code ? $label : $obj->libelle);
                 $this->listmeths[$i]['description'] = $obj->description;
                 $this->listmeths[$i]['tracking'] = $obj->tracking;
                 $this->listmeths[$i]['active'] = $obj->active;
@@ -1773,25 +1773,25 @@ 
      *
      *  @return void
      */
-    function update_delivery_method($id='')
+    function update_delivery_method($id = '')
     {
-        if ($id=='')
+        if ($id == '')
         {
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-            $sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
+            $sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
         }
         else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-            $sql.= " code='".$this->db->escape($this->update['code'])."'";
-            $sql.= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-            $sql.= ",description='".$this->db->escape($this->update['description'])."'";
-            $sql.= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-            $sql.= " WHERE rowid=".$id;
+            $sql .= " code='".$this->db->escape($this->update['code'])."'";
+            $sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
+            $sql .= ",description='".$this->db->escape($this->update['description'])."'";
+            $sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
+            $sql .= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
-        if ($resql < 0) dol_print_error($this->db,'');
+        if ($resql < 0) dol_print_error($this->db, '');
     }
 
     /**
@@ -1804,7 +1804,7 @@ 
     function activ_delivery_method($id)
     {
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-        $sql.= ' WHERE rowid='.$id;
+        $sql .= ' WHERE rowid='.$id;
 
         $resql = $this->db->query($sql);
 
@@ -1820,7 +1820,7 @@ 
     function disable_delivery_method($id)
     {
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-        $sql.= ' WHERE rowid='.$id;
+        $sql .= ' WHERE rowid='.$id;
 
         $resql = $this->db->query($sql);
 
@@ -1833,13 +1833,13 @@ 
 	 * @param	string	$value		Value
 	 * @return	void
 	 */
-	function GetUrlTrackingStatus($value='')
+	function GetUrlTrackingStatus($value = '')
 	{
-		if (! empty($this->shipping_method_id))
+		if (!empty($this->shipping_method_id))
 		{
 			$sql = "SELECT em.code, em.tracking";
-			$sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-			$sql.= " WHERE em.rowid = ".$this->shipping_method_id;
+			$sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
+			$sql .= " WHERE em.rowid = ".$this->shipping_method_id;
 
 			$resql = $this->db->query($sql);
 			if ($resql)
@@ -1854,7 +1854,7 @@ 
 		if (!empty($tracking) && !empty($value))
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
-			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
+			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value ? $value : 'url').'</a>', $url, $url);
 		}
 		else
 		{
@@ -1869,16 +1869,16 @@ 
 	 */
 	function setClosed()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Set order billed if 100% of order is shipped (qty in shipment lines match qty in order lines)
@@ -1887,17 +1887,17 @@ 
 				$order = new Commande($this->db);
 				$order->fetch($this->origin_id);
 
-				$order->loadExpeditions(self::STATUS_CLOSED);		// Fill $order->expeditions = array(orderlineid => qty)
+				$order->loadExpeditions(self::STATUS_CLOSED); // Fill $order->expeditions = array(orderlineid => qty)
 
 				$shipments_match_order = 1;
-				foreach($order->lines as $line)
+				foreach ($order->lines as $line)
 				{
 					$lineid = $line->id;
 					$qty = $line->qty;
-					if (($line->product_type == 0 || ! empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty)
+					if (($line->product_type == 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $order->expeditions[$lineid] != $qty)
 					{
 						$shipments_match_order = 0;
-						$text='Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
+						$text = 'Qty for order line id '.$lineid.' is '.$qty.'. However in the shipments with status Expedition::STATUS_CLOSED='.self::STATUS_CLOSED.' we have qty = '.$order->expeditions[$lineid].', so we can t close order';
 						dol_syslog($text);
 						break;
 					}
@@ -1909,11 +1909,11 @@ 
 				}
 			}
 
-			$this->statut=self::STATUS_CLOSED;
+			$this->statut = self::STATUS_CLOSED;
 
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -1922,16 +1922,16 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite d'expedier a partir d'une propale ou autre origine ?
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-				$sql.= " WHERE ed.fk_expedition = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_origin_line";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+				$sql .= " WHERE ed.fk_expedition = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -1957,7 +1957,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref));
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref));
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1969,7 +1969,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -1980,15 +1980,15 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
 			// Call trigger
-			if (! $error)
+			if (!$error)
 			{
-    			$result=$this->call_trigger('SHIPPING_CLOSED',$user);
+    			$result = $this->call_trigger('SHIPPING_CLOSED', $user);
     			if ($result < 0) {
     			    $error++;
     			}
@@ -2000,7 +2000,7 @@ 
             $error++;
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 		    $this->db->commit();
 		    return 1;
@@ -2020,28 +2020,28 @@ 
 	function set_billed()
 	{
 	    global $user;
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2, billed=1';    // TODO Update only billed
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=2, billed=1'; // TODO Update only billed
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=2;
-			$this->billed=1;
+			$this->statut = 2;
+			$this->billed = 1;
 
 			// Call trigger
-			$result=$this->call_trigger('SHIPPING_BILLED',$user);
+			$result = $this->call_trigger('SHIPPING_BILLED', $user);
 			if ($result < 0) {
 				$error++;
 			}
 
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror;
+			$this->errors[] = $this->db->lasterror;
 		}
 
 		if (empty($error)) {
@@ -2062,23 +2062,23 @@ 
 	 */
 	function reOpen()
 	{
-		global $conf,$langs,$user;
+		global $conf, $langs, $user;
 
-		$error=0;
+		$error = 0;
 
 		$this->db->begin();
 
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut=1';
 		$sql .= ' WHERE rowid = '.$this->id.' AND fk_statut > 0';
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$this->statut=1;
-			$this->billed=0;
+			$this->statut = 1;
+			$this->billed = 0;
 
 			// If stock increment is done on closing
-			if (! $error && ! empty($conf->stock->enabled) && ! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
+			if (!$error && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
@@ -2087,16 +2087,16 @@ 
 				// Loop on each product line to add a stock movement
 				// TODO possibilite d'expedier a partir d'une propale ou autre origine
 				$sql = "SELECT cd.fk_product, cd.subprice,";
-				$sql.= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql.= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
-				$sql.= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
-				$sql.= " ".MAIN_DB_PREFIX."expeditiondet as ed";
-				$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-				$sql.= " WHERE ed.fk_expedition = ".$this->id;
-				$sql.= " AND cd.rowid = ed.fk_origin_line";
+				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
+				$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+				$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+				$sql .= " WHERE ed.fk_expedition = ".$this->id;
+				$sql .= " AND cd.rowid = ed.fk_origin_line";
 
 				dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
-				$resql=$this->db->query($sql);
+				$resql = $this->db->query($sql);
 				if ($resql)
 				{
 					$cpt = $this->db->num_rows($resql);
@@ -2123,7 +2123,7 @@ 
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref));
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr", $numref));
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -2135,7 +2135,7 @@ 
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result=$mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr",$numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ShipmentUnClassifyCloseddInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 							    $this->error = $mouvS->error;
 							    $this->errors = $mouvS->errors;
@@ -2146,15 +2146,15 @@ 
 				}
 				else
 				{
-					$this->error=$this->db->lasterror();
+					$this->error = $this->db->lasterror();
 					$error++;
 				}
 			}
 
-			if (! $error)
+			if (!$error)
 			{
     			// Call trigger
-    			$result=$this->call_trigger('SHIPPING_REOPEN',$user);
+    			$result = $this->call_trigger('SHIPPING_REOPEN', $user);
     			if ($result < 0) {
     				$error++;
     			}
@@ -2162,10 +2162,10 @@ 
 
 		} else {
 			$error++;
-			$this->errors[]=$this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
 		}
 
-		if (! $error)
+		if (!$error)
 		{
 			$this->db->commit();
 			return 1;
@@ -2187,19 +2187,19 @@ 
 	 *  @param      int			$hideref        Hide ref
 	 *  @return     int         				0 if KO, 1 if OK
 	 */
-	public function generateDocument($modele, $outputlangs,$hidedetails=0, $hidedesc=0, $hideref=0)
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
-		global $conf,$langs;
+		global $conf, $langs;
 
 		$langs->load("sendings");
 
-		if (! dol_strlen($modele)) {
+		if (!dol_strlen($modele)) {
 
 			$modele = 'rouget';
 
 			if ($this->modelpdf) {
 				$modele = $this->modelpdf;
-			} elseif (! empty($conf->global->EXPEDITION_ADDON_PDF)) {
+			} elseif (!empty($conf->global->EXPEDITION_ADDON_PDF)) {
 				$modele = $conf->global->EXPEDITION_ADDON_PDF;
 			}
 		}
@@ -2252,14 +2252,14 @@ 
 
 	// Invoicing
 	var $remise_percent;
-	var $total_ht;			// Total net of tax
-	var $total_ttc;			// Total with tax
-	var $total_tva;			// Total VAT
-	var $total_localtax1;   // Total Local tax 1
-	var $total_localtax2;   // Total Local tax 2
+	var $total_ht; // Total net of tax
+	var $total_ttc; // Total with tax
+	var $total_tva; // Total VAT
+	var $total_localtax1; // Total Local tax 1
+	var $total_localtax2; // Total Local tax 2
 
-	public $element='expeditiondet';
-	public $table_element='expeditiondet';
+	public $element = 'expeditiondet';
+	public $table_element = 'expeditiondet';
 
 	public $fk_origin_line;
 
@@ -2287,7 +2287,7 @@ 
      */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 }

Braces +249 added lines, -155 removed lines

@@ -33,9 +33,15 @@ 
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/class/commonobjectline.class.php";
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-if (! empty($conf->commande->enabled)) require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (! empty($conf->productbatch->enabled)) require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+if (! empty($conf->propal->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+}
+if (! empty($conf->commande->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+}
+if (! empty($conf->productbatch->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
+}
 
 
 /**
@@ -162,14 +168,12 @@ 
 			if ( $numref != "")
 			{
 				return $numref;
-			}
-			else
+			} else
 			{
 				dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
 				return "";
 			}
-        }
-	    else
+        } else
 	    {
 		    print $langs->trans("Error")." ".$langs->trans("Error_EXPEDITION_ADDON_NUMBER_NotDefined");
 		    return "";
@@ -195,7 +199,9 @@ 
 		// Clean parameters
 		$this->brouillon = 1;
 		$this->tracking_number = dol_sanitizeFileName($this->tracking_number);
-		if (empty($this->fk_project)) $this->fk_project = 0;
+		if (empty($this->fk_project)) {
+			$this->fk_project = 0;
+		}
 
 		$this->user = $user;
 
@@ -276,8 +282,7 @@ 
 						{
 							$error++;
 						}
-					}
-					else
+					} else
 					{	// with batch management
 						if (! $this->create_line_batch($this->lines[$i],$this->lines[$i]->array_options) > 0)
 						{
@@ -302,16 +307,19 @@ 
 				$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
 				if (empty($reshook))
 				{
-					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) // For avoid conflicts if trigger used
+					if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED)) {
+						// For avoid conflicts if trigger used
 					{
 						$result=$this->insertExtraFields();
+					}
 						if ($result < 0)
 						{
 							$error++;
 						}
 					}
+				} else if ($reshook < 0) {
+					$error++;
 				}
-				else if ($reshook < 0) $error++;
 
 				if (! $error && ! $notrigger)
 				{
@@ -324,8 +332,7 @@ 
 					{
 						$this->db->commit();
 						return $this->id;
-					}
-					else
+					} else
 					{
 						foreach($this->errors as $errmsg)
 						{
@@ -336,24 +343,21 @@ 
 						return -1*$error;
 					}
 
-				}
-				else
+				} else
 				{
 					$error++;
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -3;
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$this->error=$this->db->error()." - sql=$sql";
@@ -394,15 +398,16 @@ 
 		if ($resql)
 		{
 		    $line_id = $this->db->last_insert_id(MAIN_DB_PREFIX."expeditiondet");
-		}
-		else
+		} else
 		{
 			$error++;
 		}
 
-		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (! $error && empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+			// For avoid conflicts if trigger used
 		{
 			$expeditionline = new ExpeditionLigne($this->db);
+		}
 			$expeditionline->array_options=$array_options;
 			$expeditionline->id= $this->db->last_insert_id(MAIN_DB_PREFIX.$expeditionline->table_element);
 			$result=$expeditionline->insertExtraFields();
@@ -413,8 +418,11 @@ 
 			}
 		}
 
-		if (! $error) return $line_id;
-		else return -1;
+		if (! $error) {
+			return $line_id;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -445,24 +453,28 @@ 
 			if (($line_id = $this->create_line($stockLocation,$line_ext->origin_line_id,$qty,$array_options)) < 0)
 			{
 				$error++;
-			}
-			else
+			} else
 			{
 				// create shipment batch lines for stockLocation
 				foreach ($tab as $detbatch)
 				{
 					if ($detbatch->entrepot_id == $stockLocation){
-						if (! ($detbatch->create($line_id) >0))		// Create an expeditionlinebatch
+						if (! ($detbatch->create($line_id) >0)) {
+							// Create an expeditionlinebatch
 						{
 							$error++;
 						}
+						}
 					}
 				}
 			}
 		}
 
-		if (! $error) return 1;
-		else return -1;
+		if (! $error) {
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 	/**
@@ -479,7 +491,9 @@ 
 		global $conf;
 
 		// Check parameters
-		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) return -1;
+		if (empty($id) && empty($ref) && empty($ref_ext) && empty($ref_int)) {
+			return -1;
+		}
 
 		$sql = "SELECT e.rowid, e.ref, e.fk_soc as socid, e.date_creation, e.ref_customer, e.ref_ext, e.ref_int, e.fk_user_author, e.fk_statut";
 		$sql.= ", e.weight, e.weight_units, e.size, e.size_units, e.width, e.height";
@@ -493,10 +507,18 @@ 
 		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON el.fk_target = e.rowid AND el.targettype = '".$this->db->escape($this->element)."'";
 		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON e.fk_incoterms = i.rowid';
 		$sql.= " WHERE e.entity IN (".getEntity('expedition').")";
-		if ($id)   	  $sql.= " AND e.rowid=".$id;
-        if ($ref)     $sql.= " AND e.ref='".$this->db->escape($ref)."'";
-        if ($ref_ext) $sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
-        if ($ref_int) $sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+		if ($id) {
+			$sql.= " AND e.rowid=".$id;
+		}
+        if ($ref) {
+        	$sql.= " AND e.ref='".$this->db->escape($ref)."'";
+        }
+        if ($ref_ext) {
+        	$sql.= " AND e.ref_ext='".$this->db->escape($ref_ext)."'";
+        }
+        if ($ref_int) {
+        	$sql.= " AND e.ref_int='".$this->db->escape($ref_int)."'";
+        }
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -551,7 +573,9 @@ 
 
 				$this->db->free($result);
 
-				if ($this->statut == 0) $this->brouillon = 1;
+				if ($this->statut == 0) {
+					$this->brouillon = 1;
+				}
 
 				$file = $conf->expedition->dir_output . "/" .get_exdir($this->id, 2, 0, 0, $this, 'shipment') . "/" . $this->id.".pdf";
 				$this->pdf_filename = $file;
@@ -581,15 +605,13 @@ 
 				}
 
 				return 1;
-			}
-			else
+			} else
 			{
 				dol_syslog(get_class($this).'::Fetch no expedition found', LOG_ERR);
 				$this->error='Delivery with id '.$id.' not found';
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -1;
@@ -638,11 +660,12 @@ 
 		$result=$soc->set_as_client();
 
 		// Define new ref
-		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
+		if (! $error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) {
+			// empty should not happened, but when it occurs, the test save life
 		{
 			$numref = $this->getNextNumRef($soc);
 		}
-		else
+		} else
 		{
 			$numref = "EXP".$this->id;
 		}
@@ -695,12 +718,13 @@ 
 					if (empty($obj->edbrowid))
 					{
 						$qty = $obj->qty;
-					}
-					else
+					} else
 					{
 						$qty = $obj->edbqty;
 					}
-					if ($qty <= 0) continue;
+					if ($qty <= 0) {
+						continue;
+					}
 					dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 					//var_dump($this->lines[$i]);
@@ -719,8 +743,7 @@ 
 							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// line with batch detail
 
@@ -735,8 +758,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				$this->db->rollback();
 				$this->error=$this->db->error();
@@ -807,8 +829,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			foreach($this->errors as $errmsg)
 			{
@@ -842,16 +863,17 @@ 
 				if ($result > 0)
 				{
 					return $result;
-				}
-				else
+				} else
 				{
 					$this->error=$delivery->error;
 					return $result;
 				}
+			} else {
+				return 0;
 			}
-			else return 0;
+		} else {
+			return 0;
 		}
-		else return 0;
 	}
 
 	/**
@@ -899,9 +921,9 @@ 
 				if ($entrepot_id > 0) {
 					$product->load_stock('warehouseopen');
 					$product_stock = $product->stock_warehouse[$entrepot_id]->real;
+				} else {
+									$product_stock = $product->stock_reel;
 				}
-				else
-					$product_stock = $product->stock_reel;
 
 				$product_type=$product->type;
 				if ($product_type == 0 && $product_stock < $qty)
@@ -922,8 +944,10 @@ 
 		}
 
 		// extrafields
-		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+			// For avoid conflicts if trigger used
 			$line->array_options = $array_options;
+		}
 
 		$this->lines[$num] = $line;
 	}
@@ -987,8 +1011,10 @@ 
 			$line->detail_batch=$tab;
 
 			// extrafields
-			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) // For avoid conflicts if trigger used
+			if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options)>0) {
+				// For avoid conflicts if trigger used
 				$line->array_options = $array_options;
+			}
 
 			//var_dump($line);
 			$this->lines[$num] = $line;
@@ -1010,25 +1036,63 @@ 
 
 		// Clean parameters
 
-		if (isset($this->ref)) $this->ref=trim($this->ref);
-		if (isset($this->entity)) $this->entity=trim($this->entity);
-		if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
-		if (isset($this->socid)) $this->socid=trim($this->socid);
-		if (isset($this->fk_user_author)) $this->fk_user_author=trim($this->fk_user_author);
-		if (isset($this->fk_user_valid)) $this->fk_user_valid=trim($this->fk_user_valid);
-		if (isset($this->fk_delivery_address)) $this->fk_delivery_address=trim($this->fk_delivery_address);
-		if (isset($this->shipping_method_id)) $this->shipping_method_id=trim($this->shipping_method_id);
-		if (isset($this->tracking_number)) $this->tracking_number=trim($this->tracking_number);
-		if (isset($this->statut)) $this->statut=(int) $this->statut;
-		if (isset($this->trueDepth)) $this->trueDepth=trim($this->trueDepth);
-		if (isset($this->trueWidth)) $this->trueWidth=trim($this->trueWidth);
-		if (isset($this->trueHeight)) $this->trueHeight=trim($this->trueHeight);
-		if (isset($this->size_units)) $this->size_units=trim($this->size_units);
-		if (isset($this->weight_units)) $this->weight_units=trim($this->weight_units);
-		if (isset($this->trueWeight)) $this->weight=trim($this->trueWeight);
-		if (isset($this->note_private)) $this->note=trim($this->note_private);
-		if (isset($this->note_public)) $this->note=trim($this->note_public);
-		if (isset($this->modelpdf)) $this->modelpdf=trim($this->modelpdf);
+		if (isset($this->ref)) {
+			$this->ref=trim($this->ref);
+		}
+		if (isset($this->entity)) {
+			$this->entity=trim($this->entity);
+		}
+		if (isset($this->ref_customer)) {
+			$this->ref_customer=trim($this->ref_customer);
+		}
+		if (isset($this->socid)) {
+			$this->socid=trim($this->socid);
+		}
+		if (isset($this->fk_user_author)) {
+			$this->fk_user_author=trim($this->fk_user_author);
+		}
+		if (isset($this->fk_user_valid)) {
+			$this->fk_user_valid=trim($this->fk_user_valid);
+		}
+		if (isset($this->fk_delivery_address)) {
+			$this->fk_delivery_address=trim($this->fk_delivery_address);
+		}
+		if (isset($this->shipping_method_id)) {
+			$this->shipping_method_id=trim($this->shipping_method_id);
+		}
+		if (isset($this->tracking_number)) {
+			$this->tracking_number=trim($this->tracking_number);
+		}
+		if (isset($this->statut)) {
+			$this->statut=(int) $this->statut;
+		}
+		if (isset($this->trueDepth)) {
+			$this->trueDepth=trim($this->trueDepth);
+		}
+		if (isset($this->trueWidth)) {
+			$this->trueWidth=trim($this->trueWidth);
+		}
+		if (isset($this->trueHeight)) {
+			$this->trueHeight=trim($this->trueHeight);
+		}
+		if (isset($this->size_units)) {
+			$this->size_units=trim($this->size_units);
+		}
+		if (isset($this->weight_units)) {
+			$this->weight_units=trim($this->weight_units);
+		}
+		if (isset($this->trueWeight)) {
+			$this->weight=trim($this->trueWeight);
+		}
+		if (isset($this->note_private)) {
+			$this->note=trim($this->note_private);
+		}
+		if (isset($this->note_public)) {
+			$this->note=trim($this->note_public);
+		}
+		if (isset($this->modelpdf)) {
+			$this->modelpdf=trim($this->modelpdf);
+		}
 
 
 
@@ -1092,8 +1156,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -1173,8 +1236,7 @@ 
 							$error++;$this->errors=$this->errors + $mouvS->errors;
 							break;
 						}
-					}
-					else
+					} else
 					{
 						// We increment stock of batches
 						// We use warehouse selected for each line
@@ -1187,11 +1249,13 @@ 
 								break;
 							}
 						}
-						if ($error) break; // break for loop incase of error
+						if ($error) {
+							break;
+						}
+						// break for loop incase of error
 					}
 				}
-			}
-			else
+			} else
 			{
 				$error++;$this->errors[]="Error ".$this->db->lasterror();
 			}
@@ -1215,7 +1279,9 @@ 
 			{
 				// Delete linked object
 				$res = $this->deleteObjectLinked();
-				if ($res < 0) $error++;
+				if ($res < 0) {
+					$error++;
+				}
 
 				if (! $error)
 				{
@@ -1233,10 +1299,12 @@ 
 						{
 						    $this->fetch_origin();
 						    $origin=$this->origin;
-						    if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS)     // If order source of shipment is "shipment in progress"
+						    if ($this->$origin->statut == Commande::STATUS_SHIPMENTONPROCESS) {
+						    	// If order source of shipment is "shipment in progress"
 						    {
                                 // Check if there is no more shipment. If not, we can move back status of order to "validated" instead of "shipment in progress"
 						        $this->$origin->loadExpeditions();
+						    }
 						        //var_dump($this->$origin->expeditions);exit;
 						        if (count($this->$origin->expeditions) <= 0)
 						        {
@@ -1273,35 +1341,30 @@ 
 							}
 
 							return 1;
-						}
-						else
+						} else
 						{
 							$this->db->rollback();
 							return -1;
 						}
-					}
-					else
+					} else
 					{
 						$this->error=$this->db->lasterror()." - sql=$sql";
 						$this->db->rollback();
 						return -3;
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror()." - sql=$sql";
 					$this->db->rollback();
 					return -2;
 				}
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->lasterror()." - sql=$sql";
 				$this->db->rollback();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -1448,8 +1511,7 @@ 
 	                    if ($originline != $obj->fk_origin_line)
 	                    {
 	                        $line->detail_batch = $newdetailbatch;
-	                    }
-	                    else
+	                    } else
 						{
 	                        $line->detail_batch = array_merge($line->detail_batch, $newdetailbatch);
 	                    }
@@ -1460,8 +1522,7 @@ 
 				{
 				    $this->lines[$lineindex] = $line;
 				    $lineindex++;
-				}
-				else
+				} else
 				{
 				    $line->total_ht			+= $tabprice[0];
 				    $line->total_localtax1 	+= $tabprice[9];
@@ -1475,8 +1536,7 @@ 
 			}
 			$this->db->free($resql);
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error();
 			return -3;
@@ -1505,14 +1565,20 @@ 
 
 		$url = DOL_URL_ROOT.'/expedition/card.php?id='.$this->id;
 
-		if ($short) return $url;
+		if ($short) {
+			return $url;
+		}
 
 		if ($option !== 'nolink')
 		{
 			// Add param to save lastsearch_values or not
 			$add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
-			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) $add_save_lastsearch_values=1;
-			if ($add_save_lastsearch_values) $url.='&save_lastsearch_values=1';
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/',$_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values=1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url.='&save_lastsearch_values=1';
+			}
 		}
 
 		$linkclose='';
@@ -1532,8 +1598,12 @@ 
 
 		$picto='sending';
 
-		if ($withpicto) $result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
-		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto) {
+			$result.=($linkstart.img_object(($notooltip?'':$label), $picto, ($notooltip?'':'class="classfortooltip"'), 0, 0, $notooltip?0:1).$linkend);
+		}
+		if ($withpicto && $withpicto != 2) {
+			$result.=' ';
+		}
 		$result.=$linkstart.$this->ref.$linkend;
 		return $result;
 	}
@@ -1562,33 +1632,63 @@ 
 
 		if ($mode==0)
 		{
-			if ($statut==0) return $langs->trans($this->statuts[$statut]);
-			if ($statut==1)  return $langs->trans($this->statuts[$statut]);
-			if ($statut==2)  return $langs->trans($this->statuts[$statut]);
+			if ($statut==0) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+				return $langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==2) {
+				return $langs->trans($this->statuts[$statut]);
+			}
 		}
 		if ($mode==1)
 		{
-			if ($statut==0) return $langs->trans('StatusSendingDraftShort');
-			if ($statut==1) return $langs->trans('StatusSendingValidatedShort');
-			if ($statut==2) return $langs->trans('StatusSendingProcessedShort');
+			if ($statut==0) {
+				return $langs->trans('StatusSendingDraftShort');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusSendingValidatedShort');
+			}
+			if ($statut==2) {
+				return $langs->trans('StatusSendingProcessedShort');
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return img_picto($langs->trans('StatusSendingProcessed'),'statut6');
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			}
+			if ($statut==2) {
+				return img_picto($langs->trans('StatusSendingProcessed'),'statut6');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($statut==0) return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==1) return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
-			if ($statut==2) return img_picto($langs->trans('StatusSendingProcessed'),'statut6').' '.$langs->trans('StatusSendingProcessed');
+			if ($statut==0) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut0').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==1) {
+				return img_picto($langs->trans($this->statuts[$statut]),'statut4').' '.$langs->trans($this->statuts[$statut]);
+			}
+			if ($statut==2) {
+				return img_picto($langs->trans('StatusSendingProcessed'),'statut6').' '.$langs->trans('StatusSendingProcessed');
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($statut==0) return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
-			if ($statut==1) return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
-			if ($statut==2) return $langs->trans('StatusSendingProcessedShort').' '.img_picto($langs->trans('StatusSendingProcessedShort'),'statut6');
+			if ($statut==0) {
+				return $langs->trans('StatusSendingDraftShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut0');
+			}
+			if ($statut==1) {
+				return $langs->trans('StatusSendingValidatedShort').' '.img_picto($langs->trans($this->statuts[$statut]),'statut4');
+			}
+			if ($statut==2) {
+				return $langs->trans('StatusSendingProcessedShort').' '.img_picto($langs->trans('StatusSendingProcessedShort'),'statut6');
+			}
 		}
 	}
 
@@ -1693,14 +1793,12 @@ 
 			{
 				$this->date_delivery = $date_livraison;
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$this->db->error();
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			return -2;
 		}
@@ -1747,7 +1845,9 @@ 
 
         $sql = "SELECT em.rowid, em.code, em.libelle, em.description, em.tracking, em.active";
         $sql.= " FROM ".MAIN_DB_PREFIX."c_shipment_mode as em";
-        if ($id!='') $sql.= " WHERE em.rowid=".$id;
+        if ($id!='') {
+        	$sql.= " WHERE em.rowid=".$id;
+        }
 
         $resql = $this->db->query($sql);
         if ($resql)
@@ -1780,8 +1880,7 @@ 
             $sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
             $sql.=" VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
             $resql = $this->db->query($sql);
-        }
-        else
+        } else
         {
             $sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
             $sql.= " code='".$this->db->escape($this->update['code'])."'";
@@ -1791,7 +1890,9 @@ 
             $sql.= " WHERE rowid=".$id;
             $resql = $this->db->query($sql);
         }
-        if ($resql < 0) dol_print_error($this->db,'');
+        if ($resql < 0) {
+        	dol_print_error($this->db,'');
+        }
     }
 
     /**
@@ -1855,8 +1956,7 @@ 
 		{
 			$url = str_replace('{TRACKID}', $value, $tracking);
 			$this->tracking_url = sprintf('<a target="_blank" href="%s">'.($value?$value:'url').'</a>',$url,$url);
-		}
-		else
+		} else
 		{
 			$this->tracking_url = $value;
 		}
@@ -1941,12 +2041,13 @@ 
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
+						} else
 						{
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+							continue;
+						}
 						dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						$mouvS = new MouvementStock($this->db);
@@ -1963,8 +2064,7 @@ 
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -1977,8 +2077,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -1993,8 +2092,7 @@ 
     			    $error++;
     			}
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
             $error++;
@@ -2004,8 +2102,7 @@ 
 		{
 		    $this->db->commit();
 		    return 1;
-		}
-		else
+		} else
 		{
 		    $this->db->rollback();
 		    return -1;
@@ -2047,8 +2144,7 @@ 
 		if (empty($error)) {
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;
@@ -2106,12 +2202,13 @@ 
 						if (empty($obj->edbrowid))
 						{
 							$qty = $obj->qty;
-						}
-						else
+						} else
 						{
 							$qty = $obj->edbqty;
 						}
-						if ($qty <= 0) continue;
+						if ($qty <= 0) {
+							continue;
+						}
 						dol_syslog(get_class($this)."::reopen expedition movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 						//var_dump($this->lines[$i]);
@@ -2129,8 +2226,7 @@ 
 							    $this->errors = $mouvS->errors;
 								$error++; break;
 							}
-						}
-						else
+						} else
 						{
 							// line with batch detail
 
@@ -2143,8 +2239,7 @@ 
 							}
 						}
 					}
-				}
-				else
+				} else
 				{
 					$this->error=$this->db->lasterror();
 					$error++;
@@ -2169,8 +2264,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->db->rollback();
 			return -1;

htdocs/fourn/class/api_supplier_invoices.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -277,7 +277,7 @@
     /**
      * Clean sensible object datas
      *
-     * @param   Object  $object    Object to clean
+     * @param   FactureFournisseur  $object    Object to clean
      * @return  array              Array of cleaned object properties
      */
     function _cleanObjectDatas($object) {

Spacing +40 added lines, -40 removed lines

@@ -63,16 +63,16 @@ 
      */
     function get($id)
     {
-		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
+		if (!DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
 			throw new RestException(401);
 		}
 
         $result = $this->invoice->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Supplier invoice not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
@@ -95,7 +95,7 @@ 
      *
 	 * @throws RestException
      */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
+    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids = '', $status = '', $sqlfilters = '') {
         global $db, $conf;
 
         $obj_ret = array();
@@ -105,24 +105,24 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
         $sql = "SELECT t.rowid";
         if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
+        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        $sql .= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= " AND t.fk_soc = sc.fk_soc";
+        if ($socids) $sql .= " AND t.fk_soc IN (".$socids.")";
+        if ($search_sale > 0) $sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
 
 		// Filter by status
-        if ($status == 'draft')     $sql.= " AND t.fk_statut IN (0)";
-        if ($status == 'unpaid')    $sql.= " AND t.fk_statut IN (1)";
-        if ($status == 'paid')      $sql.= " AND t.fk_statut IN (2)";
-        if ($status == 'cancelled') $sql.= " AND t.fk_statut IN (3)";
+        if ($status == 'draft')     $sql .= " AND t.fk_statut IN (0)";
+        if ($status == 'unpaid')    $sql .= " AND t.fk_statut IN (1)";
+        if ($status == 'paid')      $sql .= " AND t.fk_statut IN (2)";
+        if ($status == 'cancelled') $sql .= " AND t.fk_statut IN (3)";
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -131,23 +131,23 @@ 
         // Add sql filters
         if ($sqlfilters)
         {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
+            if (!DolibarrApi::_checkFilters($sqlfilters))
             {
                 throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
             }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+	        $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+            $sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
         }
 
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
+        $sql .= $db->order($sortfield, $sortorder);
+        if ($limit) {
             if ($page < 0)
             {
                 $page = 0;
             }
             $offset = $limit * $page;
 
-            $sql.= $db->plimit($limit + 1, $offset);
+            $sql .= $db->plimit($limit + 1, $offset);
         }
 
         $result = $db->query($sql);
@@ -160,7 +160,7 @@ 
             {
                 $obj = $db->fetch_object($result);
                 $invoice_static = new FactureFournisseur($db);
-                if($invoice_static->fetch($obj->rowid)) {
+                if ($invoice_static->fetch($obj->rowid)) {
                     $obj_ret[] = $this->_cleanObjectDatas($invoice_static);
                 }
                 $i++;
@@ -169,7 +169,7 @@ 
         else {
             throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
         }
-        if( ! count($obj_ret)) {
+        if (!count($obj_ret)) {
             throw new RestException(404, 'No supplier invoice found');
         }
 		return $obj_ret;
@@ -183,16 +183,16 @@ 
      */
     function post($request_data = NULL)
     {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401, "Insuffisant rights");
 		}
         // Check mandatory fields
         $result = $this->_validate($request_data);
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             $this->invoice->$field = $value;
         }
-        if(! array_keys($request_data,'date')) {
+        if (!array_keys($request_data, 'date')) {
             $this->invoice->date = dol_now();
         }
         /* We keep lines as an array
@@ -219,26 +219,26 @@ 
      */
     function put($id, $request_data = NULL)
     {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401);
 		}
 
         $result = $this->invoice->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Supplier invoice not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach($request_data as $field => $value) {
+        foreach ($request_data as $field => $value) {
             if ($field == 'id') continue;
             $this->invoice->$field = $value;
         }
 
-        if($this->invoice->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
+        if ($this->invoice->update($id, DolibarrApiAccess::$user))
+            return $this->get($id);
 
         return false;
     }
@@ -251,19 +251,19 @@ 
      */
     function delete($id)
     {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
+        if (!DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
 			throw new RestException(401);
 		}
         $result = $this->invoice->fetch($id);
-        if( ! $result ) {
+        if (!$result) {
             throw new RestException(404, 'Supplier invoice not found');
         }
 
-		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( $this->invoice->delete(DolibarrApiAccess::$user) < 0)
+        if ($this->invoice->delete(DolibarrApiAccess::$user) < 0)
         {
             throw new RestException(500);
         }
@@ -295,17 +295,17 @@ 
      *   "notrigger": 0
      * }
      */
-    function validate($id, $idwarehouse=0, $notrigger=0)
+    function validate($id, $idwarehouse = 0, $notrigger = 0)
     {
-    	if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+    	if (!DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
     		throw new RestException(401);
     	}
     	$result = $this->invoice->fetch($id);
-    	if( ! $result ) {
+    	if (!$result) {
     		throw new RestException(404, 'Invoice not found');
     	}
 
-		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
+		if (!DolibarrApi::_checkAccessToResource('fournisseur', $this->invoice->id, 'facture_fourn', 'facture')) {
     		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
     	}
 

Indentation +281 added lines, -281 removed lines

@@ -28,174 +28,174 @@ 
  */
 class SupplierInvoices extends DolibarrApi
 {
-    /**
-     *
-     * @var array   $FIELDS     Mandatory fields, checked when create and update object
-     */
-    static $FIELDS = array(
-        'socid'
-    );
-
-    /**
-     * @var FactureFournisseur $invoice {@type FactureFournisseur}
-     */
-    public $invoice;
-
-    /**
-     * Constructor
-     */
-    function __construct()
-    {
+	/**
+	 *
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	static $FIELDS = array(
+		'socid'
+	);
+
+	/**
+	 * @var FactureFournisseur $invoice {@type FactureFournisseur}
+	 */
+	public $invoice;
+
+	/**
+	 * Constructor
+	 */
+	function __construct()
+	{
 		global $db, $conf;
 		$this->db = $db;
-        $this->invoice = new FactureFournisseur($this->db);
-    }
-
-    /**
-     * Get properties of a supplier invoice object
-     *
-     * Return an array with supplier invoice information
-     *
-     * @param 	int 	$id ID of supplier invoice
-     * @return 	array|mixed data without useless information
-     *
-     * @throws 	RestException
-     */
-    function get($id)
-    {
+		$this->invoice = new FactureFournisseur($this->db);
+	}
+
+	/**
+	 * Get properties of a supplier invoice object
+	 *
+	 * Return an array with supplier invoice information
+	 *
+	 * @param 	int 	$id ID of supplier invoice
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	function get($id)
+	{
 		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->lire) {
 			throw new RestException(401);
 		}
 
-        $result = $this->invoice->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
 		return $this->_cleanObjectDatas($this->invoice);
-    }
-
-    /**
-     * List invoices
-     *
-     * Get a list of supplier invoices
-     *
-     * @param string	$sortfield	      Sort field
-     * @param string	$sortorder	      Sort order
-     * @param int		$limit		      Limit for list
-     * @param int		$page		      Page number
-     * @param string   	$thirdparty_ids	  Thirdparty ids to filter invoices of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
-     * @param string	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
-     * @param string    $sqlfilters       Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
-     * @return array                      Array of invoice objects
-     *
+	}
+
+	/**
+	 * List invoices
+	 *
+	 * Get a list of supplier invoices
+	 *
+	 * @param string	$sortfield	      Sort field
+	 * @param string	$sortorder	      Sort order
+	 * @param int		$limit		      Limit for list
+	 * @param int		$page		      Page number
+	 * @param string   	$thirdparty_ids	  Thirdparty ids to filter invoices of. {@example '1' or '1,2,3'} {@pattern /^[0-9,]*$/i}
+	 * @param string	$status		      Filter by invoice status : draft | unpaid | paid | cancelled
+	 * @param string    $sqlfilters       Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.datec:<:'20160101')"
+	 * @return array                      Array of invoice objects
+	 *
 	 * @throws RestException
-     */
-    function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
-        global $db, $conf;
+	 */
+	function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 0, $page = 0, $thirdparty_ids='', $status='', $sqlfilters = '') {
+		global $db, $conf;
 
-        $obj_ret = array();
+		$obj_ret = array();
 
-        // case of external user, $thirdparty_ids param is ignored and replaced by user's socid
-        $socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->societe_id ? DolibarrApiAccess::$user->societe_id : $thirdparty_ids;
 
-        // If the internal user must only see his customers, force searching by him
-        $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
 
-        $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
-        $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 
-        $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+		$sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
+		if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
+		if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
 
 		// Filter by status
-        if ($status == 'draft')     $sql.= " AND t.fk_statut IN (0)";
-        if ($status == 'unpaid')    $sql.= " AND t.fk_statut IN (1)";
-        if ($status == 'paid')      $sql.= " AND t.fk_statut IN (2)";
-        if ($status == 'cancelled') $sql.= " AND t.fk_statut IN (3)";
-        // Insert sale filter
-        if ($search_sale > 0)
-        {
-            $sql .= " AND sc.fk_user = ".$search_sale;
-        }
-        // Add sql filters
-        if ($sqlfilters)
-        {
-            if (! DolibarrApi::_checkFilters($sqlfilters))
-            {
-                throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
-            }
-	        $regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
-            $sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
-        }
-
-        $sql.= $db->order($sortfield, $sortorder);
-        if ($limit)	{
-            if ($page < 0)
-            {
-                $page = 0;
-            }
-            $offset = $limit * $page;
-
-            $sql.= $db->plimit($limit + 1, $offset);
-        }
-
-        $result = $db->query($sql);
-        if ($result)
-        {
-            $i = 0;
-            $num = $db->num_rows($result);
-            $min = min($num, ($limit <= 0 ? $num : $limit));
-            while ($i < $min)
-            {
-                $obj = $db->fetch_object($result);
-                $invoice_static = new FactureFournisseur($db);
-                if($invoice_static->fetch($obj->rowid)) {
-                    $obj_ret[] = $this->_cleanObjectDatas($invoice_static);
-                }
-                $i++;
-            }
-        }
-        else {
-            throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
-        }
-        if( ! count($obj_ret)) {
-            throw new RestException(404, 'No supplier invoice found');
-        }
+		if ($status == 'draft')     $sql.= " AND t.fk_statut IN (0)";
+		if ($status == 'unpaid')    $sql.= " AND t.fk_statut IN (1)";
+		if ($status == 'paid')      $sql.= " AND t.fk_statut IN (2)";
+		if ($status == 'cancelled') $sql.= " AND t.fk_statut IN (3)";
+		// Insert sale filter
+		if ($search_sale > 0)
+		{
+			$sql .= " AND sc.fk_user = ".$search_sale;
+		}
+		// Add sql filters
+		if ($sqlfilters)
+		{
+			if (! DolibarrApi::_checkFilters($sqlfilters))
+			{
+				throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
+			}
+			$regexstring='\(([^:\'\(\)]+:[^:\'\(\)]+:[^:\(\)]+)\)';
+			$sql.=" AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql.= $db->order($sortfield, $sortorder);
+		if ($limit)	{
+			if ($page < 0)
+			{
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql.= $db->plimit($limit + 1, $offset);
+		}
+
+		$result = $db->query($sql);
+		if ($result)
+		{
+			$i = 0;
+			$num = $db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			while ($i < $min)
+			{
+				$obj = $db->fetch_object($result);
+				$invoice_static = new FactureFournisseur($db);
+				if($invoice_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($invoice_static);
+				}
+				$i++;
+			}
+		}
+		else {
+			throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
+		}
+		if( ! count($obj_ret)) {
+			throw new RestException(404, 'No supplier invoice found');
+		}
 		return $obj_ret;
-    }
-
-    /**
-     * Create supplier invoice object
-     *
-     * @param array $request_data   Request datas
-     * @return int  ID of supplier invoice
-     */
-    function post($request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+	}
+
+	/**
+	 * Create supplier invoice object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of supplier invoice
+	 */
+	function post($request_data = NULL)
+	{
+		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401, "Insuffisant rights");
 		}
-        // Check mandatory fields
-        $result = $this->_validate($request_data);
-
-        foreach($request_data as $field => $value) {
-            $this->invoice->$field = $value;
-        }
-        if(! array_keys($request_data,'date')) {
-            $this->invoice->date = dol_now();
-        }
-        /* We keep lines as an array
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach($request_data as $field => $value) {
+			$this->invoice->$field = $value;
+		}
+		if(! array_keys($request_data,'date')) {
+			$this->invoice->date = dol_now();
+		}
+		/* We keep lines as an array
          if (isset($request_data["lines"])) {
             $lines = array();
             foreach ($request_data["lines"] as $line) {
@@ -204,158 +204,158 @@ 
             $this->invoice->lines = $lines;
         }*/
 
-        if ($this->invoice->create(DolibarrApiAccess::$user) < 0) {
-            throw new RestException(500, "Error creating order", array_merge(array($this->invoice->error), $this->invoice->errors));
-        }
-        return $this->invoice->id;
-    }
-
-    /**
-     * Update supplier invoice
-     *
-     * @param int   $id             Id of supplier invoice to update
-     * @param array $request_data   Datas
-     * @return int
-     */
-    function put($id, $request_data = NULL)
-    {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+		if ($this->invoice->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating order", array_merge(array($this->invoice->error), $this->invoice->errors));
+		}
+		return $this->invoice->id;
+	}
+
+	/**
+	 * Update supplier invoice
+	 *
+	 * @param int   $id             Id of supplier invoice to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 */
+	function put($id, $request_data = NULL)
+	{
+		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
 			throw new RestException(401);
 		}
 
-        $result = $this->invoice->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
-            $this->invoice->$field = $value;
-        }
-
-        if($this->invoice->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
-
-        return false;
-    }
-
-    /**
-     * Delete supplier invoice
-     *
-     * @param int   $id Supplier invoice ID
-     * @return type
-     */
-    function delete($id)
-    {
-        if(! DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
+		foreach($request_data as $field => $value) {
+			if ($field == 'id') continue;
+			$this->invoice->$field = $value;
+		}
+
+		if($this->invoice->update($id, DolibarrApiAccess::$user))
+			return $this->get ($id);
+
+		return false;
+	}
+
+	/**
+	 * Delete supplier invoice
+	 *
+	 * @param int   $id Supplier invoice ID
+	 * @return type
+	 */
+	function delete($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->supprimer) {
 			throw new RestException(401);
 		}
-        $result = $this->invoice->fetch($id);
-        if( ! $result ) {
-            throw new RestException(404, 'Supplier invoice not found');
-        }
+		$result = $this->invoice->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Supplier invoice not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-        if( $this->invoice->delete(DolibarrApiAccess::$user) < 0)
-        {
-            throw new RestException(500);
-        }
-
-         return array(
-            'success' => array(
-                'code' => 200,
-                'message' => 'Supplier invoice deleted'
-            )
-        );
-    }
-
-
-    /**
-     * Validate an order
-     *
-     * @param   int $id             Order ID
-     * @param   int $idwarehouse    Warehouse ID
-     * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
-     *
-     * @url POST    {id}/validate
-     *
-     * @return  array
-     * FIXME An error 403 is returned if the request has an empty body.
-     * Error message: "Forbidden: Content type `text/plain` is not supported."
-     * Workaround: send this in the body
-     * {
-     *   "idwarehouse": 0,
-     *   "notrigger": 0
-     * }
-     */
-    function validate($id, $idwarehouse=0, $notrigger=0)
-    {
-    	if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
-    		throw new RestException(401);
-    	}
-    	$result = $this->invoice->fetch($id);
-    	if( ! $result ) {
-    		throw new RestException(404, 'Invoice not found');
-    	}
+		if( $this->invoice->delete(DolibarrApiAccess::$user) < 0)
+		{
+			throw new RestException(500);
+		}
+
+		 return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Supplier invoice deleted'
+			)
+		);
+	}
+
+
+	/**
+	 * Validate an order
+	 *
+	 * @param   int $id             Order ID
+	 * @param   int $idwarehouse    Warehouse ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * FIXME An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "idwarehouse": 0,
+	 *   "notrigger": 0
+	 * }
+	 */
+	function validate($id, $idwarehouse=0, $notrigger=0)
+	{
+		if(! DolibarrApiAccess::$user->rights->fournisseur->facture->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->invoice->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Invoice not found');
+		}
 
 		if( ! DolibarrApi::_checkAccessToResource('fournisseur',$this->invoice->id,'facture_fourn','facture')) {
-    		throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
-    	}
-
-    	$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
-    	if ($result == 0) {
-    		throw new RestException(500, 'Error nothing done. May be object is already validated');
-    	}
-    	if ($result < 0) {
-    		throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
-    	}
-
-    	return array(
-	    	'success' => array(
-		    	'code' => 200,
-		    	'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
-	    	)
-    	);
-    }
-
-    /**
-     * Clean sensible object datas
-     *
-     * @param   Object  $object    Object to clean
-     * @return  array              Array of cleaned object properties
-     */
-    function _cleanObjectDatas($object) {
-
-        $object = parent::_cleanObjectDatas($object);
-
-        unset($object->rowid);
-
-        return $object;
-    }
-
-    /**
-     * Validate fields before create or update object
-     *
-     * @param array $data   Datas to validate
-     * @return array
-     *
-     * @throws RestException
-     */
-    function _validate($data)
-    {
-        $invoice = array();
-        foreach (SupplierInvoices::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
-            $invoice[$field] = $data[$field];
-        }
-        return $invoice;
-    }
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->invoice->validate(DolibarrApiAccess::$user, '', $idwarehouse, $notrigger);
+		if ($result == 0) {
+			throw new RestException(500, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Invoice: '.$this->invoice->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Invoice validated (Ref='.$this->invoice->ref.')'
+			)
+		);
+	}
+
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object    Object to clean
+	 * @return  array              Array of cleaned object properties
+	 */
+	function _cleanObjectDatas($object) {
+
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->rowid);
+
+		return $object;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param array $data   Datas to validate
+	 * @return array
+	 *
+	 * @throws RestException
+	 */
+	function _validate($data)
+	{
+		$invoice = array();
+		foreach (SupplierInvoices::$FIELDS as $field) {
+			if (!isset($data[$field]))
+				throw new RestException(400, "$field field missing");
+			$invoice[$field] = $data[$field];
+		}
+		return $invoice;
+	}
 }

Braces +43 added lines, -17 removed lines

@@ -105,24 +105,47 @@ 
 
         // If the internal user must only see his customers, force searching by him
         $search_sale = 0;
-        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) $search_sale = DolibarrApiAccess::$user->id;
+        if (! DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+        	$search_sale = DolibarrApiAccess::$user->id;
+        }
 
         $sql = "SELECT t.rowid";
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+        	$sql .= ", sc.fk_soc, sc.fk_user";
+        }
+        // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
         $sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as t";
 
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+        	$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+        }
+        // We need this table joined to the select in order to filter by sale
 
         $sql.= ' WHERE t.entity IN ('.getEntity('supplier_invoice').')';
-        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) $sql.= " AND t.fk_soc = sc.fk_soc";
-        if ($socids) $sql.= " AND t.fk_soc IN (".$socids.")";
-        if ($search_sale > 0) $sql.= " AND t.rowid = sc.fk_soc";		// Join for the needed table to filter by sale
+        if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+        	$sql.= " AND t.fk_soc = sc.fk_soc";
+        }
+        if ($socids) {
+        	$sql.= " AND t.fk_soc IN (".$socids.")";
+        }
+        if ($search_sale > 0) {
+        	$sql.= " AND t.rowid = sc.fk_soc";
+        }
+        // Join for the needed table to filter by sale
 
 		// Filter by status
-        if ($status == 'draft')     $sql.= " AND t.fk_statut IN (0)";
-        if ($status == 'unpaid')    $sql.= " AND t.fk_statut IN (1)";
-        if ($status == 'paid')      $sql.= " AND t.fk_statut IN (2)";
-        if ($status == 'cancelled') $sql.= " AND t.fk_statut IN (3)";
+        if ($status == 'draft') {
+        	$sql.= " AND t.fk_statut IN (0)";
+        }
+        if ($status == 'unpaid') {
+        	$sql.= " AND t.fk_statut IN (1)";
+        }
+        if ($status == 'paid') {
+        	$sql.= " AND t.fk_statut IN (2)";
+        }
+        if ($status == 'cancelled') {
+        	$sql.= " AND t.fk_statut IN (3)";
+        }
         // Insert sale filter
         if ($search_sale > 0)
         {
@@ -165,8 +188,7 @@ 
                 }
                 $i++;
             }
-        }
-        else {
+        } else {
             throw new RestException(503, 'Error when retrieve supplier invoice list : '.$db->lasterror());
         }
         if( ! count($obj_ret)) {
@@ -233,12 +255,15 @@ 
 		}
 
         foreach($request_data as $field => $value) {
-            if ($field == 'id') continue;
+            if ($field == 'id') {
+            	continue;
+            }
             $this->invoice->$field = $value;
         }
 
-        if($this->invoice->update($id, DolibarrApiAccess::$user))
-            return $this->get ($id);
+        if($this->invoice->update($id, DolibarrApiAccess::$user)) {
+                    return $this->get ($id);
+        }
 
         return false;
     }
@@ -352,8 +377,9 @@ 
     {
         $invoice = array();
         foreach (SupplierInvoices::$FIELDS as $field) {
-            if (!isset($data[$field]))
-                throw new RestException(400, "$field field missing");
+            if (!isset($data[$field])) {
+                            throw new RestException(400, "$field field missing");
+            }
             $invoice[$field] = $data[$field];
         }
         return $invoice;

htdocs/core/class/html.formprojet.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -446,7 +446,7 @@
 	 *    Build a HTML select list of element of same thirdparty to suggest to link them to project
 	 *
 	 *    @param	string		$table_element		Table of the element to update
-	 *    @param	string		$socid				If of thirdparty to use as filter or 'id1,id2,...'
+	 *    @param	integer		$socid				If of thirdparty to use as filter or 'id1,id2,...'
 	 *    @param	string		$morecss			More CSS
 	 *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
 	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO

Indentation +33 added lines, -33 removed lines

@@ -94,18 +94,18 @@ 
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
 			if ($discard_closed)
 			{
-			    if (class_exists('Form'))
-			    {
-    			    if (empty($form)) $form=new Form($this->db);
-                    $out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
-			    }
+				if (class_exists('Form'))
+				{
+					if (empty($form)) $form=new Form($this->db);
+					$out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
+				}
 			}
 		}
 
 		if (empty($nooutput))
 		{
-		    print $out;
-		    return '';
+			print $out;
+			return '';
 		}
 		else return $out;
 	}
@@ -120,8 +120,8 @@ 
 	 * @param  int     $option_only	       Return only html options lines without the select tag
 	 * @param  int     $show_empty		   Add an empty line
 	 * @param  int     $discard_closed     Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     * @param  int     $forcefocus		   Force focus on field (works with javascript only)
-     * @param  int     $disabled           Disabled
+	 * @param  int     $forcefocus		   Force focus on field (works with javascript only)
+	 * @param  int     $disabled           Disabled
 	 * @param  int     $mode               0 for HTML mode and 1 for array return (to be used by json_encode for example)
 	 * @param  string  $filterkey          Key to filter
 	 * @param  int     $nooutput           No print output. Return it only.
@@ -138,7 +138,7 @@ 
 		if (empty($htmlid)) $htmlid = $htmlname;
 
 		$out='';
-        $outarray=array();
+		$outarray=array();
 
 		$hideunselectables = false;
 		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
@@ -158,11 +158,11 @@ 
 		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    {
-		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
-		    }
+			if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+			else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+			{
+				$sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+			}
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		$sql.= " ORDER BY p.ref ASC";
@@ -176,9 +176,9 @@ 
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth100 maxwidth300';
+			   	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
+				$out.=$comboenhancement;
+				$morecss='minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
@@ -213,8 +213,8 @@ 
 						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
 						if ($obj->name)
 						{
-						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+							$labeltoshow.=' - '.$obj->name;
+							if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
 						}
 
 						$disabled=0;
@@ -277,8 +277,8 @@ 
 				if (empty($option_only)) $out.= '</select>';
 				if (empty($nooutput))
 				{
-				    print $out;
-				    return '';
+					print $out;
+					return '';
 				}
 				else return $out;
 			} else {
@@ -302,8 +302,8 @@ 
 	 *	@param	int		$option_only	Return only html options lines without the select tag
 	 *	@param	string	$show_empty		Add an empty line ('1' or string to show for empty line)
 	 *  @param	int		$discard_closed Discard closed projects (0=Keep,1=hide completely,2=Disable)
-     *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-     *  @param	int		$disabled		Disabled
+	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
+	 *  @param	int		$disabled		Disabled
 	 *  @param	string	$morecss        More css added to the select component
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
@@ -345,9 +345,9 @@ 
 			if (! empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth200 maxwidth500';
+			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$out.=$comboenhancement;
+				$morecss='minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
@@ -484,7 +484,7 @@ 
 				break;
 			case "commande_fourn":
 			case "commande_fournisseur":
-			    $sql = "SELECT t.rowid, t.ref, t.ref_supplier";
+				$sql = "SELECT t.rowid, t.ref, t.ref_supplier";
 				break;
 			case "facture_rec":
 				$sql = "SELECT t.rowid, t.titre as ref";
@@ -501,10 +501,10 @@ 
 				break;*/
 				return '';
 			case "commande":
-		    case "contrat":
+			case "contrat":
 			case "fichinter":
-			    $sql = "SELECT t.rowid, t.ref";
-			    break;
+				$sql = "SELECT t.rowid, t.ref";
+				break;
 			case 'stock_mouvement':
 				$sql = 'SELECT t.rowid, t.label as ref';
 				$projectkey='fk_origin';
@@ -520,8 +520,8 @@ 
 		$sql.= " WHERE ".$projectkey." is null";
 		if (! empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+			if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
+			else $sql.= " AND t.fk_soc IN (".$socid.")";
 		}
 		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
 		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";

Braces +136 added lines, -73 removed lines

@@ -88,15 +88,16 @@ 
 			));
 
 			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
-		}
-		else
+		} else
 		{
 			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
 			if ($discard_closed)
 			{
 			    if (class_exists('Form'))
 			    {
-    			    if (empty($form)) $form=new Form($this->db);
+    			    if (empty($form)) {
+    			    	$form=new Form($this->db);
+    			    }
                     $out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			    }
 			}
@@ -106,8 +107,9 @@ 
 		{
 		    print $out;
 		    return '';
+		} else {
+			return $out;
 		}
-		else return $out;
 	}
 
 	/**
@@ -135,13 +137,17 @@ 
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		if (empty($htmlid)) $htmlid = $htmlname;
+		if (empty($htmlid)) {
+			$htmlid = $htmlname;
+		}
 
 		$out='';
         $outarray=array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
@@ -154,17 +160,26 @@ 
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
 		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
 		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($projectsListId !== false) {
+			$sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+			$sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+		    	$sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		    } else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all') {
+		    	// PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    {
 		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
+		    }
+		}
+		if (!empty($filterkey)) {
+			$sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		}
-		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
 		$sql.= " ORDER BY p.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -198,12 +213,13 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
-						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) // We discard closed except if selected
+						if ($discard_closed == 1 && $obj->fk_statut == 2 && $obj->rowid != $selected) {
+							// We discard closed except if selected
 						{
 							$i++;
+						}
 							continue;
 						}
 
@@ -214,7 +230,9 @@ 
 						if ($obj->name)
 						{
 						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						    if ($obj->name_alias) {
+						    	$labeltoshow.=' ('.$obj->name_alias.')';
+						    }
 						}
 
 						$disabled=0;
@@ -222,13 +240,13 @@ 
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
+						} else if ($obj->fk_statut == 2)
 						{
-							if ($discard_close == 2) $disabled=1;
+							if ($discard_close == 2) {
+								$disabled=1;
+							}
 							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -239,17 +257,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+									$resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>';
@@ -274,18 +292,20 @@ 
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
+				if (empty($option_only)) {
+					$out.= '</select>';
+				}
 				if (empty($nooutput))
 				{
 				    print $out;
 				    return '';
+				} else {
+					return $out;
 				}
-				else return $out;
 			} else {
 				return $outarray;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -316,7 +336,9 @@ 
 		$out='';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) {
+			$hideunselectables = true;
+		}
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
@@ -333,9 +355,15 @@ 
 		$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
 		$sql.= " WHERE p.entity = ".$conf->entity;
 		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		if ($projectsListId !== false) {
+			$sql.= " AND p.rowid IN (".$projectsListId.")";
+		}
+		if ($socid == 0) {
+			$sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		}
+		if ($socid > 0) {
+			$sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY p.ref, t.ref ASC";
 
 		$resql=$this->db->query($sql);
@@ -355,8 +383,11 @@ 
 			}
 			if (! empty($show_empty)) {
 				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
+				if (! is_numeric($show_empty)) {
+					$out.=$show_empty;
+				} else {
+					$out.='&nbsp;';
+				}
 				$out.= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
@@ -370,8 +401,7 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && empty($user->rights->societe->lire))
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						if ($discard_closed == 1 && $obj->fk_statut == 2)
 						{
@@ -384,20 +414,22 @@ 
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
 
-						if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+						if ($obj->name) {
+							$labeltoshow.=' ('.$obj->name.')';
+						}
 
 						$disabled=0;
 						if ($obj->fk_statut == 0)
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("Draft");
-						}
-						else if ($obj->fk_statut == 2)
+						} else if ($obj->fk_statut == 2)
 						{
-							if ($discard_closed == 2) $disabled=1;
+							if ($discard_closed == 2) {
+								$disabled=1;
+							}
 							$labeltoshow.=' - '.$langs->trans("Closed");
-						}
-						else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						} else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
 							$disabled=1;
 							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
@@ -410,17 +442,17 @@ 
 							$out.= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
 							$out.= '>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+									$resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>';
@@ -441,8 +473,7 @@ 
 
 			$this->db->free($resql);
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -1;
@@ -463,10 +494,15 @@ 
 	{
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') {
+			return '';
+		}
+		// Special cas of element we never link to a project (already always done)
 
 		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','chargesociales'))) $linkedtothirdparty=true;
+		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','chargesociales'))) {
+			$linkedtothirdparty=true;
+		}
 
 		$sqlfilter='';
 		$projectkey="fk_projet";
@@ -514,18 +550,31 @@ 
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
+		if ($linkedtothirdparty) {
+			$sql.=", s.nom as name";
+		}
 		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
+		if ($linkedtothirdparty) {
+			$sql.=", ".MAIN_DB_PREFIX."societe as s";
+		}
 		$sql.= " WHERE ".$projectkey." is null";
 		if (! empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+		    if (is_numeric($socid)) {
+		    	$sql.= " AND t.fk_soc=".$socid;
+		    } else {
+		    	$sql.= " AND t.fk_soc IN (".$socid.")";
+		    }
+		}
+		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) {
+			$sql.= ' AND t.entity IN ('.getEntity('project').')';
+		}
+		if ($linkedtothirdparty) {
+			$sql.=" AND s.rowid = t.fk_soc";
+		}
+		if ($sqlfilter) {
+			$sql.= " AND ".$sqlfilter;
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
 		$sql.= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
@@ -542,8 +591,12 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
+					if (! empty($obj->ref_supplier)) {
+						$ref.=' ('.$obj->ref_supplier.')';
+					}
+					if (! empty($obj->name)) {
+						$ref.=' - '.$obj->name;
+					}
 					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
@@ -558,8 +611,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			$this->error=$this->db->lasterror();
@@ -599,25 +651,37 @@ 
 			if ($num > 0)
 			{
 				$sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-				if ($showempty) $sellist.= '<option value="-1">&nbsp;</option>';    // Without &nbsp, strange move of screen when switching value
-				if ($showallnone) $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
-				if ($showallnone) $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
-				if ($showallnone) $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
+				if ($showempty) {
+					$sellist.= '<option value="-1">&nbsp;</option>';
+				}
+				// Without &nbsp, strange move of screen when switching value
+				if ($showallnone) {
+					$sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
+				}
+				if ($showallnone) {
+					$sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
+				}
+				if ($showallnone) {
+					$sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
+				}
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
 					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
-					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
+					if ($obj->rowid == $preselected) {
+						$sellist .= ' selected="selected"';
+					}
 					$sellist .= '>';
 					if ($useshortlabel)
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatusShort".$obj->code) != "OppStatusShort".$obj->code ? $langs->transnoentitiesnoconv("OppStatusShort".$obj->code) : $obj->label);
-					}
-					else
+					} else
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+						if ($showpercent) {
+							$finallabel.= ' ('.$obj->percent.'%)';
+						}
 					}
 					$sellist .= $finallabel;
 					$sellist .='</option>';
@@ -634,8 +698,7 @@ 
 			$this->db->free($resql);
 
 			return $sellist;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errors[]=$this->db->lasterror();

Spacing +154 added lines, -154 removed lines

@@ -63,41 +63,41 @@ 
 	 *	@param  int     $htmlid         Html id to use instead of htmlname
 	 *	@return string           		Return html content
 	 */
-	function select_projects($socid=-1, $selected='', $htmlname='projectid', $maxlength=16, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode = 0, $filterkey = '', $nooutput=0, $forceaddid=0, $morecss='', $htmlid='')
+	function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '')
 	{
-		global $langs,$conf,$form;
+		global $langs, $conf, $form;
 
-		$out='';
+		$out = '';
 
-		if (! empty($conf->use_javascript_ajax) && ! empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
+		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT))
 		{
-			$placeholder='';
+			$placeholder = '';
 
 			if ($selected && empty($selected_input_value))
 			{
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$project = new Project($this->db);
 				$project->fetch($selected);
-				$selected_input_value=$project->ref;
+				$selected_input_value = $project->ref;
 			}
-			$urloption='socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
-			$out.=ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
+			$urloption = 'socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 //				'update' => array(
 //					'projectid' => 'id'
 //				)
 			));
 
-			$out.='<input type="text" class="minwidth200'.($morecss?' '.$morecss:'').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		}
 		else
 		{
-			$out.=$this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
+			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, $discard_closed, $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid);
 			if ($discard_closed)
 			{
 			    if (class_exists('Form'))
 			    {
-    			    if (empty($form)) $form=new Form($this->db);
-                    $out.=$form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
+    			    if (empty($form)) $form = new Form($this->db);
+                    $out .= $form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			    }
 			}
 		}
@@ -129,63 +129,63 @@ 
 	 * @param  int     $htmlid             Html id to use instead of htmlname
 	 * @return int         			       Nb of project if OK, <0 if KO
 	 */
-	function select_projects_list($socid=-1, $selected='', $htmlname='projectid', $maxlength=24, $option_only=0, $show_empty=1, $discard_closed=0, $forcefocus=0, $disabled=0, $mode=0, $filterkey = '', $nooutput=0, $forceaddid=0, $htmlid='')
+	function select_projects_list($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 24, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $htmlid = '')
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 		if (empty($htmlid)) $htmlid = $htmlname;
 
-		$out='';
-        $outarray=array();
+		$out = '';
+        $outarray = array();
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
 		{
-			$projectstatic=new Project($this->db);
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			$projectstatic = new Project($this->db);
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		}
 
 		// Search all projects
 		$sql = 'SELECT p.rowid, p.ref, p.title, p.fk_soc, p.fk_statut, p.public, s.nom as name, s.name_alias';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p LEFT JOIN '.MAIN_DB_PREFIX .'societe as s ON s.rowid = p.fk_soc';
-		$sql.= " WHERE p.entity IN (".getEntity('project').")";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$sql .= " WHERE p.entity IN (".getEntity('project').")";
+		if ($projectsListId !== false) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
 		if ($socid > 0)
 		{
-		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		    if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
 		    else if ($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')    // PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    {
-		        $sql.= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
+		        $sql .= " AND (p.fk_soc IN (".$socid.", ".$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") OR p.fk_soc IS NULL)";
 		    }
 		}
 		if (!empty($filterkey)) $sql .= natural_search(array('p.title', 'p.ref'), $filterkey);
-		$sql.= " ORDER BY p.ref ASC";
+		$sql .= " ORDER BY p.ref ASC";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$morecss='maxwidth500';
+			$morecss = 'maxwidth500';
 
 			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth100 maxwidth300';
+            	$out .= $comboenhancement;
+            	$morecss = 'minwidth100 maxwidth300';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlid.'" name="'.$htmlname.'">';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
 			if (!empty($show_empty)) {
-				$out.= '<option value="0">&nbsp;</option>';
+				$out .= '<option value="0">&nbsp;</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -195,7 +195,7 @@ 
 				{
 					$obj = $this->db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
@@ -207,56 +207,56 @@ 
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=', '.dol_trunc($obj->title, $maxlength);
+						$labeltoshow .= ', '.dol_trunc($obj->title, $maxlength);
 						if ($obj->name)
 						{
-						    $labeltoshow.=' - '.$obj->name;
-						    if ($obj->name_alias) $labeltoshow.=' ('.$obj->name_alias.')';
+						    $labeltoshow .= ' - '.$obj->name;
+						    if ($obj->name_alias) $labeltoshow .= ' ('.$obj->name_alias.')';
 						}
 
-						$disabled=0;
+						$disabled = 0;
 						if ($obj->fk_statut == 0)
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Draft");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Draft");
 						}
 						else if ($obj->fk_statut == 2)
 						{
-							if ($discard_close == 2) $disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Closed");
+							if ($discard_close == 2) $disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Closed");
 						}
-						else if ( empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						else if (empty($conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 						}
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 						else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.= $resultat;
+							$out .= $resultat;
 
 							$outarray[] = array(
 								'key' => (int) $obj->rowid,
@@ -274,7 +274,7 @@ 
 			$this->db->free($resql);
 
 			if (!$mode) {
-				if (empty($option_only)) $out.= '</select>';
+				if (empty($option_only)) $out .= '</select>';
 				if (empty($nooutput))
 				{
 				    print $out;
@@ -307,57 +307,57 @@ 
 	 *  @param	string	$morecss        More css added to the select component
 	 *	@return int         			Nbr of project if OK, <0 if KO
 	 */
-	function selectTasks($socid=-1, $selected='', $htmlname='taskid', $maxlength=24, $option_only=0, $show_empty='1', $discard_closed=0, $forcefocus=0, $disabled=0, $morecss='maxwidth500')
+	function selectTasks($socid = -1, $selected = '', $htmlname = 'taskid', $maxlength = 24, $option_only = 0, $show_empty = '1', $discard_closed = 0, $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
-		$out='';
+		$out = '';
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		$projectsListId = false;
 		if (empty($user->rights->projet->all->lire))
 		{
-			$projectstatic=new Project($this->db);
-			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,0,1);
+			$projectstatic = new Project($this->db);
+			$projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1);
 		}
 
 		// Search all projects
 		$sql = 'SELECT t.rowid, t.ref as tref, t.label as tlabel, p.ref, p.title, p.fk_soc, p.fk_statut, p.public,';
-		$sql.= ' s.nom as name';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'projet as p';
-		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
-		$sql.= ', '.MAIN_DB_PREFIX.'projet_task as t';
-		$sql.= " WHERE p.entity = ".$conf->entity;
-		$sql.= " AND t.fk_projet = p.rowid";
-		if ($projectsListId !== false) $sql.= " AND p.rowid IN (".$projectsListId.")";
-		if ($socid == 0) $sql.= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
-		$sql.= " ORDER BY p.ref, t.ref ASC";
-
-		$resql=$this->db->query($sql);
+		$sql .= ' s.nom as name';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'projet as p';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as s ON s.rowid = p.fk_soc';
+		$sql .= ', '.MAIN_DB_PREFIX.'projet_task as t';
+		$sql .= " WHERE p.entity = ".$conf->entity;
+		$sql .= " AND t.fk_projet = p.rowid";
+		if ($projectsListId !== false) $sql .= " AND p.rowid IN (".$projectsListId.")";
+		if ($socid == 0) $sql .= " AND (p.fk_soc=0 OR p.fk_soc IS NULL)";
+		if ($socid > 0)  $sql .= " AND (p.fk_soc=".$socid." OR p.fk_soc IS NULL)";
+		$sql .= " ORDER BY p.ref, t.ref ASC";
+
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			// Use select2 selector
-			if (! empty($conf->use_javascript_ajax))
+			if (!empty($conf->use_javascript_ajax))
 			{
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 	           	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
-            	$out.=$comboenhancement;
-            	$morecss='minwidth200 maxwidth500';
+            	$out .= $comboenhancement;
+            	$morecss = 'minwidth200 maxwidth500';
 			}
 
 			if (empty($option_only)) {
-				$out.= '<select class="valignmiddle flat'.($morecss?' '.$morecss:'').'"'.($disabled?' disabled="disabled"':'').' id="'.$htmlname.'" name="'.$htmlname.'">';
+				$out .= '<select class="valignmiddle flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlname.'" name="'.$htmlname.'">';
 			}
-			if (! empty($show_empty)) {
-				$out.= '<option value="0" class="optiongrey">';
-				if (! is_numeric($show_empty)) $out.=$show_empty;
-				else $out.='&nbsp;';
-				$out.= '</option>';
+			if (!empty($show_empty)) {
+				$out .= '<option value="0" class="optiongrey">';
+				if (!is_numeric($show_empty)) $out .= $show_empty;
+				else $out .= '&nbsp;';
+				$out .= '</option>';
 			}
 			$num = $this->db->num_rows($resql);
 			$i = 0;
@@ -379,62 +379,62 @@ 
 							continue;
 						}
 
-						$labeltoshow=dol_trunc($obj->ref,18);     // Project ref
+						$labeltoshow = dol_trunc($obj->ref, 18); // Project ref
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						$labeltoshow.=' '.dol_trunc($obj->title,$maxlength);
+						$labeltoshow .= ' '.dol_trunc($obj->title, $maxlength);
 
-						if ($obj->name) $labeltoshow.=' ('.$obj->name.')';
+						if ($obj->name) $labeltoshow .= ' ('.$obj->name.')';
 
-						$disabled=0;
+						$disabled = 0;
 						if ($obj->fk_statut == 0)
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Draft");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Draft");
 						}
 						else if ($obj->fk_statut == 2)
 						{
-							if ($discard_closed == 2) $disabled=1;
-							$labeltoshow.=' - '.$langs->trans("Closed");
+							if ($discard_closed == 2) $disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("Closed");
 						}
-						else if ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+						else if ($socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 						{
-							$disabled=1;
-							$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+							$disabled = 1;
+							$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 						}
 						// Label for task
-						$labeltoshow.=' - '.$obj->tref.' '.dol_trunc($obj->tlabel,$maxlength);
+						$labeltoshow .= ' - '.$obj->tref.' '.dol_trunc($obj->tlabel, $maxlength);
 
 						if (!empty($selected) && $selected == $obj->rowid)
 						{
-							$out.= '<option value="'.$obj->rowid.'" selected';
+							$out .= '<option value="'.$obj->rowid.'" selected';
 							//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
-							$out.= '>'.$labeltoshow.'</option>';
+							$out .= '>'.$labeltoshow.'</option>';
 						}
 						else
 						{
 							if ($hideunselectables && $disabled && ($selected != $obj->rowid))
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>';
-								$resultat.=$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>';
+								$resultat .= $labeltoshow;
+								$resultat .= '</option>';
 							}
-							$out.= $resultat;
+							$out .= $resultat;
 						}
 					}
 					$i++;
 				}
 			}
 			if (empty($option_only)) {
-				$out.= '</select>';
+				$out .= '</select>';
 			}
 
 			print $out;
@@ -459,17 +459,17 @@ 
 	 *    @param    int         $limitonstatus      Add filters to limit length of list to opened status (for example to avoid ERR_RESPONSE_HEADERS_TOO_BIG on project/element.php page). TODO To implement
 	 *    @return	int|string						The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function select_element($table_element, $socid=0, $morecss='', $limitonstatus=-2)
+	function select_element($table_element, $socid = 0, $morecss = '', $limitonstatus = -2)
 	{
 		global $conf, $langs;
 
-		if ($table_element == 'projet_task') return '';		// Special cas of element we never link to a project (already always done)
+		if ($table_element == 'projet_task') return ''; // Special cas of element we never link to a project (already always done)
 
-		$linkedtothirdparty=false;
-		if (! in_array($table_element, array('don','expensereport_det','expensereport','loan','stock_mouvement','chargesociales'))) $linkedtothirdparty=true;
+		$linkedtothirdparty = false;
+		if (!in_array($table_element, array('don', 'expensereport_det', 'expensereport', 'loan', 'stock_mouvement', 'chargesociales'))) $linkedtothirdparty = true;
 
-		$sqlfilter='';
-		$projectkey="fk_projet";
+		$sqlfilter = '';
+		$projectkey = "fk_projet";
 		//print $table_element;
 		switch ($table_element)
 		{
@@ -491,7 +491,7 @@ 
 				break;
 			case "actioncomm":
 				$sql = "SELECT t.id as rowid, t.label as ref";
-				$projectkey="fk_project";
+				$projectkey = "fk_project";
 				break;
 			case "expensereport":
 				return '';
@@ -507,7 +507,7 @@ 
 			    break;
 			case 'stock_mouvement':
 				$sql = 'SELECT t.rowid, t.label as ref';
-				$projectkey='fk_origin';
+				$projectkey = 'fk_origin';
 				break;
 			case "payment_various":
 				$sql = "SELECT t.rowid, t.num_payment as ref";
@@ -517,40 +517,40 @@ 
 				$sql = "SELECT t.rowid, t.ref";
 				break;
 		}
-		if ($linkedtothirdparty) $sql.=", s.nom as name";
-		$sql.= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
-		if ($linkedtothirdparty) $sql.=", ".MAIN_DB_PREFIX."societe as s";
-		$sql.= " WHERE ".$projectkey." is null";
-		if (! empty($socid) && $linkedtothirdparty)
+		if ($linkedtothirdparty) $sql .= ", s.nom as name";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$table_element." as t";
+		if ($linkedtothirdparty) $sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		$sql .= " WHERE ".$projectkey." is null";
+		if (!empty($socid) && $linkedtothirdparty)
 		{
-		    if (is_numeric($socid)) $sql.= " AND t.fk_soc=".$socid;
-		    else $sql.= " AND t.fk_soc IN (".$socid.")";
+		    if (is_numeric($socid)) $sql .= " AND t.fk_soc=".$socid;
+		    else $sql .= " AND t.fk_soc IN (".$socid.")";
 		}
-		if (! in_array($table_element, array('expensereport_det','stock_mouvement'))) $sql.= ' AND t.entity IN ('.getEntity('project').')';
-		if ($linkedtothirdparty) $sql.=" AND s.rowid = t.fk_soc";
-		if ($sqlfilter) $sql.= " AND ".$sqlfilter;
-		$sql.= " ORDER BY ref DESC";
+		if (!in_array($table_element, array('expensereport_det', 'stock_mouvement'))) $sql .= ' AND t.entity IN ('.getEntity('project').')';
+		if ($linkedtothirdparty) $sql .= " AND s.rowid = t.fk_soc";
+		if ($sqlfilter) $sql .= " AND ".$sqlfilter;
+		$sql .= " ORDER BY ref DESC";
 
 		dol_syslog(get_class($this).'::select_element', LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num > 0)
 			{
-				$sellist = '<select class="flat elementselect css'.$table_element.($morecss?' '.$morecss:'').'" name="elementselect">';
-				$sellist .='<option value="-1"></option>';
+				$sellist = '<select class="flat elementselect css'.$table_element.($morecss ? ' '.$morecss : '').'" name="elementselect">';
+				$sellist .= '<option value="-1"></option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
-					$ref=$obj->ref?$obj->ref:$obj->rowid;
-					if (! empty($obj->ref_supplier)) $ref.=' ('.$obj->ref_supplier.')';
-					if (! empty($obj->name)) $ref.=' - '.$obj->name;
-					$sellist .='<option value="'.$obj->rowid.'">'.$ref.'</option>';
+					$ref = $obj->ref ? $obj->ref : $obj->rowid;
+					if (!empty($obj->ref_supplier)) $ref .= ' ('.$obj->ref_supplier.')';
+					if (!empty($obj->name)) $ref .= ' - '.$obj->name;
+					$sellist .= '<option value="'.$obj->rowid.'">'.$ref.'</option>';
 					$i++;
 				}
-				$sellist .='</select>';
+				$sellist .= '</select>';
 			}
 			/*else
 			{
@@ -565,9 +565,9 @@ 
 		else
 		{
 			dol_print_error($this->db);
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::select_element " . $this->error, LOG_ERR);
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog(get_class($this)."::select_element ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -585,32 +585,32 @@ 
 	 *    @param   string      $morecss            Add more css
 	 *    @return  int|string                      The HTML select list of element or '' if nothing or -1 if KO
 	 */
-	function selectOpportunityStatus($htmlname, $preselected='-1', $showempty=1, $useshortlabel=0, $showallnone=0, $showpercent=0, $morecss='')
+	function selectOpportunityStatus($htmlname, $preselected = '-1', $showempty = 1, $useshortlabel = 0, $showallnone = 0, $showpercent = 0, $morecss = '')
 	{
 		global $conf, $langs;
 
 		$sql = "SELECT rowid, code, label, percent";
-		$sql.= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
-		$sql.= " WHERE active = 1";
-		$sql.= " ORDER BY position";
+		$sql .= " FROM ".MAIN_DB_PREFIX.'c_lead_status';
+		$sql .= " WHERE active = 1";
+		$sql .= " ORDER BY position";
 
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num > 0)
 			{
-				$sellist = '<select class="flat oppstatus'.($morecss?' '.$morecss:'').'" id="'.$htmlname.'" name="'.$htmlname.'">';
-				if ($showempty) $sellist.= '<option value="-1">&nbsp;</option>';    // Without &nbsp, strange move of screen when switching value
-				if ($showallnone) $sellist.= '<option value="all"'.($preselected == 'all'?' selected="selected"':'').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
-				if ($showallnone) $sellist.= '<option value="openedopp"'.($preselected == 'openedopp'?' selected="selected"':'').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
-				if ($showallnone) $sellist.= '<option value="none"'.($preselected == 'none'?' selected="selected"':'').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
+				$sellist = '<select class="flat oppstatus'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
+				if ($showempty) $sellist .= '<option value="-1">&nbsp;</option>'; // Without &nbsp, strange move of screen when switching value
+				if ($showallnone) $sellist .= '<option value="all"'.($preselected == 'all' ? ' selected="selected"' : '').'>--'.$langs->trans("OnlyOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist .= '<option value="openedopp"'.($preselected == 'openedopp' ? ' selected="selected"' : '').'>--'.$langs->trans("OpenedOpportunitiesShort").'--</option>';
+				if ($showallnone) $sellist .= '<option value="none"'.($preselected == 'none' ? ' selected="selected"' : '').'>--'.$langs->trans("NotAnOpportunityShort").'--</option>';
 				while ($i < $num)
 				{
 					$obj = $this->db->fetch_object($resql);
 
-					$sellist .='<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
+					$sellist .= '<option value="'.$obj->rowid.'" defaultpercent="'.$obj->percent.'" elemcode="'.$obj->code.'"';
 					if ($obj->rowid == $preselected) $sellist .= ' selected="selected"';
 					$sellist .= '>';
 					if ($useshortlabel)
@@ -620,13 +620,13 @@ 
 					else
 					{
 						$finallabel = ($langs->transnoentitiesnoconv("OppStatus".$obj->code) != "OppStatus".$obj->code ? $langs->transnoentitiesnoconv("OppStatus".$obj->code) : $obj->label);
-						if ($showpercent) $finallabel.= ' ('.$obj->percent.'%)';
+						if ($showpercent) $finallabel .= ' ('.$obj->percent.'%)';
 					}
 					$sellist .= $finallabel;
-					$sellist .='</option>';
+					$sellist .= '</option>';
 					$i++;
 				}
-				$sellist .='</select>';
+				$sellist .= '</select>';
 			}
 			/*else
 			{
@@ -640,9 +640,9 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errors[]=$this->db->lasterror();
-			dol_syslog(get_class($this) . "::selectOpportunityStatus " . $this->error, LOG_ERR);
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->db->lasterror();
+			dol_syslog(get_class($this)."::selectOpportunityStatus ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}

htdocs/compta/sociales/class/chargesociales.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -377,7 +377,7 @@ 
      *  Retourne le libelle du statut d'une charge (impaye, payee)
      *
      *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return	string        			Label
      */
     function getLibStatut($mode=0,$alreadypaid=-1)
@@ -390,7 +390,7 @@ 
      *
      *  @param	int		$statut        	Id statut
      *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
-	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
+	 *  @param  integer	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return string        			Label
      */
     function LibStatut($statut,$mode=0,$alreadypaid=-1)

Indentation +518 added lines, -518 removed lines

@@ -32,100 +32,100 @@ 
  */
 class ChargeSociales extends CommonObject
 {
-    public $element='chargesociales';
-    public $table='chargesociales';
-    public $table_element='chargesociales';
-    public $picto = 'bill';
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $table_ref_field = 'ref';
-
-    var $date_ech;
-    var $lib;
-    var $type;
-    var $type_libelle;
-    var $amount;
-    var $paye;
-    var $periode;
-    var $date_creation;
-    var $date_modification;
-    var $date_validation;
-    var $fk_account;
+	public $element='chargesociales';
+	public $table='chargesociales';
+	public $table_element='chargesociales';
+	public $picto = 'bill';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'ref';
+
+	var $date_ech;
+	var $lib;
+	var $type;
+	var $type_libelle;
+	var $amount;
+	var $paye;
+	var $periode;
+	var $date_creation;
+	var $date_modification;
+	var $date_validation;
+	var $fk_account;
 	var $fk_project;
 
 
-    /**
-     * Constructor
-     *
-     * @param	DoliDB		$db		Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-    /**
-     *  Retrouve et charge une charge sociale
-     *
-     *  @param	int     $id		Id
-     *  @param	string  $ref	Ref
-     *  @return	int <0 KO >0 OK
-     */
-    function fetch($id, $ref='')
-    {
-        $sql = "SELECT cs.rowid, cs.date_ech";
-        $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-        $sql.= ", cs.fk_account, cs.fk_mode_reglement";
-        $sql.= ", c.libelle";
-        $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
-        if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
-        else $sql.= " WHERE cs.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            if ($this->db->num_rows($resql))
-            {
-                $obj = $this->db->fetch_object($resql);
-
-                $this->id					= $obj->rowid;
-                $this->ref					= $obj->rowid;
-                $this->date_ech				= $this->db->jdate($obj->date_ech);
-                $this->lib					= $obj->lib;
-                $this->type					= $obj->fk_type;
-                $this->type_libelle			= $obj->libelle;
-                $this->fk_account			= $obj->fk_account;
-                $this->mode_reglement_id	= $obj->fk_mode_reglement;
-                $this->mode_reglement_code	= $obj->mode_reglement_code;
-                $this->mode_reglement		= $obj->mode_reglement_libelle;
-                $this->amount				= $obj->amount;
+	/**
+	 * Constructor
+	 *
+	 * @param	DoliDB		$db		Database handler
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+	/**
+	 *  Retrouve et charge une charge sociale
+	 *
+	 *  @param	int     $id		Id
+	 *  @param	string  $ref	Ref
+	 *  @return	int <0 KO >0 OK
+	 */
+	function fetch($id, $ref='')
+	{
+		$sql = "SELECT cs.rowid, cs.date_ech";
+		$sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
+		$sql.= ", cs.fk_account, cs.fk_mode_reglement";
+		$sql.= ", c.libelle";
+		$sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
+		$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
+		if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
+		else $sql.= " WHERE cs.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			if ($this->db->num_rows($resql))
+			{
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id					= $obj->rowid;
+				$this->ref					= $obj->rowid;
+				$this->date_ech				= $this->db->jdate($obj->date_ech);
+				$this->lib					= $obj->lib;
+				$this->type					= $obj->fk_type;
+				$this->type_libelle			= $obj->libelle;
+				$this->fk_account			= $obj->fk_account;
+				$this->mode_reglement_id	= $obj->fk_mode_reglement;
+				$this->mode_reglement_code	= $obj->mode_reglement_code;
+				$this->mode_reglement		= $obj->mode_reglement_libelle;
+				$this->amount				= $obj->amount;
 				$this->fk_project			= $obj->fk_project;
-                $this->paye					= $obj->paye;
-                $this->periode				= $this->db->jdate($obj->periode);
-                $this->import_key			= $this->import_key;
-
-                $this->db->free($resql);
-
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
-        else
-        {
-            $this->error=$this->db->lasterror();
-            return -1;
-        }
-    }
+				$this->paye					= $obj->paye;
+				$this->periode				= $this->db->jdate($obj->periode);
+				$this->import_key			= $this->import_key;
+
+				$this->db->free($resql);
+
+				return 1;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+		else
+		{
+			$this->error=$this->db->lasterror();
+			return -1;
+		}
+	}
 
 	/**
 	 * Check if a social contribution can be created into database
@@ -136,30 +136,30 @@ 
 	{
 		$newamount=price2num($this->amount,'MT');
 
-        // Validation parametres
-        if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
-        {
-            return false;
-        }
+		// Validation parametres
+		if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
+		{
+			return false;
+		}
 
 
 		return true;
 	}
 
-    /**
-     *      Create a social contribution into database
-     *
-     *      @param	User	$user   User making creation
-     *      @return int     		<0 if KO, id if OK
-     */
-    function create($user)
-    {
-    	global $conf;
+	/**
+	 *      Create a social contribution into database
+	 *
+	 *      @param	User	$user   User making creation
+	 *      @return int     		<0 if KO, id if OK
+	 */
+	function create($user)
+	{
+		global $conf;
 
-        $now=dol_now();
+		$now=dol_now();
 
-        // Nettoyage parametres
-        $newamount=price2num($this->amount,'MT');
+		// Nettoyage parametres
+		$newamount=price2num($this->amount,'MT');
 
 		if (!$this->check())
 		{
@@ -167,423 +167,423 @@ 
 			 return -2;
 		}
 
-        $this->db->begin();
+		$this->db->begin();
 
-        $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
-        $sql.= " VALUES (".$this->type;
-        $sql.= ", ".($this->fk_account>0 ? $this->fk_account:'NULL');
-        $sql.= ", ".($this->mode_reglement_id>0 ? $this->mode_reglement_id:"NULL");
-        $sql.= ", '".$this->db->escape($this->lib)."'";
-        $sql.= ", '".$this->db->idate($this->date_ech)."'";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
+		$sql.= " VALUES (".$this->type;
+		$sql.= ", ".($this->fk_account>0 ? $this->fk_account:'NULL');
+		$sql.= ", ".($this->mode_reglement_id>0 ? $this->mode_reglement_id:"NULL");
+		$sql.= ", '".$this->db->escape($this->lib)."'";
+		$sql.= ", '".$this->db->idate($this->date_ech)."'";
 		$sql.= ", '".$this->db->idate($this->periode)."'";
-        $sql.= ", '".price2num($newamount)."'";
+		$sql.= ", '".price2num($newamount)."'";
 		$sql.= ", ".($this->fk_project>0?$this->fk_project:'NULL');
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".$user->id;
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ")";
-
-        dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
-
-            //dol_syslog("ChargesSociales::create this->id=".$this->id);
-            $this->db->commit();
-            return $this->id;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-
-    /**
-     *      Delete a social contribution
-     *
-     *      @param		User    $user   Object user making delete
-     *      @return     		int 	<0 if KO, >0 if OK
-     */
-    function delete($user)
-    {
-        $error=0;
-
-        $this->db->begin();
-
-        // Get bank transaction lines for this social contributions
-        include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $account=new Account($this->db);
-        $lines_url=$account->get_url('',$this->id,'sc');
-
-        // Delete bank urls
-        foreach ($lines_url as $line_url)
-        {
-            if (! $error)
-            {
-                $accountline=new AccountLine($this->db);
-                $accountline->fetch($line_url['fk_bank']);
-                $result=$accountline->delete_urls($user);
-                if ($result < 0)
-                {
-                    $error++;
-                }
-            }
-        }
-
-        // Delete payments
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql)
-            {
-                $error++;
-                $this->error=$this->db->lasterror();
-            }
-        }
-
-        if (! $error)
-        {
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
-            dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql)
-            {
-                $error++;
-                $this->error=$this->db->lasterror();
-            }
-        }
-
-        if (! $error)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->db->rollback();
-            return -1;
-        }
-
-    }
-
-
-    /**
-     *      Met a jour une charge sociale
-     *
-     *      @param	User	$user   Utilisateur qui modifie
-     *      @return int     		<0 si erreur, >0 si ok
-     */
-    function update($user)
-    {
-        $this->db->begin();
-
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
-        $sql.= " SET libelle='".$this->db->escape($this->lib)."'";
-        $sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
-        $sql.= ", periode='".$this->db->idate($this->periode)."'";
-        $sql.= ", amount='".price2num($this->amount,'MT')."'";
+		$sql.= ", ".$conf->entity;
+		$sql.= ", ".$user->id;
+		$sql.= ", '".$this->db->idate($now)."'";
+		$sql.= ")";
+
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
+
+			//dol_syslog("ChargesSociales::create this->id=".$this->id);
+			$this->db->commit();
+			return $this->id;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *      Delete a social contribution
+	 *
+	 *      @param		User    $user   Object user making delete
+	 *      @return     		int 	<0 if KO, >0 if OK
+	 */
+	function delete($user)
+	{
+		$error=0;
+
+		$this->db->begin();
+
+		// Get bank transaction lines for this social contributions
+		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+		$account=new Account($this->db);
+		$lines_url=$account->get_url('',$this->id,'sc');
+
+		// Delete bank urls
+		foreach ($lines_url as $line_url)
+		{
+			if (! $error)
+			{
+				$accountline=new AccountLine($this->db);
+				$accountline->fetch($line_url['fk_bank']);
+				$result=$accountline->delete_urls($user);
+				if ($result < 0)
+				{
+					$error++;
+				}
+			}
+		}
+
+		// Delete payments
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$error++;
+				$this->error=$this->db->lasterror();
+			}
+		}
+
+		if (! $error)
+		{
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
+			dol_syslog(get_class($this)."::delete", LOG_DEBUG);
+			$resql=$this->db->query($sql);
+			if (! $resql)
+			{
+				$error++;
+				$this->error=$this->db->lasterror();
+			}
+		}
+
+		if (! $error)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->db->rollback();
+			return -1;
+		}
+
+	}
+
+
+	/**
+	 *      Met a jour une charge sociale
+	 *
+	 *      @param	User	$user   Utilisateur qui modifie
+	 *      @return int     		<0 si erreur, >0 si ok
+	 */
+	function update($user)
+	{
+		$this->db->begin();
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
+		$sql.= " SET libelle='".$this->db->escape($this->lib)."'";
+		$sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
+		$sql.= ", periode='".$this->db->idate($this->periode)."'";
+		$sql.= ", amount='".price2num($this->amount,'MT')."'";
 		$sql.= ", fk_projet='".$this->db->escape($this->fk_project)."'";
-        $sql.= ", fk_user_modif=".$user->id;
-        $sql.= " WHERE rowid=".$this->id;
-
-        dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $this->db->commit();
-            return 1;
-        }
-        else
-        {
-            $this->error=$this->db->error();
-            $this->db->rollback();
-            return -1;
-        }
-    }
-
-    /**
-     * Calculate amount remaining to pay by year
-     *
-     * @param	int		$year		Year
-     * @return	number
-     */
-    function solde($year = 0)
-    {
-    	global $conf;
-
-        $sql = "SELECT SUM(f.amount) as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
-        $sql.= " WHERE f.entity = ".$conf->entity;
-        $sql.= " AND paye = 0";
-
-        if ($year) {
-            $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
-        }
-
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-                $this->db->free($result);
-                return $obj->amount;
-            }
-            else
-            {
-                return 0;
-            }
-
-        }
-        else
-        {
-            print $this->db->error();
-            return -1;
-        }
-    }
-
-    /**
-     *    Tag social contribution as payed completely
-     *
-     *    @param	User	$user       Object user making change
-     *    @return	int					<0 if KO, >0 if OK
-     */
-    function set_paid($user)
-    {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql.= " paye = 1";
-        $sql.= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
-    /**
-     *    Remove tag payed on social contribution
-     *
-     *    @param	User	$user       Object user making change
-     *    @return	int					<0 if KO, >0 if OK
-     */
-    function set_unpaid($user)
-    {
-        $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql.= " paye = 0";
-        $sql.= " WHERE rowid = ".$this->id;
-        $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
-    }
-
-    /**
-     *  Retourne le libelle du statut d'une charge (impaye, payee)
-     *
-     *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+		$sql.= ", fk_user_modif=".$user->id;
+		$sql.= " WHERE rowid=".$this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$this->db->commit();
+			return 1;
+		}
+		else
+		{
+			$this->error=$this->db->error();
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Calculate amount remaining to pay by year
+	 *
+	 * @param	int		$year		Year
+	 * @return	number
+	 */
+	function solde($year = 0)
+	{
+		global $conf;
+
+		$sql = "SELECT SUM(f.amount) as amount";
+		$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
+		$sql.= " WHERE f.entity = ".$conf->entity;
+		$sql.= " AND paye = 0";
+
+		if ($year) {
+			$sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
+		}
+
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+				$this->db->free($result);
+				return $obj->amount;
+			}
+			else
+			{
+				return 0;
+			}
+
+		}
+		else
+		{
+			print $this->db->error();
+			return -1;
+		}
+	}
+
+	/**
+	 *    Tag social contribution as payed completely
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	function set_paid($user)
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql.= " paye = 1";
+		$sql.= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
+	/**
+	 *    Remove tag payed on social contribution
+	 *
+	 *    @param	User	$user       Object user making change
+	 *    @return	int					<0 if KO, >0 if OK
+	 */
+	function set_unpaid($user)
+	{
+		$sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
+		$sql.= " paye = 0";
+		$sql.= " WHERE rowid = ".$this->id;
+		$return = $this->db->query($sql);
+		if ($return) return 1;
+		else return -1;
+	}
+
+	/**
+	 *  Retourne le libelle du statut d'une charge (impaye, payee)
+	 *
+	 *  @param	int		$mode       	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return	string        			Label
-     */
-    function getLibStatut($mode=0,$alreadypaid=-1)
-    {
-        return $this->LibStatut($this->paye,$mode,$alreadypaid);
-    }
-
-    /**
-     *  Renvoi le libelle d'un statut donne
-     *
-     *  @param	int		$statut        	Id statut
-     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	 *  @return	string        			Label
+	 */
+	function getLibStatut($mode=0,$alreadypaid=-1)
+	{
+		return $this->LibStatut($this->paye,$mode,$alreadypaid);
+	}
+
+	/**
+	 *  Renvoi le libelle d'un statut donne
+	 *
+	 *  @param	int		$statut        	Id statut
+	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
-     *  @return string        			Label
-     */
-    function LibStatut($statut,$mode=0,$alreadypaid=-1)
-    {
-        global $langs;
-        $langs->load('customers');
-        $langs->load('bills');
-
-        if ($mode == 0)
-        {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
-        }
-        if ($mode == 1)
-        {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
-        }
-        if ($mode == 2)
-        {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
-        }
-        if ($mode == 3)
-        {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6');
-        }
-        if ($mode == 4)
-        {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
-        }
-        if ($mode == 5)
-        {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
-        }
-        if ($mode == 6)
-        {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
-        }
-
-        return "Error, mode/status not found";
-    }
-
-
-    /**
-     *  Return clicable name (with picto eventually)
-     *
-     *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-     * 	@param	int		$maxlen			Longueur max libelle
-     *	@return	string					Chaine avec URL
-     */
-    function getNomUrl($withpicto=0,$maxlen=0)
-    {
-        global $langs;
-
-        $result='';
-
-        if (empty($this->ref)) $this->ref=$this->lib;
-        $label = $langs->trans("ShowSocialContribution").': '.$this->ref;
-
-        $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend='</a>';
-
-        if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
-        return $result;
-    }
-
-    /**
-     * 	Return amount of payments already done
-     *
-     *	@return		int		Amount of payment already done, <0 if KO
-     */
-    function getSommePaiement()
-    {
-        $table='paiementcharge';
-        $field='fk_charge';
-
-        $sql = 'SELECT sum(amount) as amount';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql.= ' WHERE '.$field.' = '.$this->id;
-
-        dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql=$this->db->query($sql);
-        if ($resql)
-        {
-            $amount=0;
-
-            $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount=$obj->amount?$obj->amount:0;
-
-            $this->db->free($resql);
-            return $amount;
-        }
-        else
-        {
-            return -1;
-        }
-    }
-
-    /**
-     * 	Charge les informations d'ordre info dans l'objet entrepot
-     *
-     *  @param	int		$id     Id of social contribution
-     *  @return	int				<0 if KO, >0 if OK
-     */
-    function info($id)
-    {
-        $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
-        $sql.= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
+	 *  @return string        			Label
+	 */
+	function LibStatut($statut,$mode=0,$alreadypaid=-1)
+	{
+		global $langs;
+		$langs->load('customers');
+		$langs->load('bills');
+
+		if ($mode == 0)
+		{
+			if ($statut ==  0) return $langs->trans("Unpaid");
+			if ($statut ==  1) return $langs->trans("Paid");
+		}
+		if ($mode == 1)
+		{
+			if ($statut ==  0) return $langs->trans("Unpaid");
+			if ($statut ==  1) return $langs->trans("Paid");
+		}
+		if ($mode == 2)
+		{
+			if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+			if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+			if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+		}
+		if ($mode == 3)
+		{
+			if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1');
+			if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3');
+			if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6');
+		}
+		if ($mode == 4)
+		{
+			if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+			if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+			if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+		}
+		if ($mode == 5)
+		{
+			if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+			if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+			if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+		}
+		if ($mode == 6)
+		{
+			if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+			if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+			if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+		}
+
+		return "Error, mode/status not found";
+	}
+
+
+	/**
+	 *  Return clicable name (with picto eventually)
+	 *
+	 *	@param	int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
+	 * 	@param	int		$maxlen			Longueur max libelle
+	 *	@return	string					Chaine avec URL
+	 */
+	function getNomUrl($withpicto=0,$maxlen=0)
+	{
+		global $langs;
+
+		$result='';
+
+		if (empty($this->ref)) $this->ref=$this->lib;
+		$label = $langs->trans("ShowSocialContribution").': '.$this->ref;
+
+		$link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend='</a>';
+
+		if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
+		if ($withpicto && $withpicto != 2) $result.=' ';
+		if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+		return $result;
+	}
+
+	/**
+	 * 	Return amount of payments already done
+	 *
+	 *	@return		int		Amount of payment already done, <0 if KO
+	 */
+	function getSommePaiement()
+	{
+		$table='paiementcharge';
+		$field='fk_charge';
+
+		$sql = 'SELECT sum(amount) as amount';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.$table;
+		$sql.= ' WHERE '.$field.' = '.$this->id;
+
+		dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
+		$resql=$this->db->query($sql);
+		if ($resql)
+		{
+			$amount=0;
+
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) $amount=$obj->amount?$obj->amount:0;
+
+			$this->db->free($resql);
+			return $amount;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+
+	/**
+	 * 	Charge les informations d'ordre info dans l'objet entrepot
+	 *
+	 *  @param	int		$id     Id of social contribution
+	 *  @return	int				<0 if KO, >0 if OK
+	 */
+	function info($id)
+	{
+		$sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
+		$sql.= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
 		$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
-        $sql.= " WHERE e.rowid = ".$id;
-
-        dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result=$this->db->query($sql);
-        if ($result)
-        {
-            if ($this->db->num_rows($result))
-            {
-                $obj = $this->db->fetch_object($result);
-
-                $this->id = $obj->rowid;
-
-                if ($obj->fk_user_author) {
-                    $cuser = new User($this->db);
-                    $cuser->fetch($obj->fk_user_author);
-                    $this->user_creation = $cuser;
-                }
-
-                if ($obj->fk_user_modif) {
-                    $muser = new User($this->db);
-                    $muser->fetch($obj->fk_user_modif);
-                    $this->user_modification = $muser;
-                }
-
-                if ($obj->fk_user_valid) {
-                    $vuser = new User($this->db);
-                    $vuser->fetch($obj->fk_user_valid);
-                    $this->user_validation = $vuser;
-                }
-
-                $this->date_creation     = $this->db->jdate($obj->datec);
-                $this->date_modification = $this->db->jdate($obj->datem);
-                $this->date_validation   = $this->db->jdate($obj->datev);
-                $this->import_key        = $obj->import_key;
-            }
-
-            $this->db->free($result);
-
-        }
-        else
-        {
-            dol_print_error($this->db);
-        }
-    }
-
-    /**
-     *  Initialise an instance with random values.
-     *  Used to build previews or test instances.
-     *	id must be 0 if object instance is a specimen.
-     *
-     *  @return	void
-     */
-    function initAsSpecimen()
-    {
-        // Initialize parameters
-        $this->id=0;
-        $this->ref = 'SPECIMEN';
-        $this->specimen=1;
-        $this->paye = 0;
-        $this->date = time();
-        $this->date_ech=$this->date+3600*24*30;
-        $this->periode=$this->date+3600*24*30;
-        $this->amount=100;
-        $this->lib = 0;
-        $this->type = 1;
-        $this->type_libelle = 'Social contribution label';
-    }
+		$sql.= " WHERE e.rowid = ".$id;
+
+		dol_syslog(get_class($this)."::info", LOG_DEBUG);
+		$result=$this->db->query($sql);
+		if ($result)
+		{
+			if ($this->db->num_rows($result))
+			{
+				$obj = $this->db->fetch_object($result);
+
+				$this->id = $obj->rowid;
+
+				if ($obj->fk_user_author) {
+					$cuser = new User($this->db);
+					$cuser->fetch($obj->fk_user_author);
+					$this->user_creation = $cuser;
+				}
+
+				if ($obj->fk_user_modif) {
+					$muser = new User($this->db);
+					$muser->fetch($obj->fk_user_modif);
+					$this->user_modification = $muser;
+				}
+
+				if ($obj->fk_user_valid) {
+					$vuser = new User($this->db);
+					$vuser->fetch($obj->fk_user_valid);
+					$this->user_validation = $vuser;
+				}
+
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->import_key        = $obj->import_key;
+			}
+
+			$this->db->free($result);
+
+		}
+		else
+		{
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *  @return	void
+	 */
+	function initAsSpecimen()
+	{
+		// Initialize parameters
+		$this->id=0;
+		$this->ref = 'SPECIMEN';
+		$this->specimen=1;
+		$this->paye = 0;
+		$this->date = time();
+		$this->date_ech=$this->date+3600*24*30;
+		$this->periode=$this->date+3600*24*30;
+		$this->amount=100;
+		$this->lib = 0;
+		$this->type = 1;
+		$this->type_libelle = 'Social contribution label';
+	}
 }
 

Spacing +124 added lines, -124 removed lines

@@ -32,9 +32,9 @@ 
  */
 class ChargeSociales extends CommonObject
 {
-    public $element='chargesociales';
-    public $table='chargesociales';
-    public $table_element='chargesociales';
+    public $element = 'chargesociales';
+    public $table = 'chargesociales';
+    public $table_element = 'chargesociales';
     public $picto = 'bill';
 
     /**
@@ -74,42 +74,42 @@ 
      *  @param	string  $ref	Ref
      *  @return	int <0 KO >0 OK
      */
-    function fetch($id, $ref='')
+    function fetch($id, $ref = '')
     {
         $sql = "SELECT cs.rowid, cs.date_ech";
-        $sql.= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-        $sql.= ", cs.fk_account, cs.fk_mode_reglement";
-        $sql.= ", c.libelle";
-        $sql.= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
-        $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
-        $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
-        if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
-        else $sql.= " WHERE cs.rowid = ".$id;
+        $sql .= ", cs.libelle as lib, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
+        $sql .= ", cs.fk_account, cs.fk_mode_reglement";
+        $sql .= ", c.libelle";
+        $sql .= ', p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
+        $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN ('.getEntity('c_paiement').')';
+        if ($ref) $sql .= " WHERE cs.rowid = ".$ref;
+        else $sql .= " WHERE cs.rowid = ".$id;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             if ($this->db->num_rows($resql))
             {
                 $obj = $this->db->fetch_object($resql);
 
-                $this->id					= $obj->rowid;
+                $this->id = $obj->rowid;
                 $this->ref					= $obj->rowid;
-                $this->date_ech				= $this->db->jdate($obj->date_ech);
+                $this->date_ech = $this->db->jdate($obj->date_ech);
                 $this->lib					= $obj->lib;
-                $this->type					= $obj->fk_type;
-                $this->type_libelle			= $obj->libelle;
-                $this->fk_account			= $obj->fk_account;
-                $this->mode_reglement_id	= $obj->fk_mode_reglement;
-                $this->mode_reglement_code	= $obj->mode_reglement_code;
-                $this->mode_reglement		= $obj->mode_reglement_libelle;
-                $this->amount				= $obj->amount;
-				$this->fk_project			= $obj->fk_project;
-                $this->paye					= $obj->paye;
-                $this->periode				= $this->db->jdate($obj->periode);
-                $this->import_key			= $this->import_key;
+                $this->type = $obj->fk_type;
+                $this->type_libelle = $obj->libelle;
+                $this->fk_account = $obj->fk_account;
+                $this->mode_reglement_id = $obj->fk_mode_reglement;
+                $this->mode_reglement_code = $obj->mode_reglement_code;
+                $this->mode_reglement = $obj->mode_reglement_libelle;
+                $this->amount = $obj->amount;
+				$this->fk_project = $obj->fk_project;
+                $this->paye = $obj->paye;
+                $this->periode = $this->db->jdate($obj->periode);
+                $this->import_key = $this->import_key;
 
                 $this->db->free($resql);
 
@@ -122,7 +122,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             return -1;
         }
     }
@@ -134,10 +134,10 @@ 
 	 */
 	function check()
 	{
-		$newamount=price2num($this->amount,'MT');
+		$newamount = price2num($this->amount, 'MT');
 
         // Validation parametres
-        if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
+        if (!$newamount > 0 || empty($this->date_ech) || empty($this->periode))
         {
             return false;
         }
@@ -156,38 +156,38 @@ 
     {
     	global $conf;
 
-        $now=dol_now();
+        $now = dol_now();
 
         // Nettoyage parametres
-        $newamount=price2num($this->amount,'MT');
+        $newamount = price2num($this->amount, 'MT');
 
 		if (!$this->check())
 		{
-			 $this->error="ErrorBadParameter";
+			 $this->error = "ErrorBadParameter";
 			 return -2;
 		}
 
         $this->db->begin();
 
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."chargesociales (fk_type, fk_account, fk_mode_reglement, libelle, date_ech, periode, amount, fk_projet, entity, fk_user_author, date_creation)";
-        $sql.= " VALUES (".$this->type;
-        $sql.= ", ".($this->fk_account>0 ? $this->fk_account:'NULL');
-        $sql.= ", ".($this->mode_reglement_id>0 ? $this->mode_reglement_id:"NULL");
-        $sql.= ", '".$this->db->escape($this->lib)."'";
-        $sql.= ", '".$this->db->idate($this->date_ech)."'";
-		$sql.= ", '".$this->db->idate($this->periode)."'";
-        $sql.= ", '".price2num($newamount)."'";
-		$sql.= ", ".($this->fk_project>0?$this->fk_project:'NULL');
-        $sql.= ", ".$conf->entity;
-        $sql.= ", ".$user->id;
-        $sql.= ", '".$this->db->idate($now)."'";
-        $sql.= ")";
+        $sql .= " VALUES (".$this->type;
+        $sql .= ", ".($this->fk_account > 0 ? $this->fk_account : 'NULL');
+        $sql .= ", ".($this->mode_reglement_id > 0 ? $this->mode_reglement_id : "NULL");
+        $sql .= ", '".$this->db->escape($this->lib)."'";
+        $sql .= ", '".$this->db->idate($this->date_ech)."'";
+		$sql .= ", '".$this->db->idate($this->periode)."'";
+        $sql .= ", '".price2num($newamount)."'";
+		$sql .= ", ".($this->fk_project > 0 ? $this->fk_project : 'NULL');
+        $sql .= ", ".$conf->entity;
+        $sql .= ", ".$user->id;
+        $sql .= ", '".$this->db->idate($now)."'";
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."chargesociales");
 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
             $this->db->commit();
@@ -195,7 +195,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -210,23 +210,23 @@ 
      */
     function delete($user)
     {
-        $error=0;
+        $error = 0;
 
         $this->db->begin();
 
         // Get bank transaction lines for this social contributions
         include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-        $account=new Account($this->db);
-        $lines_url=$account->get_url('',$this->id,'sc');
+        $account = new Account($this->db);
+        $lines_url = $account->get_url('', $this->id, 'sc');
 
         // Delete bank urls
         foreach ($lines_url as $line_url)
         {
-            if (! $error)
+            if (!$error)
             {
-                $accountline=new AccountLine($this->db);
+                $accountline = new AccountLine($this->db);
                 $accountline->fetch($line_url['fk_bank']);
-                $result=$accountline->delete_urls($user);
+                $result = $accountline->delete_urls($user);
                 if ($result < 0)
                 {
                     $error++;
@@ -235,31 +235,31 @@ 
         }
 
         // Delete payments
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."paiementcharge WHERE fk_charge=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 $error++;
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $sql = "DELETE FROM ".MAIN_DB_PREFIX."chargesociales WHERE rowid=".$this->id;
             dol_syslog(get_class($this)."::delete", LOG_DEBUG);
-            $resql=$this->db->query($sql);
-            if (! $resql)
+            $resql = $this->db->query($sql);
+            if (!$resql)
             {
                 $error++;
-                $this->error=$this->db->lasterror();
+                $this->error = $this->db->lasterror();
             }
         }
 
-        if (! $error)
+        if (!$error)
         {
             $this->db->commit();
             return 1;
@@ -284,16 +284,16 @@ 
         $this->db->begin();
 
         $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales";
-        $sql.= " SET libelle='".$this->db->escape($this->lib)."'";
-        $sql.= ", date_ech='".$this->db->idate($this->date_ech)."'";
-        $sql.= ", periode='".$this->db->idate($this->periode)."'";
-        $sql.= ", amount='".price2num($this->amount,'MT')."'";
-		$sql.= ", fk_projet='".$this->db->escape($this->fk_project)."'";
-        $sql.= ", fk_user_modif=".$user->id;
-        $sql.= " WHERE rowid=".$this->id;
+        $sql .= " SET libelle='".$this->db->escape($this->lib)."'";
+        $sql .= ", date_ech='".$this->db->idate($this->date_ech)."'";
+        $sql .= ", periode='".$this->db->idate($this->periode)."'";
+        $sql .= ", amount='".price2num($this->amount, 'MT')."'";
+		$sql .= ", fk_projet='".$this->db->escape($this->fk_project)."'";
+        $sql .= ", fk_user_modif=".$user->id;
+        $sql .= " WHERE rowid=".$this->id;
 
         dol_syslog(get_class($this)."::update", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $this->db->commit();
@@ -301,7 +301,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             $this->db->rollback();
             return -1;
         }
@@ -318,9 +318,9 @@ 
     	global $conf;
 
         $sql = "SELECT SUM(f.amount) as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
-        $sql.= " WHERE f.entity = ".$conf->entity;
-        $sql.= " AND paye = 0";
+        $sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as f";
+        $sql .= " WHERE f.entity = ".$conf->entity;
+        $sql .= " AND paye = 0";
 
         if ($year) {
             $sql .= " AND f.datev >= '$y-01-01' AND f.datev <= '$y-12-31' ";
@@ -357,8 +357,8 @@ 
     function set_paid($user)
     {
         $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql.= " paye = 1";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " paye = 1";
+        $sql .= " WHERE rowid = ".$this->id;
         $return = $this->db->query($sql);
         if ($return) return 1;
         else return -1;
@@ -372,8 +372,8 @@ 
     function set_unpaid($user)
     {
         $sql = "UPDATE ".MAIN_DB_PREFIX."chargesociales SET";
-        $sql.= " paye = 0";
-        $sql.= " WHERE rowid = ".$this->id;
+        $sql .= " paye = 0";
+        $sql .= " WHERE rowid = ".$this->id;
         $return = $this->db->query($sql);
         if ($return) return 1;
         else return -1;
@@ -386,9 +386,9 @@ 
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return	string        			Label
      */
-    function getLibStatut($mode=0,$alreadypaid=-1)
+    function getLibStatut($mode = 0, $alreadypaid = -1)
     {
-        return $this->LibStatut($this->paye,$mode,$alreadypaid);
+        return $this->LibStatut($this->paye, $mode, $alreadypaid);
     }
 
     /**
@@ -399,7 +399,7 @@ 
 	 *  @param  double	$alreadypaid	0=No payment already done, >0=Some payments were already done (we recommand to put here amount payed if you have it, 1 otherwise)
      *  @return string        			Label
      */
-    function LibStatut($statut,$mode=0,$alreadypaid=-1)
+    function LibStatut($statut, $mode = 0, $alreadypaid = -1)
     {
         global $langs;
         $langs->load('customers');
@@ -407,43 +407,43 @@ 
 
         if ($mode == 0)
         {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
+            if ($statut == 0) return $langs->trans("Unpaid");
+            if ($statut == 1) return $langs->trans("Paid");
         }
         if ($mode == 1)
         {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
+            if ($statut == 0) return $langs->trans("Unpaid");
+            if ($statut == 1) return $langs->trans("Paid");
         }
         if ($mode == 2)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+            if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+            if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
         }
         if ($mode == 3)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1');
+            if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6');
         }
         if ($mode == 4)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            if ($statut == 0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+            if ($statut == 0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+            if ($statut == 1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
         }
         if ($mode == 5)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut == 0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+            if ($statut == 0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            if ($statut == 1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
         }
         if ($mode == 6)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut == 0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+            if ($statut == 0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            if ($statut == 1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
         }
 
         return "Error, mode/status not found";
@@ -457,21 +457,21 @@ 
      * 	@param	int		$maxlen			Longueur max libelle
      *	@return	string					Chaine avec URL
      */
-    function getNomUrl($withpicto=0,$maxlen=0)
+    function getNomUrl($withpicto = 0, $maxlen = 0)
     {
         global $langs;
 
-        $result='';
+        $result = '';
 
-        if (empty($this->ref)) $this->ref=$this->lib;
+        if (empty($this->ref)) $this->ref = $this->lib;
         $label = $langs->trans("ShowSocialContribution").': '.$this->ref;
 
         $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-        $linkend='</a>';
+        $linkend = '</a>';
 
-        if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+        if ($withpicto) $result .= ($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
         return $result;
     }
 
@@ -482,21 +482,21 @@ 
      */
     function getSommePaiement()
     {
-        $table='paiementcharge';
-        $field='fk_charge';
+        $table = 'paiementcharge';
+        $field = 'fk_charge';
 
         $sql = 'SELECT sum(amount) as amount';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.$table;
-        $sql.= ' WHERE '.$field.' = '.$this->id;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.$table;
+        $sql .= ' WHERE '.$field.' = '.$this->id;
 
         dol_syslog(get_class($this)."::getSommePaiement", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $amount=0;
+            $amount = 0;
 
             $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount=$obj->amount?$obj->amount:0;
+            if ($obj) $amount = $obj->amount ? $obj->amount : 0;
 
             $this->db->free($resql);
             return $amount;
@@ -516,12 +516,12 @@ 
     function info($id)
     {
         $sql = "SELECT e.rowid, e.tms as datem, e.date_creation as datec, e.date_valid as datev, e.import_key,";
-        $sql.= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
-		$sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
-        $sql.= " WHERE e.rowid = ".$id;
+        $sql .= " e.fk_user_author, e.fk_user_modif, e.fk_user_valid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as e";
+        $sql .= " WHERE e.rowid = ".$id;
 
         dol_syslog(get_class($this)."::info", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             if ($this->db->num_rows($result))
@@ -573,14 +573,14 @@ 
     function initAsSpecimen()
     {
         // Initialize parameters
-        $this->id=0;
+        $this->id = 0;
         $this->ref = 'SPECIMEN';
-        $this->specimen=1;
+        $this->specimen = 1;
         $this->paye = 0;
         $this->date = time();
-        $this->date_ech=$this->date+3600*24*30;
-        $this->periode=$this->date+3600*24*30;
-        $this->amount=100;
+        $this->date_ech = $this->date + 3600 * 24 * 30;
+        $this->periode = $this->date + 3600 * 24 * 30;
+        $this->amount = 100;
         $this->lib = 0;
         $this->type = 1;
         $this->type_libelle = 'Social contribution label';

Braces +96 added lines, -48 removed lines

@@ -84,8 +84,11 @@ 
         $sql.= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."c_chargesociales as c ON cs.fk_type = c.id";
         $sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON cs.fk_mode_reglement = p.id AND p.entity IN (' . getEntity('c_paiement').')';
-        if ($ref) $sql.= " WHERE cs.rowid = ".$ref;
-        else $sql.= " WHERE cs.rowid = ".$id;
+        if ($ref) {
+        	$sql.= " WHERE cs.rowid = ".$ref;
+        } else {
+        	$sql.= " WHERE cs.rowid = ".$id;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -114,13 +117,11 @@ 
                 $this->db->free($resql);
 
                 return 1;
-            }
-            else
+            } else
             {
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             return -1;
@@ -192,8 +193,7 @@ 
             //dol_syslog("ChargesSociales::create this->id=".$this->id);
             $this->db->commit();
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -263,8 +263,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->db->rollback();
             return -1;
@@ -298,8 +297,7 @@ 
         {
             $this->db->commit();
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             $this->db->rollback();
@@ -334,14 +332,12 @@ 
                 $obj = $this->db->fetch_object($result);
                 $this->db->free($result);
                 return $obj->amount;
-            }
-            else
+            } else
             {
                 return 0;
             }
 
-        }
-        else
+        } else
         {
             print $this->db->error();
             return -1;
@@ -360,8 +356,11 @@ 
         $sql.= " paye = 1";
         $sql.= " WHERE rowid = ".$this->id;
         $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
+        if ($return) {
+        	return 1;
+        } else {
+        	return -1;
+        }
     }
     /**
      *    Remove tag payed on social contribution
@@ -375,8 +374,11 @@ 
         $sql.= " paye = 0";
         $sql.= " WHERE rowid = ".$this->id;
         $return = $this->db->query($sql);
-        if ($return) return 1;
-        else return -1;
+        if ($return) {
+        	return 1;
+        } else {
+        	return -1;
+        }
     }
 
     /**
@@ -407,43 +409,81 @@ 
 
         if ($mode == 0)
         {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
+            if ($statut ==  0) {
+            	return $langs->trans("Unpaid");
+            }
+            if ($statut ==  1) {
+            	return $langs->trans("Paid");
+            }
         }
         if ($mode == 1)
         {
-            if ($statut ==  0) return $langs->trans("Unpaid");
-            if ($statut ==  1) return $langs->trans("Paid");
+            if ($statut ==  0) {
+            	return $langs->trans("Unpaid");
+            }
+            if ($statut ==  1) {
+            	return $langs->trans("Paid");
+            }
         }
         if ($mode == 2)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            if ($statut ==  0 && $alreadypaid <= 0) {
+            	return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+            }
+            if ($statut ==  0 && $alreadypaid > 0) {
+            	return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+            }
+            if ($statut ==  1) {
+            	return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            }
         }
         if ($mode == 3)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut ==  0 && $alreadypaid <= 0) {
+            	return img_picto($langs->trans("Unpaid"), 'statut1');
+            }
+            if ($statut ==  0 && $alreadypaid > 0) {
+            	return img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            }
+            if ($statut ==  1) {
+            	return img_picto($langs->trans("Paid"), 'statut6');
+            }
         }
         if ($mode == 4)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
-            if ($statut ==  0 && $alreadypaid > 0) return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
-            if ($statut ==  1) return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            if ($statut ==  0 && $alreadypaid <= 0) {
+            	return img_picto($langs->trans("Unpaid"), 'statut1').' '.$langs->trans("Unpaid");
+            }
+            if ($statut ==  0 && $alreadypaid > 0) {
+            	return img_picto($langs->trans("BillStatusStarted"), 'statut3').' '.$langs->trans("BillStatusStarted");
+            }
+            if ($statut ==  1) {
+            	return img_picto($langs->trans("Paid"), 'statut6').' '.$langs->trans("Paid");
+            }
         }
         if ($mode == 5)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut ==  0 && $alreadypaid <= 0) {
+            	return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+            }
+            if ($statut ==  0 && $alreadypaid > 0) {
+            	return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            }
+            if ($statut ==  1) {
+            	return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            }
         }
         if ($mode == 6)
         {
-            if ($statut ==  0 && $alreadypaid <= 0) return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
-            if ($statut ==  0 && $alreadypaid > 0) return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
-            if ($statut ==  1) return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            if ($statut ==  0 && $alreadypaid <= 0) {
+            	return $langs->trans("Unpaid").' '.img_picto($langs->trans("Unpaid"), 'statut1');
+            }
+            if ($statut ==  0 && $alreadypaid > 0) {
+            	return $langs->trans("BillStatusStarted").' '.img_picto($langs->trans("BillStatusStarted"), 'statut3');
+            }
+            if ($statut ==  1) {
+            	return $langs->trans("Paid").' '.img_picto($langs->trans("Paid"), 'statut6');
+            }
         }
 
         return "Error, mode/status not found";
@@ -463,15 +503,23 @@ 
 
         $result='';
 
-        if (empty($this->ref)) $this->ref=$this->lib;
+        if (empty($this->ref)) {
+        	$this->ref=$this->lib;
+        }
         $label = $langs->trans("ShowSocialContribution").': '.$this->ref;
 
         $link = '<a href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$this->id.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
         $linkend='</a>';
 
-        if ($withpicto) $result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        if ($withpicto != 2) $result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+        if ($withpicto) {
+        	$result.=($link.img_object($label, 'bill', 'class="classfortooltip"').$linkend.' ');
+        }
+        if ($withpicto && $withpicto != 2) {
+        	$result.=' ';
+        }
+        if ($withpicto != 2) {
+        	$result.=$link.($maxlen?dol_trunc($this->ref,$maxlen):$this->ref).$linkend;
+        }
         return $result;
     }
 
@@ -496,12 +544,13 @@ 
             $amount=0;
 
             $obj = $this->db->fetch_object($resql);
-            if ($obj) $amount=$obj->amount?$obj->amount:0;
+            if ($obj) {
+            	$amount=$obj->amount?$obj->amount:0;
+            }
 
             $this->db->free($resql);
             return $amount;
-        }
-        else
+        } else
         {
             return -1;
         }
@@ -556,8 +605,7 @@ 
 
             $this->db->free($result);
 
-        }
-        else
+        } else
         {
             dol_print_error($this->db);
         }

htdocs/core/class/html.formactions.class.php

Doc Comments +1 added lines, -1 removed lines

@@ -250,7 +250,7 @@
     /**
      *  Output html select list of type of event
      *
-     *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
+     *  @param	string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
      *  @param  string		    $htmlname       Name of select field
      *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
      *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"

Indentation +249 added lines, -249 removed lines

@@ -29,50 +29,50 @@ 
  */
 class FormActions
 {
-    var $db;
-    var $error;
+	var $db;
+	var $error;
 
 
-    /**
+	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
-     */
-    function __construct($db)
-    {
-        $this->db = $db;
-        return 1;
-    }
-
-
-    /**
-     *  Show list of action status
-     *
-     * 	@param	string	$formname		Name of form where select is included
-     * 	@param	string	$selected		Preselected value (-1..100)
-     * 	@param	int		$canedit		1=can edit, 0=read only
-     *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
-     *  @param	integer	$showempty		Show an empty line if select is used
-     *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
-     *  @param  string  $morecss        More css on select field
-     * 	@return	void
-     */
-    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
-    {
-        global $langs,$conf;
-
-        $listofstatus = array(
-            '-1' => $langs->trans("ActionNotApplicable"),
-            '0' => $langs->trans("ActionsToDoShort"),
-            '50' => $langs->trans("ActionRunningShort"),
-            '100' => $langs->trans("ActionDoneShort")
-        );
+	 */
+	function __construct($db)
+	{
+		$this->db = $db;
+		return 1;
+	}
+
+
+	/**
+	 *  Show list of action status
+	 *
+	 * 	@param	string	$formname		Name of form where select is included
+	 * 	@param	string	$selected		Preselected value (-1..100)
+	 * 	@param	int		$canedit		1=can edit, 0=read only
+	 *  @param  string	$htmlname   	Name of html prefix for html fields (selectX and valX)
+	 *  @param	integer	$showempty		Show an empty line if select is used
+	 *  @param	integer	$onlyselect		0=Standard, 1=Hide percent of completion and force usage of a select list, 2=Same than 1 and add "Incomplete (Todo+Running)
+	 *  @param  string  $morecss        More css on select field
+	 * 	@return	void
+	 */
+	function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
+	{
+		global $langs,$conf;
+
+		$listofstatus = array(
+			'-1' => $langs->trans("ActionNotApplicable"),
+			'0' => $langs->trans("ActionsToDoShort"),
+			'50' => $langs->trans("ActionRunningShort"),
+			'100' => $langs->trans("ActionDoneShort")
+		);
 		// +ActionUncomplete
 
-        if (! empty($conf->use_javascript_ajax))
-        {
-            print "\n";
-            print "<script type=\"text/javascript\">
+		if (! empty($conf->use_javascript_ajax))
+		{
+			print "\n";
+			print "<script type=\"text/javascript\">
                 var htmlname = '".$htmlname."';
 
                 $(document).ready(function () {
@@ -116,218 +116,218 @@ 
                     }
                 }
                 </script>\n";
-        }
-        if (! empty($conf->use_javascript_ajax) || $onlyselect)
-        {
-        	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
-            foreach($listofstatus as $key => $val)
-            {
-                print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
-                if ($key == '50' && $onlyselect == 2)
-                {
-                	print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
-                }
-            }
-            print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
-
-            if (empty($onlyselect))
-            {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
-    	        print '<span class="hideonsmartphone hideifna">%</span>';
-            }
-        }
-        else
+		}
+		if (! empty($conf->use_javascript_ajax) || $onlyselect)
+		{
+			//var_dump($selected);
+			if ($selected == 'done') $selected='100';
+			print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
+			if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
+			foreach($listofstatus as $key => $val)
+			{
+				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
+				if ($key == '50' && $onlyselect == 2)
+				{
+					print '<option value="todo"'.($selected == 'todo' ? ' selected' : '').'>'.$langs->trans("ActionUncomplete").' ('.$langs->trans("ActionsToDoShort")."+".$langs->trans("ActionRunningShort").')</option>';
+				}
+			}
+			print '</select>';
+			if ($selected == 0 || $selected == 100) $canedit=0;
+
+			if (empty($onlyselect))
+			{
+				print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+				print '<span class="hideonsmartphone hideifna">%</span>';
+			}
+		}
+		else
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
-        }
-    }
-
-
-    /**
-     *  Show list of actions for element
-     *
-     *  @param	Object	$object					Object
-     *  @param  string	$typeelement			'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
-     *	@param	int		$socid					Socid of user
-     *  @param	int		$forceshowtitle			Show title even if there is no actions to show
-     *  @param  string  $morecss        		More css on table
-     *  @param	int		$max					Max number of record
-     *  @param	string	$moreparambacktopage	More param for the backtopage
-     *  @param	string	$morehtmlright			More html text on right of title line
-     *	@return	int								<0 if KO, >=0 if OK
-     */
-    function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
-    {
-        global $langs,$conf,$user;
-        global $bc;
-
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-
-        $sortfield='a.datep';
-        $sortorder='DESC';
-
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
+			print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
+		}
+	}
+
+
+	/**
+	 *  Show list of actions for element
+	 *
+	 *  @param	Object	$object					Object
+	 *  @param  string	$typeelement			'invoice','propal','order','invoice_supplier','order_supplier','fichinter'
+	 *	@param	int		$socid					Socid of user
+	 *  @param	int		$forceshowtitle			Show title even if there is no actions to show
+	 *  @param  string  $morecss        		More css on table
+	 *  @param	int		$max					Max number of record
+	 *  @param	string	$moreparambacktopage	More param for the backtopage
+	 *  @param	string	$morehtmlright			More html text on right of title line
+	 *	@return	int								<0 if KO, >=0 if OK
+	 */
+	function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
+	{
+		global $langs,$conf,$user;
+		global $bc;
+
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+		$sortfield='a.datep';
+		$sortorder='DESC';
+
+		$listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
 		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
 
-        $num = count($listofactions);
-        if ($num || $forceshowtitle)
-        {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_payment')  $title=$langs->trans('ActionsOnSupplierPayment');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
-
-            $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
-
-        	$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.'&socid='.$object->socid.'&projectid='.$object->fk_project.'&backtopage='.urlencode($urlbacktopage).'">';
-        	$buttontoaddnewevent.= $langs->trans("AddEvent");
-        	$buttontoaddnewevent.= '</a>';
-
-        	print '<!-- formactions->showactions -->'."\n";
-        	print load_fiche_titre($title, $morehtmlright, '', 0, 0, '', $buttontoaddnewevent);
-
-        	$page=0; $param='';
-
-        	$total = 0;
-
-        	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
-        	print '<tr class="liste_titre">';
-        	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Action', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
-        	print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
-        	print '</tr>';
-        	print "\n";
-
-        	$userstatic = new User($this->db);
-
-        	if (count($listofactions))
-        	{
-	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
-	        	{
-	        		if ($max && $cursorevent >= $max) break;
-
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
-
-	        		print '<tr class="oddeven">';
+		$num = count($listofactions);
+		if ($num || $forceshowtitle)
+		{
+			if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
+			elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
+			elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
+			elseif ($typeelement == 'supplier_payment')  $title=$langs->trans('ActionsOnSupplierPayment');
+			elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
+			elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
+			elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
+			elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
+			elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
+			elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+			elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+			elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+			else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+
+			$urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
+
+			$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.'&socid='.$object->socid.'&projectid='.$object->fk_project.'&backtopage='.urlencode($urlbacktopage).'">';
+			$buttontoaddnewevent.= $langs->trans("AddEvent");
+			$buttontoaddnewevent.= '</a>';
+
+			print '<!-- formactions->showactions -->'."\n";
+			print load_fiche_titre($title, $morehtmlright, '', 0, 0, '', $buttontoaddnewevent);
+
+			$page=0; $param='';
+
+			$total = 0;
+
+			print '<div class="div-table-responsive-no-min">';
+			print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+			print '<tr class="liste_titre">';
+			print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Type', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Action', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', $page, $param, 'align="center"', $sortfield, $sortorder, '', 1);
+			print getTitleFieldOfList('', 0, $_SERVER["PHP_SELF"], '', $page, $param, 'align="right"', $sortfield, $sortorder, '', 1);
+			print '</tr>';
+			print "\n";
+
+			$userstatic = new User($this->db);
+
+			if (count($listofactions))
+			{
+				$cursorevent = 0;
+				foreach($listofactions as $action)
+				{
+					if ($max && $cursorevent >= $max) break;
+
+					$ref=$action->getNomUrl(1,-1);
+					$label=$action->getNomUrl(0,38);
+
+					print '<tr class="oddeven">';
 					print '<td>'.$ref.'</td>';
-	        		print '<td>';
-	        		if (! empty($action->userownerid))
-	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
-	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
-	        		}
-	        		print '</td>';
 					print '<td>';
-	        		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
-	        		{
-	        		    if ($action->type_picto) print img_picto('', $action->type_picto);
-	        		    else {
-	        		        if ($action->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
-	        		        if ($action->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
-	        		        if ($action->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
-	        		        if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
-	        		    }
-	        		}
-	        		print $action->type;
-	        		print '</td>';
-	        		print '<td>'.$label.'</td>';
-	        		print '<td align="center">'.dol_print_date($action->datep,'dayhour');
-	        		if ($action->datef)
-	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
-		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
-		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
-		        		}
-		        		else print '-'.dol_print_date($action->datef,'dayhour');
-	        		}
-	        		print '</td>';
-	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
-	        		{
-	        			print $action->getLibStatut(3);
-	        		}
-	        		print '</td>';
-	        		print '</tr>';
-
-	        		$cursorevent++;
-	        	}
-        	}
-        	else
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
-        	}
-
-        	if ($max && $num > $max)
-        	{
-        		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
-        	}
-
-        	print '</table>';
-        	print '</div>';
-        }
-
-        return $num;
-    }
-
-
-    /**
-     *  Output html select list of type of event
-     *
-     *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
-     *  @param  string		    $htmlname       Name of select field
-     *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
-     *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
-     *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
-     *  @param  int		        $multiselect    1=Allow multiselect of action type
-     *  @param  int             $nooutput       1=No output
-     * 	@return	string
-     */
-    function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
-    {
-        global $langs,$user,$form,$conf;
-
-        if (! is_object($form)) $form=new Form($db);
-
-        require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
-        require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction=new CActionComm($this->db);
-
-       	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
-       	//asort($arraylist);
-
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
-
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
-
-       	$out='';
+					if (! empty($action->userownerid))
+					{
+						$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+						print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
+					}
+					print '</td>';
+					print '<td>';
+					if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+					{
+						if ($action->type_picto) print img_picto('', $action->type_picto);
+						else {
+							if ($action->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
+							if ($action->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
+							if ($action->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
+							if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
+						}
+					}
+					print $action->type;
+					print '</td>';
+					print '<td>'.$label.'</td>';
+					print '<td align="center">'.dol_print_date($action->datep,'dayhour');
+					if ($action->datef)
+					{
+						$tmpa=dol_getdate($action->datep);
+						$tmpb=dol_getdate($action->datef);
+						if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
+						{
+							if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
+						}
+						else print '-'.dol_print_date($action->datef,'dayhour');
+					}
+					print '</td>';
+					print '<td align="right">';
+					if (! empty($action->author->id))
+					{
+						print $action->getLibStatut(3);
+					}
+					print '</td>';
+					print '</tr>';
+
+					$cursorevent++;
+				}
+			}
+			else
+			{
+				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			}
+
+			if ($max && $num > $max)
+			{
+				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
+			}
+
+			print '</table>';
+			print '</div>';
+		}
+
+		return $num;
+	}
+
+
+	/**
+	 *  Output html select list of type of event
+	 *
+	 *  @param	array|string	$selected       Type pre-selected (can be 'manual', 'auto' or 'AC_xxx'). Can be an array too.
+	 *  @param  string		    $htmlname       Name of select field
+	 *  @param	string		    $excludetype	A type to exclude ('systemauto', 'system', '')
+	 *  @param	integer		    $onlyautoornot	1=Group all type AC_XXX into 1 line AC_MANUAL. 0=Keep details of type, -1=Keep details and add a combined line "All manual"
+	 *  @param	int		        $hideinfohelp	1=Do not show info help, 0=Show, -1=Show+Add info to tell how to set default value
+	 *  @param  int		        $multiselect    1=Allow multiselect of action type
+	 *  @param  int             $nooutput       1=No output
+	 * 	@return	string
+	 */
+	function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+	{
+		global $langs,$user,$form,$conf;
+
+		if (! is_object($form)) $form=new Form($db);
+
+		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+		$caction=new CActionComm($this->db);
+
+	   	// Suggest a list with manual events or all auto events
+	   	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+	   	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+	   	//asort($arraylist);
+
+	   	if ($selected == 'manual') $selected='AC_OTH';
+	   	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+
+	   	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+
+	   	$out='';
 
 		if (! empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+			if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
 		else
@@ -335,14 +335,14 @@ 
 			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		}
 
-        if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
-        {
-            $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
-        }
+		if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
+		{
+			$out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
+		}
 
-        if ($nooutput) return $out;
-        else print $out;
-        return '';
-    }
+		if ($nooutput) return $out;
+		else print $out;
+		return '';
+	}
 
 }

Spacing +65 added lines, -65 removed lines

@@ -57,9 +57,9 @@ 
      *  @param  string  $morecss        More css on select field
      * 	@return	void
      */
-    function form_select_status_action($formname, $selected, $canedit=1, $htmlname='complete', $showempty=0, $onlyselect=0, $morecss='maxwidth100')
+    function form_select_status_action($formname, $selected, $canedit = 1, $htmlname = 'complete', $showempty = 0, $onlyselect = 0, $morecss = 'maxwidth100')
     {
-        global $langs,$conf;
+        global $langs, $conf;
 
         $listofstatus = array(
             '-1' => $langs->trans("ActionNotApplicable"),
@@ -69,7 +69,7 @@ 
         );
 		// +ActionUncomplete
 
-        if (! empty($conf->use_javascript_ajax))
+        if (!empty($conf->use_javascript_ajax))
         {
             print "\n";
             print "<script type=\"text/javascript\">
@@ -90,7 +90,7 @@ 
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
                     var percentage = $('input[name=percentage]');
-                    var selected = '".(isset($selected)?$selected:'')."';
+                    var selected = '".(isset($selected) ? $selected : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
@@ -117,13 +117,13 @@ 
                 }
                 </script>\n";
         }
-        if (! empty($conf->use_javascript_ajax) || $onlyselect)
+        if (!empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
-            print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
-            foreach($listofstatus as $key => $val)
+        	if ($selected == 'done') $selected = '100';
+            print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
+            if ($showempty) print '<option value=""'.($selected == '' ? ' selected' : '').'></option>';
+            foreach ($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
                 if ($key == '50' && $onlyselect == 2)
@@ -132,17 +132,17 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) $canedit = 0;
 
             if (empty($onlyselect))
             {
-	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
+	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
         }
         else
 		{
-            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
+            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit ? '' : ' disabled').'>%';
         }
     }
 
@@ -160,51 +160,51 @@ 
      *  @param	string	$morehtmlright			More html text on right of title line
      *	@return	int								<0 if KO, >=0 if OK
      */
-    function showactions($object, $typeelement, $socid=0, $forceshowtitle=0, $morecss='listactions', $max=0, $moreparambacktopage='', $morehtmlright='')
+    function showactions($object, $typeelement, $socid = 0, $forceshowtitle = 0, $morecss = 'listactions', $max = 0, $moreparambacktopage = '', $morehtmlright = '')
     {
-        global $langs,$conf,$user;
+        global $langs, $conf, $user;
         global $bc;
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-        $sortfield='a.datep';
-        $sortorder='DESC';
+        $sortfield = 'a.datep';
+        $sortorder = 'DESC';
 
-        $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+        $listofactions = ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max ? ($max + 1) : 0));
+		if (!is_array($listofactions)) dol_print_error($this->db, 'FailedToGetActions');
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_payment')  $title=$langs->trans('ActionsOnSupplierPayment');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
-
-            $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
-
-        	$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(),'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.'&socid='.$object->socid.'&projectid='.$object->fk_project.'&backtopage='.urlencode($urlbacktopage).'">';
-        	$buttontoaddnewevent.= $langs->trans("AddEvent");
-        	$buttontoaddnewevent.= '</a>';
+        	if ($typeelement == 'invoice')               $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title = $langs->trans('ActionsOnBill');
+        	elseif ($typeelement == 'propal')            $title = $langs->trans('ActionsOnPropal');
+        	elseif ($typeelement == 'supplier_payment')  $title = $langs->trans('ActionsOnSupplierPayment');
+        	elseif ($typeelement == 'supplier_proposal') $title = $langs->trans('ActionsOnSupplierProposal');
+        	elseif ($typeelement == 'order')             $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title = $langs->trans('ActionsOnOrder');
+        	elseif ($typeelement == 'shipping')          $title = $langs->trans('ActionsOnShipping');
+            elseif ($typeelement == 'fichinter')         $title = $langs->trans('ActionsOnFicheInter');
+            elseif ($typeelement == 'project')           $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'task')              $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            elseif ($typeelement == 'member')            $title = $langs->trans('LatestLinkedEvents', $max ? $max : '');
+            else $title = $langs->trans("LatestLinkedEvents", $max ? $max : '');
+
+            $urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage ? '&'.$moreparambacktopage : '');
+
+        	$buttontoaddnewevent = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.dol_print_date(dol_now(), 'dayhourlog').'&origin='.$typeelement.'&originid='.$object->id.'&socid='.$object->socid.'&projectid='.$object->fk_project.'&backtopage='.urlencode($urlbacktopage).'">';
+        	$buttontoaddnewevent .= $langs->trans("AddEvent");
+        	$buttontoaddnewevent .= '</a>';
 
         	print '<!-- formactions->showactions -->'."\n";
         	print load_fiche_titre($title, $morehtmlright, '', 0, 0, '', $buttontoaddnewevent);
 
-        	$page=0; $param='';
+        	$page = 0; $param = '';
 
         	$total = 0;
 
         	print '<div class="div-table-responsive-no-min">';
-        	print '<table class="noborder'.($morecss?' '.$morecss:'').'" width="100%">';
+        	print '<table class="noborder'.($morecss ? ' '.$morecss : '').'" width="100%">';
         	print '<tr class="liste_titre">';
         	print getTitleFieldOfList('Ref', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
         	print getTitleFieldOfList('By', 0, $_SERVER["PHP_SELF"], '', $page, $param, '', $sortfield, $sortorder, '', 1);
@@ -220,24 +220,24 @@ 
         	if (count($listofactions))
         	{
 	        	$cursorevent = 0;
-	        	foreach($listofactions as $action)
+	        	foreach ($listofactions as $action)
 	        	{
 	        		if ($max && $cursorevent >= $max) break;
 
-	        		$ref=$action->getNomUrl(1,-1);
-	        		$label=$action->getNomUrl(0,38);
+	        		$ref = $action->getNomUrl(1, -1);
+	        		$label = $action->getNomUrl(0, 38);
 
 	        		print '<tr class="oddeven">';
 					print '<td>'.$ref.'</td>';
 	        		print '<td>';
-	        		if (! empty($action->userownerid))
+	        		if (!empty($action->userownerid))
 	        		{
-	        			$userstatic->fetch($action->userownerid);	// TODO Introduce a cache on users fetched
+	        			$userstatic->fetch($action->userownerid); // TODO Introduce a cache on users fetched
 	        			print $userstatic->getNomUrl(-1, '', 0, 0, 16, 0, '', '');
 	        		}
 	        		print '</td>';
 					print '<td>';
-	        		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
+	        		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	        		{
 	        		    if ($action->type_picto) print img_picto('', $action->type_picto);
 	        		    else {
@@ -250,20 +250,20 @@ 
 	        		print $action->type;
 	        		print '</td>';
 	        		print '<td>'.$label.'</td>';
-	        		print '<td align="center">'.dol_print_date($action->datep,'dayhour');
+	        		print '<td align="center">'.dol_print_date($action->datep, 'dayhour');
 	        		if ($action->datef)
 	        		{
-		        		$tmpa=dol_getdate($action->datep);
-		        		$tmpb=dol_getdate($action->datef);
+		        		$tmpa = dol_getdate($action->datep);
+		        		$tmpb = dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef, 'hour');
 		        		}
-		        		else print '-'.dol_print_date($action->datef,'dayhour');
+		        		else print '-'.dol_print_date($action->datef, 'dayhour');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
-	        		if (! empty($action->author->id))
+	        		if (!empty($action->author->id))
 	        		{
 	        			print $action->getLibStatut(3);
 	        		}
@@ -303,41 +303,41 @@ 
      *  @param  int             $nooutput       1=No output
      * 	@return	string
      */
-    function select_type_actions($selected='', $htmlname='actioncode', $excludetype='', $onlyautoornot=0, $hideinfohelp=0, $multiselect=0, $nooutput=0)
+    function select_type_actions($selected = '', $htmlname = 'actioncode', $excludetype = '', $onlyautoornot = 0, $hideinfohelp = 0, $multiselect = 0, $nooutput = 0)
     {
-        global $langs,$user,$form,$conf;
+        global $langs, $user, $form, $conf;
 
-        if (! is_object($form)) $form=new Form($db);
+        if (!is_object($form)) $form = new Form($db);
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
-        $caction=new CActionComm($this->db);
+        $caction = new CActionComm($this->db);
 
        	// Suggest a list with manual events or all auto events
-       	$arraylist=$caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
-       	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
+       	$arraylist = $caction->liste_array(1, 'code', $excludetype, $onlyautoornot);
+       	array_unshift($arraylist, '&nbsp;'); // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') $selected = 'AC_OTH';
+       	if ($selected == 'auto')   $selected = 'AC_OTH_AUTO';
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
 
-       	$out='';
+       	$out = '';
 
-		if (! empty($multiselect))
+		if (!empty($multiselect))
 		{
 	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
-			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
+			$out .= $form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
 		}
 		else
 		{
-			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+			$out .= $form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		}
 
         if ($user->admin && empty($onlyautoornot) && $hideinfohelp <= 0)
         {
-            $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
+            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''), 1);
         }
 
         if ($nooutput) return $out;

Braces +85 added lines, -39 removed lines

@@ -120,9 +120,13 @@ 
         if (! empty($conf->use_javascript_ajax) || $onlyselect)
         {
         	//var_dump($selected);
-        	if ($selected == 'done') $selected='100';
+        	if ($selected == 'done') {
+        		$selected='100';
+        	}
             print '<select '.($canedit?'':'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss?' '.$morecss:'').'">';
-            if ($showempty) print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            if ($showempty) {
+            	print '<option value=""'.($selected == ''?' selected':'').'></option>';
+            }
             foreach($listofstatus as $key => $val)
             {
                 print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -132,15 +136,16 @@ 
                 }
             }
             print '</select>';
-            if ($selected == 0 || $selected == 100) $canedit=0;
+            if ($selected == 0 || $selected == 100) {
+            	$canedit=0;
+            }
 
             if (empty($onlyselect))
             {
 	            print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit&&($selected>=0)?'':' disabled').'>';
     	        print '<span class="hideonsmartphone hideifna">%</span>';
             }
-        }
-        else
+        } else
 		{
             print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat" value="'.($selected>=0?$selected:'').'" size="2"'.($canedit?'':' disabled').'>%';
         }
@@ -171,24 +176,40 @@ 
         $sortorder='DESC';
 
         $listofactions=ActionComm::getActions($this->db, $socid, $object->id, $typeelement, '', $sortfield, $sortorder, ($max?($max+1):0));
-		if (! is_array($listofactions)) dol_print_error($this->db,'FailedToGetActions');
+		if (! is_array($listofactions)) {
+			dol_print_error($this->db,'FailedToGetActions');
+		}
 
         $num = count($listofactions);
         if ($num || $forceshowtitle)
         {
-        	if ($typeelement == 'invoice')               $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') $title=$langs->trans('ActionsOnBill');
-        	elseif ($typeelement == 'propal')            $title=$langs->trans('ActionsOnPropal');
-        	elseif ($typeelement == 'supplier_payment')  $title=$langs->trans('ActionsOnSupplierPayment');
-        	elseif ($typeelement == 'supplier_proposal') $title=$langs->trans('ActionsOnSupplierProposal');
-        	elseif ($typeelement == 'order')             $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order')   $title=$langs->trans('ActionsOnOrder');
-        	elseif ($typeelement == 'shipping')          $title=$langs->trans('ActionsOnShipping');
-            elseif ($typeelement == 'fichinter')         $title=$langs->trans('ActionsOnFicheInter');
-            elseif ($typeelement == 'project')           $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'task')              $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            elseif ($typeelement == 'member')            $title=$langs->trans('LatestLinkedEvents', $max?$max:'');
-            else $title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+        	if ($typeelement == 'invoice') {
+        		$title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'invoice_supplier' || $typeelement == 'supplier_invoice') {
+        		$title=$langs->trans('ActionsOnBill');
+        	} elseif ($typeelement == 'propal') {
+        		$title=$langs->trans('ActionsOnPropal');
+        	} elseif ($typeelement == 'supplier_payment') {
+        		$title=$langs->trans('ActionsOnSupplierPayment');
+        	} elseif ($typeelement == 'supplier_proposal') {
+        		$title=$langs->trans('ActionsOnSupplierProposal');
+        	} elseif ($typeelement == 'order') {
+        		$title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'order_supplier' || $typeelement == 'supplier_order') {
+        		$title=$langs->trans('ActionsOnOrder');
+        	} elseif ($typeelement == 'shipping') {
+        		$title=$langs->trans('ActionsOnShipping');
+        	} elseif ($typeelement == 'fichinter') {
+            	$title=$langs->trans('ActionsOnFicheInter');
+            } elseif ($typeelement == 'project') {
+            	$title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'task') {
+            	$title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } elseif ($typeelement == 'member') {
+            	$title=$langs->trans('LatestLinkedEvents', $max?$max:'');
+            } else {
+            	$title=$langs->trans("LatestLinkedEvents", $max?$max:'');
+            }
 
             $urlbacktopage=$_SERVER['PHP_SELF'].'?id='.$object->id.($moreparambacktopage?'&'.$moreparambacktopage:'');
 
@@ -222,7 +243,9 @@ 
 	        	$cursorevent = 0;
 	        	foreach($listofactions as $action)
 	        	{
-	        		if ($max && $cursorevent >= $max) break;
+	        		if ($max && $cursorevent >= $max) {
+	        			break;
+	        		}
 
 	        		$ref=$action->getNomUrl(1,-1);
 	        		$label=$action->getNomUrl(0,38);
@@ -239,12 +262,21 @@ 
 					print '<td>';
 	        		if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
 	        		{
-	        		    if ($action->type_picto) print img_picto('', $action->type_picto);
-	        		    else {
-	        		        if ($action->type_code == 'AC_RDV')   print img_picto('', 'object_group').' ';
-	        		        if ($action->type_code == 'AC_TEL')   print img_picto('', 'object_phoning').' ';
-	        		        if ($action->type_code == 'AC_FAX')   print img_picto('', 'object_phoning_fax').' ';
-	        		        if ($action->type_code == 'AC_EMAIL') print img_picto('', 'object_email').' ';
+	        		    if ($action->type_picto) {
+	        		    	print img_picto('', $action->type_picto);
+	        		    } else {
+	        		        if ($action->type_code == 'AC_RDV') {
+	        		        	print img_picto('', 'object_group').' ';
+	        		        }
+	        		        if ($action->type_code == 'AC_TEL') {
+	        		        	print img_picto('', 'object_phoning').' ';
+	        		        }
+	        		        if ($action->type_code == 'AC_FAX') {
+	        		        	print img_picto('', 'object_phoning_fax').' ';
+	        		        }
+	        		        if ($action->type_code == 'AC_EMAIL') {
+	        		        	print img_picto('', 'object_email').' ';
+	        		        }
 	        		    }
 	        		}
 	        		print $action->type;
@@ -257,9 +289,12 @@ 
 		        		$tmpb=dol_getdate($action->datef);
 		        		if ($tmpa['mday'] == $tmpb['mday'] && $tmpa['mon'] == $tmpb['mon'] && $tmpa['year'] == $tmpb['year'])
 		        		{
-		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) print '-'.dol_print_date($action->datef,'hour');
+		        			if ($tmpa['hours'] != $tmpb['hours'] || $tmpa['minutes'] != $tmpb['minutes'] && $tmpa['seconds'] != $tmpb['seconds']) {
+		        				print '-'.dol_print_date($action->datef,'hour');
+		        			}
+		        		} else {
+		        			print '-'.dol_print_date($action->datef,'dayhour');
 		        		}
-		        		else print '-'.dol_print_date($action->datef,'dayhour');
 	        		}
 	        		print '</td>';
 	        		print '<td align="right">';
@@ -272,8 +307,7 @@ 
 
 	        		$cursorevent++;
 	        	}
-        	}
-        	else
+        	} else
         	{
         		print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
         	}
@@ -307,7 +341,9 @@ 
     {
         global $langs,$user,$form,$conf;
 
-        if (! is_object($form)) $form=new Form($db);
+        if (! is_object($form)) {
+        	$form=new Form($db);
+        }
 
         require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
         require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -318,19 +354,26 @@ 
        	array_unshift($arraylist,'&nbsp;');     // Add empty line at start
        	//asort($arraylist);
 
-       	if ($selected == 'manual') $selected='AC_OTH';
-       	if ($selected == 'auto')   $selected='AC_OTH_AUTO';
+       	if ($selected == 'manual') {
+       		$selected='AC_OTH';
+       	}
+       	if ($selected == 'auto') {
+       		$selected='AC_OTH_AUTO';
+       	}
 
-       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) unset($arraylist['AC_OTH_AUTO']);
+       	if (! empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO)) {
+       		unset($arraylist['AC_OTH_AUTO']);
+       	}
 
        	$out='';
 
 		if (! empty($multiselect))
 		{
-	        if (!is_array($selected) && !empty($selected)) $selected = explode(',', $selected);
+	        if (!is_array($selected) && !empty($selected)) {
+	        	$selected = explode(',', $selected);
+	        }
 			$out.=$form->multiselectarray($htmlname, $arraylist, $selected, 0, 0, 'centpercent', 0, 0);
-		}
-		else
+		} else
 		{
 			$out.=$form->selectarray($htmlname, $arraylist, $selected, 0, 0, 0, '', 0, 0, 0, '', '', 1);
 		}
@@ -340,8 +383,11 @@ 
             $out.=info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup").($hideinfohelp == -1 ? ". ".$langs->trans("YouCanSetDefaultValueInModuleSetup") : ''),1);
         }
 
-        if ($nooutput) return $out;
-        else print $out;
+        if ($nooutput) {
+        	return $out;
+        } else {
+        	print $out;
+        }
         return '';
     }
 

htdocs/core/modules/commande/mod_commande_marbre.php

Doc Comments +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
 	 * 	Return next free value
 	 *
 	 *  @param	Societe		$objsoc     Object thirdparty
-	 *  @param  Object		$object		Object we need next value for
+	 *  @param  string		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
 	function getNextValue($objsoc,$object)

Indentation +12 added lines, -12 removed lines

@@ -35,16 +35,16 @@ 
 	var $nom='Marbre';
 
 
-    /**
-     *  Return description of numbering module
-     *
-     *  @return     string      Text with description
-     */
-    function info()
-    {
-    	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
-    }
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	function info()
+	{
+		global $langs;
+	  	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+	}
 
 
 	/**
@@ -127,8 +127,8 @@ 
 		$date=$object->date;
 		$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_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Braces +13 added lines, -6 removed lines

@@ -114,10 +114,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_commande_marbre::getNextValue", LOG_DEBUG);
 			return -1;
@@ -127,8 +129,13 @@ 
 		$date=$object->date;
 		$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_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;

Spacing +30 added lines, -30 removed lines

@@ -22,17 +22,17 @@ 
  *  \ingroup    commande
  *  \brief      File of class to manage customer order numbering rules Marbre
  */
-require_once DOL_DOCUMENT_ROOT .'/core/modules/commande/modules_commande.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 
 /**
  *	Class to manage customer order numbering rules Marbre
  */
 class mod_commande_marbre extends ModeleNumRefCommandes
 {
-	var $version='dolibarr';		// 'development', 'experimental', 'dolibarr'
-	var $prefix='CO';
-	var $error='';
-	var $nom='Marbre';
+	var $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+	var $prefix = 'CO';
+	var $error = '';
+	var $nom = 'Marbre';
 
 
     /**
@@ -43,7 +43,7 @@ 
     function info()
     {
     	global $langs;
-      	return $langs->trans("SimpleNumRefModelDesc",$this->prefix);
+      	return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
     }
 
 
@@ -66,26 +66,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."commande";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande";
+		$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;
 		}
 
@@ -99,23 +99,23 @@ 
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	function getNextValue($objsoc,$object)
+	function getNextValue($objsoc, $object)
 	{
-		global $db,$conf;
+		global $db, $conf;
 
 		// D'abord on recupere la valeur max
-		$posindice=8;
+		$posindice = 8;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
-		$sql.= " FROM ".MAIN_DB_PREFIX."commande";
-		$sql.= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql.= " AND entity = ".$conf->entity;
+		$sql .= " FROM ".MAIN_DB_PREFIX."commande";
+		$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
 		{
@@ -124,11 +124,11 @@ 
 		}
 
 		//$date=time();
-		$date=$object->date;
-		$yymm = strftime("%y%m",$date);
+		$date = $object->date;
+		$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_commande_marbre::getNextValue return ".$this->prefix.$yymm."-".$num);
 		return $this->prefix.$yymm."-".$num;
@@ -142,9 +142,9 @@ 
 	 * 	@param	string		$objforref	Object for number to search
 	 *  @return string      			Next free value
 	 */
-	function commande_get_num($objsoc,$objforref)
+	function commande_get_num($objsoc, $objforref)
 	{
-		return $this->getNextValue($objsoc,$objforref);
+		return $this->getNextValue($objsoc, $objforref);
 	}
 
 }