ATM-Consulting / dolibarr_module_subtotal

admin/subtotal_about.php

Indentation +8 added lines, -8 removed lines

@@ -25,7 +25,7 @@ 
 // Dolibarr environment
 $res = @include("../../main.inc.php"); // From htdocs directory
 if (! $res) {
-    $res = @include("../../../main.inc.php"); // From "custom" directory
+	$res = @include("../../../main.inc.php"); // From "custom" directory
 }
 
 // Libraries
@@ -37,7 +37,7 @@ 
 
 // Access control
 if (! $user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 /*
@@ -48,17 +48,17 @@ 
 
 // Subheader
 $linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php">'
-    . $langs->trans("BackToModuleList") . '</a>';
+	. $langs->trans("BackToModuleList") . '</a>';
 print_fiche_titre($langs->trans($page_name), $linkback);
 
 // Configuration header
 $head = subtotalAdminPrepareHead();
 dol_fiche_head(
-    $head,
-    'about',
-    $langs->trans("Module104777Name"),
-    0,
-    'subtotal@subtotal'
+	$head,
+	'about',
+	$langs->trans("Module104777Name"),
+	0,
+	'subtotal@subtotal'
 );
 
 // About page goes here

admin/subtotal_setup.php

Indentation +7 added lines, -7 removed lines

@@ -28,7 +28,7 @@ 
 // Dolibarr environment
 $res = @include("../../main.inc.php"); // From htdocs directory
 if (! $res) {
-    $res = @include("../../../main.inc.php"); // From "custom" directory
+	$res = @include("../../../main.inc.php"); // From "custom" directory
 }
 
 // Libraries
@@ -39,7 +39,7 @@ 
 
 // Access control
 if (! $user->admin) {
-    accessforbidden();
+	accessforbidden();
 }
 
 // Parameters
@@ -91,11 +91,11 @@ 
 // Configuration header
 $head = subtotalAdminPrepareHead();
 dol_fiche_head(
-    $head,
-    'settings',
-    $langs->trans("Module104777Name"),
-    0,
-    "subtotal@subtotal"
+	$head,
+	'settings',
+	$langs->trans("Module104777Name"),
+	0,
+	"subtotal@subtotal"
 );
 
 showParameters();

script/import-from-milestone.php

Indentation +20 added lines, -20 removed lines

@@ -56,33 +56,33 @@
 	}
 
 
-        $res = $db->query("SELECT DISTINCT(fk_facture) as fk_facture FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code=104777");
-        while($obj = $db->fetch_object($res)) {
-                $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."facturedet WHERE fk_facture=".$obj->fk_propal." ORDER BY rang ");
-                $k = 1;
-                while($objLine = $db->fetch_object($resLine)) {
+		$res = $db->query("SELECT DISTINCT(fk_facture) as fk_facture FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code=104777");
+		while($obj = $db->fetch_object($res)) {
+				$resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."facturedet WHERE fk_facture=".$obj->fk_propal." ORDER BY rang ");
+				$k = 1;
+				while($objLine = $db->fetch_object($resLine)) {
 
-                        $sql="UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
+						$sql="UPDATE ".MAIN_DB_PREFIX."facturedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
 
-                         print $sql.";<br />";
-                        $k++;
-                }
+						 print $sql.";<br />";
+						$k++;
+				}
 
-        }
+		}
 
-        $res = $db->query("SELECT DISTINCT(fk_commande) as fk_commande FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code=104777");
-        while($obj = $db->fetch_object($res)) {
-                $resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."commandedet WHERE fk_commande=".$obj->fk_propal." ORDER BY rang ");
-                $k = 1;
-                while($objLine = $db->fetch_object($resLine)) {
+		$res = $db->query("SELECT DISTINCT(fk_commande) as fk_commande FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code=104777");
+		while($obj = $db->fetch_object($res)) {
+				$resLine = $db->query("SELECT rowid FROM  ".MAIN_DB_PREFIX."commandedet WHERE fk_commande=".$obj->fk_propal." ORDER BY rang ");
+				$k = 1;
+				while($objLine = $db->fetch_object($resLine)) {
 
-                        $sql="UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
+						$sql="UPDATE ".MAIN_DB_PREFIX."commandedet SET rang=".$k.",fk_parent_line=NULL WHERE rowid=".$objLine->rowid;
 
-                         print $sql.";<br />";
-                        $k++;
-                }
+						 print $sql.";<br />";
+						$k++;
+				}
 
-        }
+		}
 
 
 	 print $sql.";<br />";

htdocs_38/core/lib/pdf.lib.php

Indentation +1 added lines, -1 removed lines

@@ -127,7 +127,7 @@
 	else require_once FPDF_PATH.'fpdf.php';
 
 	// We need to instantiate tcpdi or fpdi object (instead of tcpdf) to use merging features. But we can disable it (this will break all merge features).
-    if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
+	if (empty($conf->global->MAIN_DISABLE_TCPDI)) require_once TCPDI_PATH.'tcpdi.php';
 	else if (empty($conf->global->MAIN_DISABLE_FPDI)) require_once FPDI_PATH.'fpdi.php';
 
 	//$arrayformat=pdf_getFormat();

core/modules/facture/doc/pdf_crabe_subtotal.modules.php

Indentation +65 added lines, -65 removed lines

@@ -38,17 +38,17 @@ 
  */
 class pdf_crabe_subtotal extends ModelePDFFactures
 {
-    var $db;
-    var $name;
-    var $description;
-    var $type;
+	var $db;
+	var $name;
+	var $description;
+	var $type;
 
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
-    var $version = 'dolibarr';
+	var $phpmin = array(4,3,0); // Minimum version of PHP required by module
+	var $version = 'dolibarr';
 
-    var $page_largeur;
-    var $page_hauteur;
-    var $format;
+	var $page_largeur;
+	var $page_hauteur;
+	var $format;
 	var $marge_gauche;
 	var	$marge_droite;
 	var	$marge_haute;
@@ -130,15 +130,15 @@ 
 
 
 	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int         	    			1=OK, 0=KO
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
@@ -230,25 +230,25 @@ 
 
 				// Create pdf instance
 				$pdf=pdf_getInstance($this->format);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-				    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-				    $tplidx = $pdf->importPage(1);
-                }
+				$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));
+
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -538,8 +538,8 @@ 
 					// Discount on line
 					if ($object->lines[$i]->remise_percent)
 					{
-                        $pdf->SetXY($this->posxdiscount-2, $curY);
-					    $remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$pdf->SetXY($this->posxdiscount-2, $curY);
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
 						$pdf->MultiCell($this->postotalht-$this->posxdiscount+2, 3, $remise_percent, 0, 'R');
 					}
 
@@ -577,7 +577,7 @@ 
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -713,20 +713,20 @@ 
 	/**
 	 *  Show payments table
 	 *
-     *  @param	PDF			$pdf           Object PDF
-     *  @param  Object		$object         Object invoice
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	PDF			$pdf           Object PDF
+	 *  @param  Object		$object         Object invoice
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
 		global $conf;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+		$sign=1;
+		if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
-        $tab3_posx = 120;
+		$tab3_posx = 120;
 		$tab3_top = $posy + 8;
 		$tab3_width = 80;
 		$tab3_height = 4;
@@ -953,13 +953,13 @@ 
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+						{
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
-			            }
+						}
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
@@ -968,13 +968,13 @@ 
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+						{
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
-			            }
+						}
 					}
 				}
 			}
@@ -1016,10 +1016,10 @@ 
 	{
 		global $conf,$mysoc;
 
-        $sign=1;
-        if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+		$sign=1;
+		if ($object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
 
-        $default_font_size = pdf_getPDFFontSize($outputlangs);
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
@@ -1088,7 +1088,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1180,7 +1180,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1190,7 +1190,7 @@ 
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-						    // retrieve global local tax
+							// retrieve global local tax
 							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
@@ -1424,15 +1424,15 @@ 
 
 		// Show Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->FACTURE_DRAFT_WATERMARK)) )
-        {
-		      pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
-        }
+		{
+			  pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->FACTURE_DRAFT_WATERMARK);
+		}
 
 		$pdf->SetTextColor(0,0,60);
 		$pdf->SetFont('','B', $default_font_size + 3);
 
 		$posy=$this->marge_haute;
-        $posx=$this->page_largeur-$this->marge_droite-100;
+		$posx=$this->page_largeur-$this->marge_droite-100;
 
 		$pdf->SetXY($this->marge_gauche,$posy);
 
@@ -1442,7 +1442,7 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
+				$height=pdf_getHeightForLogo($logo);
 				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
@@ -1633,7 +1633,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

core/modules/propale/doc/pdf_azur_subtotal.modules.php

Indentation +52 added lines, -52 removed lines

@@ -128,15 +128,15 @@ 
 	}
 
 	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             				1=OK, 0=KO
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             				1=OK, 0=KO
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
@@ -259,25 +259,25 @@ 
 				$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);
-                $default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-                $heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				$pdf=pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
+				$heightforinfotot = 50;	// Height reserved to output the info and total part
+				$heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+				$pdf->SetAutoPageBreak(1,0);
+
+				if (class_exists('TCPDF'))
+				{
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -612,7 +612,7 @@ 
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -750,11 +750,11 @@ 
 	/**
 	 *  Show payments table
 	 *
-     *  @param	PDF			$pdf           Object PDF
-     *  @param  Object		$object         Object proposal
-     *  @param  int			$posy           Position y in PDF
-     *  @param  Translate	$outputlangs    Object langs for output
-     *  @return int             			<0 if KO, >0 if OK
+	 *  @param	PDF			$pdf           Object PDF
+	 *  @param  Object		$object         Object proposal
+	 *  @param  int			$posy           Position y in PDF
+	 *  @param  Translate	$outputlangs    Object langs for output
+	 *  @return int             			<0 if KO, >0 if OK
 	 */
 	function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
 	{
@@ -790,10 +790,10 @@ 
 
 		$posxval=52;
 
-        // Show shipping date
-        if (! empty($object->date_livraison))
+		// Show shipping date
+		if (! empty($object->date_livraison))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -803,9 +803,9 @@ 
 			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy=$pdf->GetY()+1;
+			$posy=$pdf->GetY()+1;
 		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -891,13 +891,13 @@ 
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+						{
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
-			            }
+						}
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1)
 					{
@@ -906,13 +906,13 @@ 
 						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
 						$posy=$pdf->GetY()+1;
 
-			            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-			            {
+						if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+						{
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('','', $default_font_size - $diffsizetitle);
 							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 							$posy=$pdf->GetY()+2;
-			            }
+						}
 					}
 				}
 			}
@@ -1022,7 +1022,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1114,7 +1114,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1124,7 +1124,7 @@ 
 
 						foreach( $localtax_rate as $tvakey => $tvaval )
 						{
-						    // retrieve global local tax
+							// retrieve global local tax
 							if ($tvakey != 0)    // On affiche pas taux 0
 							{
 								//$this->atleastoneratenotnull++;
@@ -1341,7 +1341,7 @@ 
 		//  Show Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->PROPALE_DRAFT_WATERMARK)) )
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->PROPALE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0,0,60);
@@ -1358,8 +1358,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -1517,7 +1517,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

core/modules/commande/doc/pdf_einstein_subtotal.modules.php

Indentation +116 added lines, -116 removed lines

@@ -38,23 +38,23 @@ 
  */
 class pdf_einstein_subtotal extends ModelePDFCommandes
 {
-    var $db;
-    var $name;
-    var $description;
-    var $type;
+	var $db;
+	var $name;
+	var $description;
+	var $type;
 
-    var $phpmin = array(4,3,0); // Minimum version of PHP required by module
-    var $version = 'dolibarr';
+	var $phpmin = array(4,3,0); // Minimum version of PHP required by module
+	var $version = 'dolibarr';
 
-    var $page_largeur;
-    var $page_hauteur;
-    var $format;
+	var $page_largeur;
+	var $page_hauteur;
+	var $format;
 	var $marge_gauche;
 	var	$marge_droite;
 	var	$marge_haute;
 	var	$marge_basse;
 
-    var $emetteur;	// Objet societe qui emet
+	var $emetteur;	// Objet societe qui emet
 
 
 	/**
@@ -129,15 +129,15 @@ 
 	}
 
 	/**
-     *  Function to build pdf onto disk
-     *
-     *  @param		Object		$object				Object to generate
-     *  @param		Translate	$outputlangs		Lang output object
-     *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
-     *  @param		int			$hidedetails		Do not show line details
-     *  @param		int			$hidedesc			Do not show desc
-     *  @param		int			$hideref			Do not show ref
-     *  @return     int             			1=OK, 0=KO
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			1=OK, 0=KO
 	 */
 	function write_file($object,$outputlangs,$srctemplatepath='',$hidedetails=0,$hidedesc=0,$hideref=0)
 	{
@@ -159,13 +159,13 @@ 
 
 		if ($conf->commande->dir_output)
 		{
-            $object->fetch_thirdparty();
+			$object->fetch_thirdparty();
 			if(!empty($object->client) ){
 				$object->thirdparty = $object->client;
 			}
-            $deja_regle = "";
+			$deja_regle = "";
 
-            // Definition of $dir and $file
+			// Definition of $dir and $file
 			if ($object->specimen)
 			{
 				$dir = $conf->commande->dir_output;
@@ -204,22 +204,22 @@ 
 				$pdf=pdf_getInstance($this->format);
 				$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
 				$heightforinfotot = 50;	// Height reserved to output the info and total part
-		        $heightforfreetext= (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT)?$conf->global->MAIN_PDF_FREETEXT_HEIGHT:5);	// Height reserved to output the free text on last page
-	            $heightforfooter = $this->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
-                $pdf->SetAutoPageBreak(1,0);
-
-                if (class_exists('TCPDF'))
-                {
-                    $pdf->setPrintHeader(false);
-                    $pdf->setPrintFooter(false);
-                }
-                $pdf->SetFont(pdf_getPDFFont($outputlangs));
-                // Set path to the background PDF File
-                if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
-                {
-                    $pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
-                    $tplidx = $pdf->importPage(1);
-                }
+				$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));
+				// Set path to the background PDF File
+				if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
+				{
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
 
 				$pdf->Open();
 				$pagenb=0;
@@ -523,7 +523,7 @@ 
 						$localtax2_type = $localtaxtmp_array[2];
 					}
 
-				    // retrieve global local tax
+					// retrieve global local tax
 					if ($localtax1_type && $localtax1ligne != 0)
 						$this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne;
 					if ($localtax2_type && $localtax2ligne != 0)
@@ -655,7 +655,7 @@ 
 
 	/**
 	 *  Show payments table
-     *
+	 *
 	 *  @param	PDF			$pdf     		Object PDF
 	 *  @param  Object		$object			Object order
 	 *	@param	int			$posy			Position y in PDF
@@ -684,7 +684,7 @@ 
 
 		$pdf->SetFont('','', $default_font_size - 1);
 
-        // If France, show VAT mention if not applicable
+		// If France, show VAT mention if not applicable
 		if ($this->emetteur->country_code == 'FR' && $this->franchise == 1)
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
@@ -713,8 +713,8 @@ 
 			$posy=$pdf->GetY()+3;
 		}
 
-        // Check a payment mode is defined
-        /* Not used with orders
+		// Check a payment mode is defined
+		/* Not used with orders
 		if (empty($object->mode_reglement_code)
         	&& ! $conf->global->FACTURE_CHQ_NUMBER
         	&& ! $conf->global->FACTURE_RIB_NUMBER)
@@ -740,10 +740,10 @@ 
             $posy=$pdf->GetY()+1;
 		}*/
 
-	    // Show planed date of delivery
-        if (! empty($object->date_livraison))
+		// Show planed date of delivery
+		if (! empty($object->date_livraison))
 		{
-            $outputlangs->load("sendings");
+			$outputlangs->load("sendings");
 			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
@@ -753,9 +753,9 @@ 
 			$dlp=dol_print_date($object->date_livraison,"daytext",false,$outputlangs,true);
 			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
 
-            $posy=$pdf->GetY()+1;
+			$posy=$pdf->GetY()+1;
 		}
-        elseif ($object->availability_code || $object->availability)    // Show availability conditions
+		elseif ($object->availability_code || $object->availability)    // Show availability conditions
 		{
 			$pdf->SetFont('','B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
@@ -771,70 +771,70 @@ 
 			$posy=$pdf->GetY()+1;
 		}
 
-      	// Show payment mode
-        if ($object->mode_reglement_code
-        	 && $object->mode_reglement_code != 'CHQ'
-           	 && $object->mode_reglement_code != 'VIR')
-           	 {
-	            $pdf->SetFont('','B', $default_font_size - 2);
-	            $pdf->SetXY($this->marge_gauche, $posy);
-	            $titre = $outputlangs->transnoentities("PaymentMode").':';
-	            $pdf->MultiCell(80, 5, $titre, 0, 'L');
+	  	// Show payment mode
+		if ($object->mode_reglement_code
+			 && $object->mode_reglement_code != 'CHQ'
+		   	 && $object->mode_reglement_code != 'VIR')
+		   	 {
+				$pdf->SetFont('','B', $default_font_size - 2);
+				$pdf->SetXY($this->marge_gauche, $posy);
+				$titre = $outputlangs->transnoentities("PaymentMode").':';
+				$pdf->MultiCell(80, 5, $titre, 0, 'L');
 
 				$pdf->SetFont('','', $default_font_size - 2);
-	            $pdf->SetXY($posxval, $posy);
-	            $lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
-	            $pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
+				$pdf->SetXY($posxval, $posy);
+				$lib_mode_reg=$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code)!=('PaymentType'.$object->mode_reglement_code)?$outputlangs->transnoentities("PaymentType".$object->mode_reglement_code):$outputlangs->convToOutputCharset($object->mode_reglement);
+				$pdf->MultiCell(80, 5, $lib_mode_reg,0,'L');
 
-	            $posy=$pdf->GetY()+2;
-           	 }
+				$posy=$pdf->GetY()+2;
+		   	 }
 
 		// Show payment mode CHQ
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
-        {
-        	// Si mode reglement non force ou si force a CHQ
-	        if (! empty($conf->global->FACTURE_CHQ_NUMBER))
-	        {
-	            if ($conf->global->FACTURE_CHQ_NUMBER > 0)
-	            {
-	                $account = new Account($this->db);
-	                $account->fetch($conf->global->FACTURE_CHQ_NUMBER);
-
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('','B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
-		            $posy=$pdf->GetY()+1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-		                $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-	            }
-	            if ($conf->global->FACTURE_CHQ_NUMBER == -1)
-	            {
-	                $pdf->SetXY($this->marge_gauche, $posy);
-	                $pdf->SetFont('','B', $default_font_size - 3);
-	                $pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
-		            $posy=$pdf->GetY()+1;
-
-		            if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
-		            {
-			            $pdf->SetXY($this->marge_gauche, $posy);
-		                $pdf->SetFont('','', $default_font_size - 3);
-		                $pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
-			            $posy=$pdf->GetY()+2;
-		            }
-	            }
-	        }
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'CHQ')
+		{
+			// Si mode reglement non force ou si force a CHQ
+			if (! empty($conf->global->FACTURE_CHQ_NUMBER))
+			{
+				if ($conf->global->FACTURE_CHQ_NUMBER > 0)
+				{
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('','B', $default_font_size - 3);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$account->proprio),0,'L',0);
+					$posy=$pdf->GetY()+1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('','', $default_font_size - 3);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy=$pdf->GetY()+2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1)
+				{
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('','B', $default_font_size - 3);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo',$this->emetteur->name),0,'L',0);
+					$posy=$pdf->GetY()+1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS))
+					{
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('','', $default_font_size - 3);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy=$pdf->GetY()+2;
+					}
+				}
+			}
 		}
 
-        // If payment mode not forced or forced to VIR, show payment with BAN
-        if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
-        {
-        	if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR')
+		{
+			if (! empty($object->fk_bank) || ! empty($conf->global->FACTURE_RIB_NUMBER))
 			{
 				$bankid=(empty($object->fk_bank)?$conf->global->FACTURE_RIB_NUMBER:$object->fk_bank);
 				$account = new Account($this->db);
@@ -847,7 +847,7 @@ 
 
 				$posy+=2;
 			}
-        }
+		}
 
 		return $posy;
 	}
@@ -865,7 +865,7 @@ 
 	 */
 	function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
 	{
-	    global $conf,$mysoc;
+		global $conf,$mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -874,7 +874,7 @@ 
 		$pdf->SetFont('','', $default_font_size - 1);
 
 		// Tableau total
-        $col1x = 120; $col2x = 170;
+		$col1x = 120; $col2x = 170;
 		if ($this->page_largeur < 210) // To work with US executive format
 		{
 			$col2x-=20;
@@ -935,7 +935,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 before VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1026,7 +1026,7 @@ 
 							}
 						}
 					}
-	      		//}
+		  		//}
 				//Local tax 2 after VAT
 				//if (! empty($conf->global->FACTURE_LOCAL_TAX2_OPTION) && $conf->global->FACTURE_LOCAL_TAX2_OPTION=='localtax2on')
 				//{
@@ -1075,8 +1075,8 @@ 
 
 		$pdf->SetTextColor(0,0,0);
 
-        $creditnoteamount=0;
-        $depositsamount=0;
+		$creditnoteamount=0;
+		$depositsamount=0;
 		//$creditnoteamount=$object->getSumCreditNotesUsed();
 		//$depositsamount=$object->getSumDepositsUsed();
 		//print "x".$creditnoteamount."-".$depositsamount;exit;
@@ -1230,7 +1230,7 @@ 
 		// Show Draft Watermark
 		if($object->statut==0 && (! empty($conf->global->COMMANDE_DRAFT_WATERMARK)) )
 		{
-            pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
+			pdf_watermark($pdf,$outputlangs,$this->page_hauteur,$this->page_largeur,'mm',$conf->global->COMMANDE_DRAFT_WATERMARK);
 		}
 
 		$pdf->SetTextColor(0,0,60);
@@ -1247,8 +1247,8 @@ 
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+				$height=pdf_getHeightForLogo($logo);
+				$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height);	// width=0 (auto)
 			}
 			else
 			{
@@ -1386,7 +1386,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

script/migrate_titles_to_7.0.php

Indentation +63 added lines, -63 removed lines

@@ -6,73 +6,73 @@
 
 if((float)DOL_VERSION >= 7)
 {
-    print "Début de conversion des lignes de propale<br>";
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."propaldet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
-    $res = $db->query($sql);
-    if($res)
-    {
-        print $db->num_rows($res)." lignes à convertir<br>";
-        $i = 0;
-        while ($obj = $db->fetch_object($res))
-        {
-            $prop = new PropaleLigne($db);
-            $prop->fetch($obj->rowid);
-            $prop->fetch_optionals();
-            if (empty($prop->label)){
-                $prop->label = strip_tags($prop->desc);
-                $prop->desc = '';
-            }
-            $ret = $prop->update(1);
-            if($ret>0) $i++;
-        }
-        print $i." lignes converties<br>";
-    }
+	print "Début de conversion des lignes de propale<br>";
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."propaldet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
+	$res = $db->query($sql);
+	if($res)
+	{
+		print $db->num_rows($res)." lignes à convertir<br>";
+		$i = 0;
+		while ($obj = $db->fetch_object($res))
+		{
+			$prop = new PropaleLigne($db);
+			$prop->fetch($obj->rowid);
+			$prop->fetch_optionals();
+			if (empty($prop->label)){
+				$prop->label = strip_tags($prop->desc);
+				$prop->desc = '';
+			}
+			$ret = $prop->update(1);
+			if($ret>0) $i++;
+		}
+		print $i." lignes converties<br>";
+	}
     
-    print "Début de conversion des lignes de commande<br>";
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
-    $res = $db->query($sql);
-    if($res)
-    {
-        print $db->num_rows($res)." lignes à convertir<br>";
-        $i = 0;
-        while ($obj = $db->fetch_object($res))
-        {
-            $cdeline = new OrderLine($db);
-            $cdeline->fetch($obj->rowid);
-            $cdeline->fetch_optionals($obj->rowid);
-            if (empty($cdeline->label)){
-                $cdeline->label = strip_tags($cdeline->desc);
-                $cdeline->desc = '';
-            }
-            $ret = $cdeline->update($user, 1);
-            if($ret>0) $i++;
-        }
+	print "Début de conversion des lignes de commande<br>";
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commandedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
+	$res = $db->query($sql);
+	if($res)
+	{
+		print $db->num_rows($res)." lignes à convertir<br>";
+		$i = 0;
+		while ($obj = $db->fetch_object($res))
+		{
+			$cdeline = new OrderLine($db);
+			$cdeline->fetch($obj->rowid);
+			$cdeline->fetch_optionals($obj->rowid);
+			if (empty($cdeline->label)){
+				$cdeline->label = strip_tags($cdeline->desc);
+				$cdeline->desc = '';
+			}
+			$ret = $cdeline->update($user, 1);
+			if($ret>0) $i++;
+		}
         
-        print $i." lignes converties<br>";
-    }
+		print $i." lignes converties<br>";
+	}
     
-    print "Début de conversion des lignes de facture<br>";
-    $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
+	print "Début de conversion des lignes de facture<br>";
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet WHERE special_code = 104777 AND qty != 50 AND product_type = 9 AND (label = '' OR label IS NULL)";
     
-    $res = $db->query($sql);
-    if($res)
-    {
-        print $db->num_rows($res)." lignes à convertir<br>";
-        $i = 0;
-        while ($obj = $db->fetch_object($res))
-        {
-            $facline = new FactureLigne($db);
-            $facline->fetch($obj->rowid);
-            $facline->fetch_optionals($obj->rowid);
-            if (empty($facline->label)){
-                $facline->label = strip_tags($facline->desc);
-                $facline->desc = '';
-            }
-            $ret = $facline->update($user, 1);
-            if($ret>0) $i++;
-        }
+	$res = $db->query($sql);
+	if($res)
+	{
+		print $db->num_rows($res)." lignes à convertir<br>";
+		$i = 0;
+		while ($obj = $db->fetch_object($res))
+		{
+			$facline = new FactureLigne($db);
+			$facline->fetch($obj->rowid);
+			$facline->fetch_optionals($obj->rowid);
+			if (empty($facline->label)){
+				$facline->label = strip_tags($facline->desc);
+				$facline->desc = '';
+			}
+			$ret = $facline->update($user, 1);
+			if($ret>0) $i++;
+		}
         
-        print $i." lignes converties<br>";
-    }
+		print $i." lignes converties<br>";
+	}
     
 }
\ No newline at end of file

class/actions_subtotal.class.php

Indentation +226 added lines, -226 removed lines

@@ -81,11 +81,11 @@ 
 	 * @return     void
 	 */
     
-    var $module_number = 104777;
+	var $module_number = 104777;
     
-    function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
-    {
-      	global $langs,$db,$user, $conf;
+	function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
+	{
+	  	global $langs,$db,$user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
@@ -100,10 +100,10 @@ 
 				$createRight = $user->rights->facture->creer;
 			} elseif($object->element == 'order_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->commande->creer;
+				$createRight = $user->rights->fournisseur->commande->creer;
 			} elseif($object->element == 'invoice_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->facture->creer;
+				$createRight = $user->rights->fournisseur->facture->creer;
 			}
 			
 			if ($object->statut == 0  && $createRight) {
@@ -153,7 +153,7 @@ 
 					
 					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
 					
-	    			TSubtotal::addSubTotalLine($object, $title, $qty);
+					TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
 				else if($action==='ask_deleteallline') {
 						$form=new Form($db);
@@ -375,36 +375,36 @@ 
 		$TContext = explode(':',$parameters['context']);
 		if (
 				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
+				|| in_array('invoicesuppliercard',$TContext)
 				|| in_array('propalcard',$TContext)
 				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
+				|| in_array('ordersuppliercard',$TContext)
 				|| in_array('invoicereccard',$TContext)
 			)
-	        {	
-	            $hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
-	            $hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
+			{	
+				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
+				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
 				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
 				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
 				
 				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
 		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
 		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideprices">'.$langs->trans('SubTotalhidePrice').'</label>
 		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
@@ -416,9 +416,9 @@ 
 				if ( 
 					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
 					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
 					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
 				)
 				{
@@ -437,19 +437,19 @@ 
 			}
 			
 		
-        return 1;
+		return 1;
 	} 
 	 
-    function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
-    {
+	function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
+	{
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
-        {
+		if (in_array('invoicecard',explode(':',$parameters['context'])))
+		{
         	
-        }
+		}
 		
-        return 0;
-    }
+		return 0;
+	}
 	
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
@@ -498,11 +498,11 @@ 
 	
 		if (
 				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
 				|| in_array('invoicereccard',explode(':',$parameters['context']))
 		) {
 			
@@ -581,20 +581,20 @@ 
 				in_array('invoicecard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 			)
-	        {								
+			{								
 				if(in_array('invoicecard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
 				}
 				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_facture_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_facture_fournisseur';
+					$sessname3 = 'subtotal_hideprices_facture_fournisseur';
 				}
 				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
@@ -602,9 +602,9 @@ 
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
 				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
-				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
-				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
+					$sessname = 'subtotal_hideInnerLines_supplier_proposal';
+					$sessname2 = 'subtotal_hidedetails_supplier_proposal';
+					$sessname3 = 'subtotal_hideprices_supplier_proposal';
 				}
 				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
@@ -612,9 +612,9 @@ 
 					$sessname3 = 'subtotal_hideprices_commande';
 				}
 				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_commande_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_commande_fournisseur';
+					$sessname3 = 'subtotal_hideprices_commande_fournisseur';
 				}
 				else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
@@ -639,17 +639,17 @@ 
 				foreach($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
-                            $line->modsubtotal_total = 1;
-                        }
-                        else{
-                            $line->modsubtotal_title = 1;
-                        }
+						if($line->qty>=90) {
+							$line->modsubtotal_total = 1;
+						}
+						else{
+							$line->modsubtotal_title = 1;
+						}
                         
 						$line->total_ht = $this->getTotalLineFromObject($object, $line, '');
 					}
-	        	}
-	        }
+				}
+			}
 			
 		}
 		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
@@ -666,7 +666,7 @@ 
 				 */
 				else if($object->element=='invoice_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
@@ -689,7 +689,7 @@ 
 				 */
 				else if($object->element=='order_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
@@ -733,7 +733,7 @@ 
 		
 		foreach($object->lines as $l) {
 		
-		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
+			$lid = (!empty($l->rowid) ? $l->rowid : $l->id);
 			if($lid == $lineid) {
 
 				$found = true;
@@ -742,7 +742,7 @@ 
 			
 			if($found) {
 				
-			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
+				$Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
 				
 				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
 					break; // end of story
@@ -821,17 +821,17 @@ 
 			if($l->rang>=$rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
-                            $total = 0;
-                        } else  if ($l->situation_percent > 0 ){
+						if (TSubtotal::isSubtotal($l)){
+							$total = 0;
+						} else  if ($l->situation_percent > 0 ){
                            
         	
 		 	$prev_progress = $l->get_prev_progress($object->id);
 		 	$progress = ($l->situation_percent - $prev_progress) /100;
-                        $total += ($l->total_ht/($l->situation_percent/100)) * $progress;
+						$total += ($l->total_ht/($l->situation_percent/100)) * $progress;
                         
-                    }
-                }
+					}
+				}
                 
 		return price($total);
 	}
@@ -863,7 +863,7 @@ 
 		if(method_exists('Closure','bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
 			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+					return $pdf->bMargin ;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
@@ -926,11 +926,11 @@ 
 				else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
-                                        if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
-                                                $total_to_print = $this->getTotalToPrintSituation($object, $line);
-                                        } else {
-                                            	$total_to_print = price($total);
-                                        }
+										if(get_class($object) == 'Facture' && $object->type==Facture::TYPE_SITUATION){//Facture de situation
+												$total_to_print = $this->getTotalToPrintSituation($object, $line);
+										} else {
+												$total_to_print = price($total);
+										}
                                             
 					$line->total_ht = $total;
 					$line->total = $total;
@@ -1081,7 +1081,7 @@ 
 	}
 	
 	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf, $hideprices, $hookmanager;
+		global $conf, $hideprices, $hookmanager;
 		
 		if(is_array($parameters)) $i = & $parameters['i'];
 		else $i = (int)$parameters;
@@ -1120,7 +1120,7 @@ 
 			}
 		}
 		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    $this->resprints = price($object->lines[$i]->total_ht);
+			$this->resprints = price($object->lines[$i]->total_ht);
 		}
 		
 		// Si la gestion C/NC est active et que je suis sur un ligne dont l'extrafield est coché
@@ -1249,7 +1249,7 @@ 
 	}
 	
 	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 
 		if($this->isModSubtotalLine($parameters,$object) ){
 			$this->resprints = ' ';
@@ -1271,32 +1271,32 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
 		        
-		    }
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
@@ -1333,7 +1333,7 @@ 
 	}
 	
 	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 	    
 		if($this->isModSubtotalLine($parameters,$object) ){
 			$this->resprints = ' ';
@@ -1358,31 +1358,31 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
@@ -1511,11 +1511,11 @@ 
 		$hidedetails = (int)GETPOST('hidedetails');
 		
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
+			$fk_parent_line=0;
 			$TLines =array();
 		
 			$original_count=count($object->lines);
-		    $TTvas = array(); // tableau de tva
+			$TTvas = array(); // tableau de tva
 		    
 			foreach($object->lines as $k=>&$line) 
 			{
@@ -1545,48 +1545,48 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
-				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+					if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+					{
+						if($line->tva_tx != '0.000' && $line->product_type!=9){
 				            
-    				        // on remplit le tableau de tva pour substituer les lignes cachées
-    				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
-    				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
-    				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
-    				    }
-    					if($line->product_type==9 && $line->rowid>0)
-    					{
-    					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
-    					    // génère des lignes d'affichage des montants HT soumis à tva
-    					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
-    					            $l = clone $line;
-    					            $l->product_type = 1;
-    					            $l->special_code = '';
-    					            $l->qty = 1;
-    					            $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-    					            $l->tva_tx = $tx;
-    					            $l->total_ht = $val['total_ht'];
-    					            $l->total_tva = $val['total_tva'];
-    					            $l->total = $line->total_ht;
-    					            $l->total_ttc = $val['total_ttc'];
-    					            $TLines[] = $l;
-    					            array_shift($TTvas);
-    					       }
-    					    }
+							// on remplit le tableau de tva pour substituer les lignes cachées
+							$TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
+							$TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
+							$TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
+						}
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							//Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
+							// génère des lignes d'affichage des montants HT soumis à tva
+							$nbtva = count($TTvas);
+							if(!empty($nbtva)){
+								foreach ($TTvas as $tx =>$val){
+									$l = clone $line;
+									$l->product_type = 1;
+									$l->special_code = '';
+									$l->qty = 1;
+									$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+									$l->tva_tx = $tx;
+									$l->total_ht = $val['total_ht'];
+									$l->total_tva = $val['total_tva'];
+									$l->total = $line->total_ht;
+									$l->total_ttc = $val['total_ttc'];
+									$TLines[] = $l;
+									array_shift($TTvas);
+							   }
+							}
     					    
-    					    // ajoute la ligne de sous-total
-    					    $TLines[] = $line; 
-    					}
-				    } else {
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					} else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
-				        {
-				            // ajoute la ligne de sous-total
-				            $TLines[] = $line; 
-				        }
-				    }
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					}
 				    
 					
 				}
@@ -1611,20 +1611,20 @@ 
 			$nbtva = count($TTvas);
 			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
-			        $l = clone $line;
-			        $l->product_type = 1;
-			        $l->special_code = '';
-			        $l->qty = 1;
-			        $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-			        $l->tva_tx = $tx;
-			        $l->total_ht = $val['total_ht'];
-			        $l->total_tva = $val['total_tva'];
-			        $l->total = $line->total_ht;
-			        $l->total_ttc = $val['total_ttc'];
-			        $TLines[] = $l;
-			        array_shift($TTvas);
-			    }
+				foreach ($TTvas as $tx =>$val){
+					$l = clone $line;
+					$l->product_type = 1;
+					$l->special_code = '';
+					$l->qty = 1;
+					$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+					$l->tva_tx = $tx;
+					$l->total_ht = $val['total_ht'];
+					$l->total_tva = $val['total_tva'];
+					$l->total = $line->total_ht;
+					$l->total_ttc = $val['total_ttc'];
+					$TLines[] = $l;
+					array_shift($TTvas);
+				}
 			}
 			
 			global $nblignes;
@@ -1636,7 +1636,7 @@ 
 				$this->resprints = '';
 				return 0;
 			}
-	    }
+		}
 		
 		return 0;
 	}
@@ -1799,18 +1799,18 @@ 
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
 		if($line->special_code!=$this->module_number || $line->product_type!=9) {
 			null;
 		}	
 		else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) 
-        {
+		{
 			if($object->element=='facture')$idvar = 'facid';
 			else $idvar='id';
 			
@@ -1857,7 +1857,7 @@ 
 			//var_dump($line);
             
 			// HTML 5 data for js
-            $data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
+			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
             
 			
 			?>
@@ -1915,8 +1915,8 @@ 
 						}
 						
 						if ($object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
-						    $line->label = !empty($line->description) ? $line->description : $line->desc;
-						    $line->description = '';
+							$line->label = !empty($line->description) ? $line->description : $line->desc;
+							$line->description = '';
 						}
 						$newlabel = $line->label;
 						if($line->label=='' && !$isFreeText) {
@@ -2207,17 +2207,17 @@ 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
 		    
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
-		    {
-		        foreach ($object->lines as $line)
-		        {
-		            // 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($object->table_element_line,true);
-		            $line->fetch_optionals($line->id,$extralabels);
-		        }
-		    }
+			if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
+			{
+				foreach ($object->lines as $line)
+				{
+					// 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($object->table_element_line,true);
+					$line->fetch_optionals($line->id,$extralabels);
+				}
+			}
 		    
 			$TSubNc = array();
 			foreach ($object->lines as &$l)
@@ -2308,80 +2308,80 @@ 
 	{
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-	    $line = &$parameters['line'];
+		$line = &$parameters['line'];
 	    
-	    $ThtmlData['data-id']           = $line->id;
-	    $ThtmlData['data-product_type'] = $line->product_type;
-	    $ThtmlData['data-qty']          = 0; //$line->qty;
-	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
+		$ThtmlData['data-id']           = $line->id;
+		$ThtmlData['data-product_type'] = $line->product_type;
+		$ThtmlData['data-qty']          = 0; //$line->qty;
+		$ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
-	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
-	        $ThtmlData['data-issubtotal'] = 'subtotal';
-	    }
-	    else{
-	        $ThtmlData['data-issubtotal'] = 'freetext';
-	    }
+		if(TSubtotal::isTitle($line)){
+			$ThtmlData['data-issubtotal'] = 'title';
+		}elseif(TSubtotal::isSubtotal($line)){
+			$ThtmlData['data-issubtotal'] = 'subtotal';
+		}
+		else{
+			$ThtmlData['data-issubtotal'] = 'freetext';
+		}
 	    
 	    
-	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+		// Change or add data  from hooks
+		$parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
 	    
-	    // hook 
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    if ($reshook>0)
-	    {
-	        $ThtmlData = $hookmanager->resArray;
-	    }
-
-	    return $this->implodeHtmlData($ThtmlData);
+		// hook 
+		$reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook>0)
+		{
+			$ThtmlData = $hookmanager->resArray;
+		}
+
+		return $this->implodeHtmlData($ThtmlData);
 	
 	}
 	
 	
 	function implodeHtmlData($ThtmlData = array())
 	{
-	    $data = '';
-	    foreach($ThtmlData as $k => $h )
-	    {
-	        if(is_array($h))
-	        {
-	            $h = json_encode($h);
-	        }
+		$data = '';
+		foreach($ThtmlData as $k => $h )
+		{
+			if(is_array($h))
+			{
+				$h = json_encode($h);
+			}
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
-	    }
+			$data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+		}
 	    
-	    return $data;
+		return $data;
 	}
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+		global $conf,$tagidfortablednd,$filepath,$langs;
 	    
-	    /*
+		/*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+		$id=$object->id;
+		$nboflines=(isset($object->lines)?count($object->lines):0);
+		$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+		$id=$object->id;
+		$fk_element=$object->fk_element;
+		$table_element_line=$object->table_element_line;
+		$nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
+		$tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
+		$filepath=(empty($filepath)?'':$filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
-	    {
+		if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+		{
 	        
-	        ?>
+			?>
 		
 		
 			<script type="text/javascript">