ATM-Consulting / dolibarr_module_subtotal

core/modules/modSubtotal.class.php

Spacing +14 added lines, -14 removed lines

@@ -23,7 +23,7 @@ 
  * 	\ingroup	titre
  * 	\brief		Description and activation file for module titre
  */
-include_once DOL_DOCUMENT_ROOT . "/core/modules/DolibarrModules.class.php";
+include_once DOL_DOCUMENT_ROOT."/core/modules/DolibarrModules.class.php";
 
 /**
  * Description and activation class for module titre
@@ -66,7 +66,7 @@ 
         $this->version = '3.0.1';
         // Key used in llx_const table to save module status enabled/disabled
         // (where MYMODULE is value of property name of module in uppercase)
-        $this->const_name = 'MAIN_MODULE_' . strtoupper($this->name);
+        $this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
         // Where to store the module in setup page
         // (0=common,1=interface,2=others,3=very specific)
         $this->special = 2;
@@ -96,7 +96,7 @@ 
             // Set this to relative path of css if module has its own css file
             //'css' => '/titre/css/mycss.css.php',
             // Set here all hooks context managed by module
-            'hooks' => array('invoicecard', 'invoicesuppliercard','propalcard', 'supplier_proposalcard', 'ordercard', 'ordersuppliercard','odtgeneration','orderstoinvoice','admin','invoicereccard')
+            'hooks' => array('invoicecard', 'invoicesuppliercard', 'propalcard', 'supplier_proposalcard', 'ordercard', 'ordersuppliercard', 'odtgeneration', 'orderstoinvoice', 'admin', 'invoicereccard')
             // Set here all workflow context managed by module
             //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
         );
@@ -113,7 +113,7 @@ 
         // List of modules id that must be enabled if this module is enabled
         $this->depends = array();
 
-		$this->conflictwith=array('modMilestone');
+		$this->conflictwith = array('modMilestone');
         // List of modules id to disable if this one is disabled
         $this->requiredby = array();
         // Minimum version of PHP required by module
@@ -178,20 +178,20 @@ 
         // 'categories_x'		to add a tab in category view
         // (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
         // Dictionnaries
-        if (! isset($conf->subtotal->enabled)) {
-            $conf->subtotal=new stdClass();
+        if (!isset($conf->subtotal->enabled)) {
+            $conf->subtotal = new stdClass();
             $conf->subtotal->enabled = 0;
         }
         $this->dictionaries = array(
 			'langs'=>'subtotal@subtotal',
-            'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'),		// List of tables we want to see into dictonnary editor
-            'tablib'=>array($langs->trans('subtotalFreeLineDictionary')),													// Label of tables
-            'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity),	// Request to select fields
-            'tabsqlsort'=>array('label ASC'),																					// Sort order
-            'tabfield'=>array('label,content'),							// List of fields (result of select to show dictionary)
-            'tabfieldvalue'=>array('label,content'),						// List of fields (list of fields to edit a record)
-            'tabfieldinsert'=>array('label,content,entity'),					// List of fields (list of fields for insert)
-            'tabrowid'=>array('rowid'),											// Name of columns with primary key (try to always name it 'rowid')
+            'tabname'=>array(MAIN_DB_PREFIX.'c_subtotal_free_text'), // List of tables we want to see into dictonnary editor
+            'tablib'=>array($langs->trans('subtotalFreeLineDictionary')), // Label of tables
+            'tabsql'=>array('SELECT f.rowid as rowid, f.label, f.content, f.entity, f.active FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text as f WHERE f.entity='.$conf->entity), // Request to select fields
+            'tabsqlsort'=>array('label ASC'), // Sort order
+            'tabfield'=>array('label,content'), // List of fields (result of select to show dictionary)
+            'tabfieldvalue'=>array('label,content'), // List of fields (list of fields to edit a record)
+            'tabfieldinsert'=>array('label,content,entity'), // List of fields (list of fields for insert)
+            'tabrowid'=>array('rowid'), // Name of columns with primary key (try to always name it 'rowid')
             'tabcond'=>array($conf->subtotal->enabled)	
 		);
         /* Example:

class/actions_subtotal.class.php

Spacing +377 added lines, -377 removed lines

@@ -51,43 +51,43 @@ 
 
     function formObjectOptions($parameters, &$object, &$action, $hookmanager)
     {
-      	global $langs,$db,$user, $conf;
+      	global $langs, $db, $user, $conf;
 
 		$langs->load('subtotal@subtotal');
 
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 
-		if(in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('invoicereccard',$contexts)) {
+		if (in_array('ordercard', $contexts) || in_array('ordersuppliercard', $contexts) || in_array('propalcard', $contexts) || in_array('supplier_proposalcard', $contexts) || in_array('invoicecard', $contexts) || in_array('invoicesuppliercard', $contexts) || in_array('invoicereccard', $contexts)) {
 
 			$createRight = $user->rights->{$object->element}->creer;
-			if($object->element == 'facturerec' )
+			if ($object->element == 'facturerec')
 			{
 				$object->statut = 0; // hack for facture rec
 				$createRight = $user->rights->facture->creer;
-			} elseif($object->element == 'order_supplier' )
+			} elseif ($object->element == 'order_supplier')
 			{
 			    $createRight = $user->rights->fournisseur->commande->creer;
-			} elseif($object->element == 'invoice_supplier' )
+			} elseif ($object->element == 'invoice_supplier')
 			{
 			    $createRight = $user->rights->fournisseur->facture->creer;
 			}
 
-			if ($object->statut == 0  && $createRight) {
+			if ($object->statut == 0 && $createRight) {
 
 
-				if($object->element=='facture')$idvar = 'facid';
-				else $idvar='id';
+				if ($object->element == 'facture')$idvar = 'facid';
+				else $idvar = 'id';
 
-				if(in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')) )
+				if (in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')))
 				{
 					$level = GETPOST('level', 'int'); //New avec SUBTOTAL_USE_NEW_FORMAT
 
-					if($action=='add_title_line') {
+					if ($action == 'add_title_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('title');
-						$qty = $level<1 ? 1 : $level ;
+						if (empty($title)) $title = $langs->trans('title');
+						$qty = $level < 1 ? 1 : $level;
 					}
-					else if($action=='add_free_text') {
+					else if ($action == 'add_free_text') {
 						$title = GETPOST('title');
 
 						if (empty($title)) {
@@ -99,21 +99,21 @@ 
 								}
 							}
 						}
-						if(empty($title)) $title = $langs->trans('subtotalAddLineDescription');
+						if (empty($title)) $title = $langs->trans('subtotalAddLineDescription');
 						$qty = 50;
 					}
-					else if($action=='add_subtitle_line') {
+					else if ($action == 'add_subtitle_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('subtitle');
+						if (empty($title)) $title = $langs->trans('subtitle');
 						$qty = 2;
 					}
-					else if($action=='add_subtotal_line') {
+					else if ($action == 'add_subtotal_line') {
 						$title = $langs->trans('SubSubTotal');
 						$qty = 98;
 					}
 					else {
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
-						$qty = $level ? 100-$level : 99;
+						$qty = $level ? 100 - $level : 99;
 					}
 					dol_include_once('/subtotal/class/subtotal.class.php');
 
@@ -121,15 +121,15 @@ 
 
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
-				else if($action==='ask_deleteallline') {
-						$form=new Form($db);
+				else if ($action === 'ask_deleteallline') {
+						$form = new Form($db);
 
-						$lineid = GETPOST('lineid','integer');
+						$lineid = GETPOST('lineid', 'integer');
 						$TIdForGroup = $this->getArrayOfLineForAGroup($object, $lineid);
 
 						$nbLines = count($TIdForGroup);
 
-						$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines',$nbLines), 'confirm_delete_all_lines','',0,1);
+						$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines', $nbLines), 'confirm_delete_all_lines', '', 0, 1);
 						print $formconfirm;
 				}
 
@@ -139,13 +139,13 @@ 
 				}
 
 
-				if($action!='editline') {
+				if ($action != 'editline') {
 					// New format is for 3.8
 					$this->printNewFormat($object, $conf, $langs, $idvar);
 				}
 			}
 		}
-		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts))
+		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice', $contexts))
 		{
 			?>
 			<script type="text/javascript">
@@ -170,7 +170,7 @@ 
 				$(document).ready(function() {
 					$('div.fiche div.tabsAction').append('<br />');
 
-					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle' )?></a></div>');
+					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_title_line" rel="add_title_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddTitle')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_total_line" rel="add_total_line" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddSubTotal')?></a></div>');
 					$('div.fiche div.tabsAction').append('<div class="inline-block divButAction"><a id="add_free_text" rel="add_free_text" href="javascript:;" class="butAction"><?php echo  $langs->trans('AddFreeText')?></a></div>');
 
@@ -221,9 +221,9 @@ 
 						$('body').append(dialog_html);
 
 						<?php
-						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME)?'ckeditor':$conf->global->FCKEDITOR_EDITORNAME;
-						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
-						if($editorConf && in_array($editorTool,array('textarea','ckeditor'))){
+						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME) ? 'ckeditor' : $conf->global->FCKEDITOR_EDITORNAME;
+						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
+						if ($editorConf && in_array($editorTool, array('textarea', 'ckeditor'))) {
 						?>
 						if (action == 'addTitle' || action == 'addFreeTxt')
 						{
@@ -338,61 +338,61 @@ 
 		global $conf, $langs, $bc;
 
 		$action = GETPOST('action');
-		$TContext = explode(':',$parameters['context']);
+		$TContext = explode(':', $parameters['context']);
 		if (
-				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
-				|| in_array('propalcard',$TContext)
-				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
-				|| in_array('invoicereccard',$TContext)
+				in_array('invoicecard', $TContext)
+		        || in_array('invoicesuppliercard', $TContext)
+				|| in_array('propalcard', $TContext)
+				|| in_array('ordercard', $TContext)
+		        || in_array('ordersuppliercard', $TContext)
+				|| in_array('invoicereccard', $TContext)
 			)
 	        {
-				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
-				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
-				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : 0;
+				$hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']] : 0;
+				$hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']] : 0;
+				$hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']] : 0;
 
-				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+				$var = false;
+		     	$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"' : '' ).' />
+		     				<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"' : '' ).' />
+		     				<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="hidedetails">'.$langs->trans('SubTotalhidePrice').'</label>
-		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
+		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(($hideprices) ? 'checked="checked"' : '').' />
 		     			</td>
 		     			</tr>';
 
 
 
 				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('invoicecard',$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 ))
+					(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('invoicecard', $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))
 				)
 				{
-					$var=!$var;
-					$out.= '
+					$var = !$var;
+					$out .= '
 						<tr '.$bc[$var].'>
 							<td colspan="4" align="right">
 								<label for="subtotal_add_recap">'.$langs->trans('subtotal_add_recap').'</label>
-								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.( GETPOST('subtotal_add_recap') ? 'checked="checked"' : '' ).' />
+								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.(GETPOST('subtotal_add_recap') ? 'checked="checked"' : '').' />
 							</td>
 						</tr>';
 				}
@@ -408,7 +408,7 @@ 
     function formEditProductOptions($parameters, &$object, &$action, $hookmanager)
     {
 
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
+    	if (in_array('invoicecard', explode(':', $parameters['context'])))
         {
 
         }
@@ -419,13 +419,13 @@ 
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
 
-		if($action === 'builddoc') {
+		if ($action === 'builddoc') {
 
 			$line = &$parameters['line'];
 			$object = &$parameters['object'];
 			$substitutionarray = &$parameters['substitutionarray'];
 
-			if($line->product_type == 9 && $line->special_code == $this->module_number) {
+			if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 				$substitutionarray['line_modsubtotal'] = 1;
 
 				$substitutionarray['line_price_ht']
@@ -436,7 +436,7 @@ 
 					 = $substitutionarray['line_up']
 					 = '';
 
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					$substitutionarray['line_modsubtotal_total'] = true;
 
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
@@ -450,7 +450,7 @@ 
 
 
 			}
-			else{
+			else {
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -462,29 +462,29 @@ 
 	function createFrom($parameters, &$object, $action, $hookmanager) {
 
 		if (
-				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
-				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
-				|| in_array('invoicereccard',explode(':',$parameters['context']))
+				in_array('invoicecard', explode(':', $parameters['context']))
+		        || in_array('invoicesuppliercard', explode(':', $parameters['context']))
+				|| in_array('propalcard', explode(':', $parameters['context']))
+		        || in_array('supplier_proposalcard', explode(':', $parameters['context']))
+				|| in_array('ordercard', explode(':', $parameters['context']))
+		        || in_array('ordersuppliercard', explode(':', $parameters['context']))
+				|| in_array('invoicereccard', explode(':', $parameters['context']))
 		) {
 
 			global $db;
 
 			$objFrom = $parameters['objFrom'];
 
-			foreach($objFrom->lines as $k=> &$lineOld) {
+			foreach ($objFrom->lines as $k=> &$lineOld) {
 
-					if($lineOld->product_type == 9 && $lineOld->info_bits > 0 ) {
+					if ($lineOld->product_type == 9 && $lineOld->info_bits > 0) {
 
 							$line = & $object->lines[$k];
 
 							$idLine = (int) ($line->id ? $line->id : $line->rowid);
 
 							$db->query("UPDATE ".MAIN_DB_PREFIX.$line->table_element."
-							SET info_bits=".(int)$lineOld->info_bits."
+							SET info_bits=".(int) $lineOld->info_bits."
 							WHERE rowid = ".$idLine."
 							");
 
@@ -500,15 +500,15 @@ 
 
 	function doActions($parameters, &$object, $action, $hookmanager)
 	{
-		global $db, $conf, $langs,$user;
+		global $db, $conf, $langs, $user;
 
 		dol_include_once('/subtotal/class/subtotal.class.php');
 		dol_include_once('/subtotal/lib/subtotal.lib.php');
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
 
-		if($object->element=='facture') $idvar = 'facid';
+		if ($object->element == 'facture') $idvar = 'facid';
 		else $idvar = 'id';
 
 		if ($action == 'updateligne' || $action == 'updateline')
@@ -521,7 +521,7 @@ 
 				if ($line->id == $lineid && TSubtotal::isModSubtotalLine($line))
 				{
 					$found = true;
-					if(TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
+					if (TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
 						$extrafieldsline = new ExtraFields($db);
 						$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 						$extrafieldsline->setOptionalsFromPost($extralabelsline, $line);
@@ -540,43 +540,43 @@ 
 				exit; // Surtout ne pas laisser Dolibarr faire du traitement sur le updateligne sinon ça plante les données de la ligne
 			}
 		}
-		else if($action === 'builddoc') {
+		else if ($action === 'builddoc') {
 
 			if (
-				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('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']))
 			)
 	        {
-				if(in_array('invoicecard',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']))) {
+				elseif (in_array('invoicesuppliercard', explode(':', $parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
 				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
 				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
 				}
-				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
+				elseif (in_array('propalcard', explode(':', $parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
 					$sessname2 = 'subtotal_hidedetails_propal';
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
-				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
+				elseif (in_array('supplier_proposalcard', explode(':', $parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
 				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
 				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
 				}
-				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
+				elseif (in_array('ordercard', explode(':', $parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
 					$sessname2 = 'subtotal_hidedetails_commande';
 					$sessname3 = 'subtotal_hideprices_commande';
 				}
-				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
+				elseif (in_array('ordersuppliercard', explode(':', $parameters['context']))) {
 				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
 				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
 				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
@@ -589,22 +589,22 @@ 
 
 				global $hideprices;
 
-				$hideInnerLines = (int)GETPOST('hideInnerLines');
+				$hideInnerLines = (int) GETPOST('hideInnerLines');
 				$_SESSION[$sessname] = $hideInnerLines;
 
-				$hidedetails= (int)GETPOST('hidedetails');
+				$hidedetails = (int) GETPOST('hidedetails');
 				$_SESSION[$sessname2] = $hidedetails;
 
-				$hideprices= (int)GETPOST('hideprices');
+				$hideprices = (int) GETPOST('hideprices');
 				$_SESSION[$sessname3] = $hideprices;
 
-				foreach($object->lines as &$line) {
+				foreach ($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 
-                        if($line->qty>=90) {
+                        if ($line->qty >= 90) {
                             $line->modsubtotal_total = 1;
                         }
-                        else{
+                        else {
                             $line->modsubtotal_title = 1;
                         }
 
@@ -614,34 +614,34 @@ 
 	        }
 
 		}
-		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
+		else if ($action === 'confirm_delete_all_lines' && GETPOST('confirm') == 'yes') {
 
 			$Tab = $this->getArrayOfLineForAGroup($object, GETPOST('lineid'));
 
-			foreach($Tab as $idLine) {
+			foreach ($Tab as $idLine) {
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if ($object->element == 'facture') $object->deleteline($idLine);
 				/**
 				 * @var $object Facture fournisseur
 				 */
-				else if($object->element=='invoice_supplier')
+				else if ($object->element == 'invoice_supplier')
 				{
 				    $object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
 				 */
-				else if($object->element=='propal') $object->deleteline($idLine);
+				else if ($object->element == 'propal') $object->deleteline($idLine);
 				/**
 				 * @var $object Propal Fournisseur
 				 */
-				else if($object->element=='supplier_proposal') $object->deleteline($idLine);
+				else if ($object->element == 'supplier_proposal') $object->deleteline($idLine);
 				/**
 				 * @var $object Commande
 				 */
-				else if($object->element=='commande')
+				else if ($object->element == 'commande')
 				{
 					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
 					else $object->deleteline($idLine);
@@ -649,14 +649,14 @@ 
 				/**
 				 * @var $object Commande fournisseur
 				 */
-				else if($object->element=='order_supplier')
+				else if ($object->element == 'order_supplier')
 				{
 				    $object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
 				 */
-				else if($object->element=='facturerec') $object->deleteline($idLine);
+				else if ($object->element == 'facturerec') $object->deleteline($idLine);
 			}
 
 			header('location:?id='.$object->id);
@@ -679,7 +679,7 @@ 
 		return 0;
 	}
 
-	function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) {
+	function formAddObjectLine($parameters, &$object, &$action, $hookmanager) {
 		return 0;
 	}
 
@@ -691,22 +691,22 @@ 
 
 		$found = false;
 
-		$Tab= array();
+		$Tab = array();
 
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 
 		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
-			if($lid == $lineid) {
+			if ($lid == $lineid) {
 
 				$found = true;
 				$qty_line = $l->qty;
 			}
 
-			if($found) {
+			if ($found) {
 
 			    $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))   ) {
+				if ($l->special_code == $this->module_number && (($l->qty == 99 && $qty_line == 1) || ($l->qty == 98 && $qty_line == 2))) {
 					break; // end of story
 				}
 			}
@@ -735,7 +735,7 @@ 
 	 *
 	 * @param	$use_level		isn't used anymore
 	 */
-	function getTotalLineFromObject(&$object, &$line, $use_level=false, $return_all=0) {
+	function getTotalLineFromObject(&$object, &$line, $use_level = false, $return_all = 0) {
 
 		$rang = $line->rang;
 		$qty_line = $line->qty;
@@ -746,21 +746,21 @@ 
 		$TTotal_tva = array();
 
 		dol_include_once('/subtotal/class/subtotal.class.php');
-		foreach($object->lines as $l) {
+		foreach ($object->lines as $l) {
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
-			if($l->rang>=$rang) {
+			if ($l->rang >= $rang) {
 				//echo 'return!<br>';
 				if (!$return_all) return $total;
 				else return array($total, $total_tva, $total_ttc, $TTotal_tva);
 			}
-			else if(TSubtotal::isTitle($l, 100 - $qty_line))
+			else if (TSubtotal::isTitle($l, 100 - $qty_line))
 		  	{
 				$total = 0;
 				$total_tva = 0;
 				$total_ttc = 0;
 				$TTotal_tva = array();
 			}
-			elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
+			elseif (!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
 				$total += $l->total_ht;
 				$total_tva += $l->total_tva;
 				$TTotal_tva[$l->tva_tx] += $l->total_tva;
@@ -779,18 +779,18 @@ 
 
 		$rang = $line->rang;
 		$total = 0;
-		foreach($object->lines as $l) {
-			if($l->rang>=$rang) {
+		foreach ($object->lines as $l) {
+			if ($l->rang >= $rang) {
 				return price($total);
 			}
-                        if (TSubtotal::isSubtotal($l)){
+                        if (TSubtotal::isSubtotal($l)) {
                             $total = 0;
-                        } else  if ($l->situation_percent > 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;
+		 	$progress = ($l->situation_percent - $prev_progress) / 100;
+                        $total += ($l->total_ht / ($l->situation_percent / 100)) * $progress;
 
                     }
                 }
@@ -809,10 +809,10 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_total(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
-		global $conf,$subtotal_last_title_posy;
+	function pdf_add_total(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
+		global $conf, $subtotal_last_title_posy;
 
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 		if (!empty($conf->global->SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES) && $hideInnerLines && !empty($subtotal_last_title_posy))
 		{
 			$posy = $subtotal_last_title_posy;
@@ -822,34 +822,34 @@ 
 		$hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines');
 
 		$set_pagebreak_margin = false;
-		if(method_exists('Closure','bind')) {
+		if (method_exists('Closure', 'bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
-			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+			$sweetsThief = function($pdf) {
+		    		return $pdf->bMargin;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 
-			$bMargin  = $sweetsThief($pdf);
+			$bMargin = $sweetsThief($pdf);
 
-			$pdf->SetAutoPageBreak( false );
+			$pdf->SetAutoPageBreak(false);
 
 			$set_pagebreak_margin = true;
 		}
 
 
-		if($line->qty==99)
-			$pdf->SetFillColor(220,220,220);
-		elseif ($line->qty==98)
-			$pdf->SetFillColor(230,230,230);
+		if ($line->qty == 99)
+			$pdf->SetFillColor(220, 220, 220);
+		elseif ($line->qty == 98)
+			$pdf->SetFillColor(230, 230, 230);
 		else
-			$pdf->SetFillColor(240,240,240);
+			$pdf->SetFillColor(240, 240, 240);
 
 		$style = 'B';
 		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
 
 		$pdf->SetFont('', $style, 9);
 
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R',true);
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R', true);
 //		var_dump($bMargin);
 		$pageAfter = $pdf->getPage();
 
@@ -874,7 +874,7 @@ 
 				}
 			}
 
-			if($total_to_print) {
+			if ($total_to_print) {
 
 				if (GETPOST('hideInnerLines'))
 				{
@@ -888,7 +888,7 @@ 
 				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
+                                        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);
@@ -902,11 +902,11 @@ 
 			}
 
 			$pdf->SetXY($pdf->postotalht, $posy);
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
-			$pdf->MultiCell($pdf->page_largeur-$pdf->marge_droite-$pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
+			$pdf->MultiCell($pdf->page_largeur - $pdf->marge_droite - $pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
 		}
-		else{
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+		else {
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
 		}
 
 		$posy = $posy + $cell_height;
@@ -926,22 +926,22 @@ 
 	 * @param $w            float               width
 	 * @param $h            float               height
 	 */
-	function pdf_add_title(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
+	function pdf_add_title(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
 
-		global $db,$conf,$subtotal_last_title_posy;
+		global $db, $conf, $subtotal_last_title_posy;
 
 		$subtotal_last_title_posy = $posy;
-		$pdf->SetXY ($posx, $posy);
+		$pdf->SetXY($posx, $posy);
 
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
 
 
 
-		$style = ($line->qty==1) ? 'BU' : 'BUI';
+		$style = ($line->qty == 1) ? 'BU' : 'BUI';
 		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
 
-		if($hideInnerLines) {
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
+		if ($hideInnerLines) {
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9);
 			else
 			{
 				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) $style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
@@ -950,43 +950,43 @@ 
 		}
 		else {
 
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9); //TODO if super utile
 			else $pdf->SetFont('', $style, 9);
 
 		}
 
 		if ($label === strip_tags($label) && $label === dol_html_entity_decode($label, ENT_QUOTES)) $pdf->MultiCell($w, $h, $label, 0, 'L'); // Pas de HTML dans la chaine
-		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true); // et maintenant avec du HTML
+		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J', true); // et maintenant avec du HTML
 
-		if($description && !$hidedesc) {
+		if ($description && !$hidedesc) {
 			$posy = $pdf->GetY();
 
 			$pdf->SetFont('', '', 8);
 
-			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J',true);
+			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J', true);
 
 		}
 
 	}
 
-	function pdf_writelinedesc_ref($parameters=array(), &$object, &$action='') {
+	function pdf_writelinedesc_ref($parameters = array(), &$object, &$action = '') {
 	// ultimate PDF hook O_o
 
-		return $this->pdf_writelinedesc($parameters,$object,$action);
+		return $this->pdf_writelinedesc($parameters, $object, $action);
 
 	}
 
 	function isModSubtotalLine(&$parameters, &$object) {
 
-		if(is_array($parameters)) {
+		if (is_array($parameters)) {
 			$i = & $parameters['i'];
 		}
 		else {
-			$i = (int)$parameters;
+			$i = (int) $parameters;
 		}
 
 
-		if($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
+		if ($object->lines[$i]->special_code == $this->module_number && $object->lines[$i]->product_type == 9) {
 			return true;
 		}
 
@@ -994,42 +994,42 @@ 
 
 	}
 
-	function pdf_getlineqty($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineqty($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 
 		}
-		elseif(!empty($hideprices)) {
+		elseif (!empty($hideprices)) {
 			$this->resprints = $object->lines[$parameters['i']]->qty;
 			return 1;
 		}
 		elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
 		{
-			$hideInnerLines = (int)GETPOST('hideInnerLines');
-			$hidedetails = (int)GETPOST('hidedetails');
+			$hideInnerLines = (int) GETPOST('hideInnerLines');
+			$hidedetails = (int) GETPOST('hidedetails');
 			if (empty($hideInnerLines) && !empty($hidedetails))
 			{
 				$this->resprints = $object->lines[$parameters['i']]->qty;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 
 		$object->lines[$i]->fetch_optionals();
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1041,25 +1041,25 @@ 
 		return 0;
 	}
 
-	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') {
 		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 
 		}
 		elseif (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS))
 		{
-			if(is_array($parameters)) $i = & $parameters['i'];
-			else $i = (int)$parameters;
+			if (is_array($parameters)) $i = & $parameters['i'];
+			else $i = (int) $parameters;
 
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1080,13 +1080,13 @@ 
 				}
 			}
 		}
-		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    if(is_array($parameters)) $i = & $parameters['i'];
-		    else $i = (int)$parameters;
+		if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) {
+		    if (is_array($parameters)) $i = & $parameters['i'];
+		    else $i = (int) $parameters;
 		    $this->resprints = price($object->lines[$i]->total_ht);
 		}
 		if (!empty($hideprices)
-		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		    || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		    )
 		{
 		    if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1099,25 +1099,25 @@ 
 		return 0;
 	}
 
-	function pdf_getlinetotalwithtax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalwithtax($parameters = array(), &$object, &$action = '') {
 		global $conf;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1129,24 +1129,24 @@ 
 		return 0;
 	}
 
-	function pdf_getlineunit($parameters=array(), &$object, &$action='') {
+	function pdf_getlineunit($parameters = array(), &$object, &$action = '') {
 		global $conf;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1158,24 +1158,24 @@ 
 		return 0;
 	}
 
-	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if (!empty($hideprices)
-				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1188,24 +1188,24 @@ 
 		return 0;
 	}
 
-	function pdf_getlineupwithtax($parameters=array(), &$object, &$action='') {
-		global $conf,$hideprices;
+	function pdf_getlineupwithtax($parameters = array(), &$object, &$action = '') {
+		global $conf, $hideprices;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if (!empty($hideprices)
-				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		)
 		{
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1218,27 +1218,27 @@ 
 		return 0;
 	}
 
-	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
+	function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') {
 		global $conf;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if (empty($object->lines[$i])) return 0; // hideInnerLines => override $object->lines et Dolibarr ne nous permet pas de mettre à jour la variable qui conditionne la boucle sur les lignes (PR faite pour 6.0)
 
 		$object->lines[$i]->fetch_optionals();
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1250,23 +1250,23 @@ 
 		return 0;
 	}
 
-	function pdf_getlineprogress($parameters=array(), &$object, &$action) {
+	function pdf_getlineprogress($parameters = array(), &$object, &$action) {
 		global $conf;
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
-			if((float)DOL_VERSION<=3.6) {
+			if ((float) DOL_VERSION <= 3.6) {
 				return '';
 			}
-			else if((float)DOL_VERSION>=3.8) {
+			else if ((float) DOL_VERSION >= 3.8) {
 				return 1;
 			}
 		}
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1281,12 +1281,12 @@ 
 	function add_numerotation(&$object) {
 		global $conf;
 
-		if(!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
+		if (!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
 
 			$TLevelTitre = array();
 			$prevlevel = 0;
 
-			foreach($object->lines as $k=>&$line)
+			foreach ($object->lines as $k=>&$line)
 			{
 				if ($line->id > 0 && $this->isModSubtotalLine($k, $object) && $line->qty <= 10)
 				{
@@ -1300,12 +1300,12 @@ 
 	}
 
 	// TODO ne gère pas encore la numération des lignes "Totaux"
-	private function formatNumerotation(&$TLineTitle, $line_reference='', $level=1, $prefix_num=0)
+	private function formatNumerotation(&$TLineTitle, $line_reference = '', $level = 1, $prefix_num = 0)
 	{
 		$TTitle = array();
 
-		$i=1;
-		$j=0;
+		$i = 1;
+		$j = 0;
 		foreach ($TLineTitle as $k => &$line)
 		{
 			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
@@ -1315,7 +1315,7 @@ 
 			{
 				$TTitle[$j]['numerotation'] = ($prefix_num == 0) ? $i : $prefix_num.'.'.$i;
 				//var_dump('Prefix == '.$prefix_num.' // '.$line->desc.' ==> numerotation == '.$TTitle[$j]['numerotation'].'   ###    '.$line->qty .'=='. $level);
-				if (empty($line->label) && (float)DOL_VERSION < 6)
+				if (empty($line->label) && (float) DOL_VERSION < 6)
 				{
 					$line->label = !empty($line->desc) ? $line->desc : $line->description;
 					$line->desc = $line->description = '';
@@ -1341,26 +1341,26 @@ 
 
 	function setDocTVA(&$pdf, &$object) {
 
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hidedetails = (int) GETPOST('hidedetails');
 
-		if(empty($hidedetails)) return false;
+		if (empty($hidedetails)) return false;
 
 		// TODO can't add VAT to document without lines... :-/
 
 		return true;
 	}
 
-	function beforePDFCreation($parameters=array(), &$object, &$action)
+	function beforePDFCreation($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf, $langs;
+		global $pdf, $conf, $langs;
 
 		// var_dump($object->lines);
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 
@@ -1369,25 +1369,25 @@ 
 		$this->add_numerotation($object);
 
 
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
-			$TLines =array();
+	    	$fk_parent_line = 0;
+			$TLines = array();
 
-			$original_count=count($object->lines);
+			$original_count = count($object->lines);
 		    $TTvas = array(); // tableau de tva
 
-			foreach($object->lines as $k=>&$line)
+			foreach ($object->lines as $k=>&$line)
 			{
 
-				if($line->product_type==9 && $line->rowid>0)
+				if ($line->product_type == 9 && $line->rowid > 0)
 				{
 					$fk_parent_line = $line->rowid;
 
 					// Fix tk7201 - si on cache le détail, la TVA est renseigné au niveau du sous-total, l'erreur c'est s'il y a plusieurs sous-totaux pour les même lignes, ça va faire la somme
-					if(TSubtotal::isSubtotal($line))
+					if (TSubtotal::isSubtotal($line))
 					{
 						/*$total = $this->getTotalLineFromObject($object, $line, '');
 
@@ -1407,27 +1407,27 @@ 
 
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+				    if (!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+				        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)
+    					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){
+    					    if (!empty($nbtva)) {
+    					        foreach ($TTvas as $tx =>$val) {
     					            $l = clone $line;
     					            $l->product_type = 1;
     					            $l->special_code = '';
     					            $l->qty = 1;
-    					            $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '. price($tx) .' %';
+    					            $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '.price($tx).' %';
     					            $l->tva_tx = $tx;
     					            $l->total_ht = $val['total_ht'];
     					            $l->total_tva = $val['total_tva'];
@@ -1443,7 +1443,7 @@ 
     					}
 				    } else {
 
-				        if($line->product_type==9 && $line->rowid>0)
+				        if ($line->product_type == 9 && $line->rowid > 0)
 				        {
 				            // ajoute la ligne de sous-total
 				            $TLines[] = $line;
@@ -1471,14 +1471,14 @@ 
 
 			// cas incongru où il y aurait des produits en dessous du dernier sous-total
 			$nbtva = count($TTvas);
-			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+			if (!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
+			    foreach ($TTvas as $tx =>$val) {
 			        $l = clone $line;
 			        $l->product_type = 1;
 			        $l->special_code = '';
 			        $l->qty = 1;
-			        $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '. price($tx) .' %';
+			        $l->desc = 'Montant HT soumis à '.$langs->trans('VAT').' '.price($tx).' %';
 			        $l->tva_tx = $tx;
 			        $l->total_ht = $val['total_ht'];
 			        $l->total_tva = $val['total_tva'];
@@ -1490,11 +1490,11 @@ 
 			}
 
 			global $nblignes;
-			$nblignes=count($TLines);
+			$nblignes = count($TLines);
 
 			$object->lines = $TLines;
 
-			if($i>count($object->lines)) {
+			if ($i > count($object->lines)) {
 				$this->resprints = '';
 				return 0;
 			}
@@ -1503,59 +1503,59 @@ 
 		return 0;
 	}
 
-	function pdf_writelinedesc($parameters=array(), &$object, &$action)
+	function pdf_writelinedesc($parameters = array(), &$object, &$action)
 	{
 		/**
 		 * @var $pdf    TCPDF
 		 */
-		global $pdf,$conf;
+		global $pdf, $conf;
 
-		foreach($parameters as $key=>$value) {
+		foreach ($parameters as $key=>$value) {
 			${$key} = $value;
 		}
 
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
-		$hidedetails = (int)GETPOST('hidedetails');
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
+		$hidedetails = (int) GETPOST('hidedetails');
 
-		if($this->isModSubtotalLine($parameters,$object) ){
+		if ($this->isModSubtotalLine($parameters, $object)) {
 
 				global $hideprices;
 
-				if(!empty($hideprices)) {
-					foreach($object->lines as &$line) {
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;
+				if (!empty($hideprices)) {
+					foreach ($object->lines as &$line) {
+						if ($line->fk_product_type != 9) $line->fk_parent_line = -1;
 					}
 				}
 
 				$line = &$object->lines[$i];
 
-				if($line->info_bits>0) { // PAGE BREAK
+				if ($line->info_bits > 0) { // PAGE BREAK
 					$pdf->addPage();
 					$posy = $pdf->GetY();
 				}
 
 				$label = $line->label;
-				$description= !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
+				$description = !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
 
-				if(empty($label)) {
+				if (empty($label)) {
 					$label = $description;
-					$description='';
+					$description = '';
 				}
 
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 
 					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)	$label .= ' '.$this->getTitle($object, $line);
 
 					$pageBefore = $pdf->getPage();
-					$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+					$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 					$pageAfter = $pdf->getPage();
 
-					if($pageAfter>$pageBefore) {
+					if ($pageAfter > $pageBefore) {
 						//print "ST $pageAfter>$pageBefore<br>";
 						$pdf->rollbackTransaction(true);
-						$pdf->addPage('','', true);
+						$pdf->addPage('', '', true);
 						$posy = $pdf->GetY();
-						$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+						$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 						$posy = $pdf->GetY();
 						//print 'add ST'.$pdf->getPage().'<br />';
 					}
@@ -1566,7 +1566,7 @@ 
 				else if ($line->qty < 10) {
 					$pageBefore = $pdf->getPage();
 
-					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
+					$this->pdf_add_title($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
 					$pageAfter = $pdf->getPage();
 
 
@@ -1641,9 +1641,9 @@ 
 	 * @param $hookmanager  HookManager
 	 * @return int
 	 */
-	function printObjectLine ($parameters, &$object, &$action, $hookmanager){
+	function printObjectLine($parameters, &$object, &$action, $hookmanager) {
 
-		global $conf,$langs,$user,$db,$bc;
+		global $conf, $langs, $user, $db, $bc;
 
 		$num = &$parameters['num'];
 		$line = &$parameters['line'];
@@ -1651,32 +1651,32 @@ 
 
 		$var = &$parameters['var'];
 
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 
 		$createRight = $user->rights->{$object->element}->creer;
-		if($object->element == 'facturerec' )
+		if ($object->element == 'facturerec')
 		{
 			$object->statut = 0; // hack for facture rec
 			$createRight = $user->rights->facture->creer;
 		}
-		elseif($object->element == 'order_supplier' )
+		elseif ($object->element == 'order_supplier')
 		{
 		    $createRight = $user->rights->fournisseur->commande->creer;
 		}
-		elseif($object->element == 'invoice_supplier' )
+		elseif ($object->element == 'invoice_supplier')
 		{
 		    $createRight = $user->rights->fournisseur->facture->creer;
 		}
 
-		if($line->special_code!=$this->module_number || $line->product_type!=9) {
+		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)) 
+		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';
+			if ($object->element == 'facture')$idvar = 'facid';
+			else $idvar = 'id';
 
-			if((float)DOL_VERSION <= 3.4)
+			if ((float) DOL_VERSION <= 3.4)
 			{
 				?>
 				<script type="text/javascript">
@@ -1700,20 +1700,20 @@ 
 				<?php
 			}
 
-			if(empty($line->description)) $line->description = $line->desc;
+			if (empty($line->description)) $line->description = $line->desc;
 
 			$colspan = 5;
-			if($object->element == 'facturerec' ) $colspan = 3;
-			if($object->element == 'order_supplier') $colspan = 3;
-			if($object->element == 'invoice_supplier') $colspan = 4;
-			if($object->element == 'supplier_proposal') $colspan = 4;
-			if(!empty($conf->multicurrency->enabled)) $colspan+=2;
-			if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
-			if(!empty($conf->margin->enabled)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
-			if(!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
-			if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
-			if(!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
+			if ($object->element == 'facturerec') $colspan = 3;
+			if ($object->element == 'order_supplier') $colspan = 3;
+			if ($object->element == 'invoice_supplier') $colspan = 4;
+			if ($object->element == 'supplier_proposal') $colspan = 4;
+			if (!empty($conf->multicurrency->enabled)) $colspan += 2;
+			if ($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
+			if (!empty($conf->margin->enabled)) $colspan++;
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
+			if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
 
 			/* Titre */
 			//var_dump($line);
@@ -1723,35 +1723,35 @@ 
 
 
 			?>
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
+			<tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
 					{
-						if($line->qty==99) print 'background:#adadcf';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
-						else if($line->qty==1) print 'background:#adadcf;';
-						else if($line->qty==2) print 'background:#ddddff;';
-						else if($line->qty==50) print '';
+						if ($line->qty == 99) print 'background:#adadcf';
+						else if ($line->qty == 98) print 'background:#ddddff;';
+						else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;';
+						else if ($line->qty == 1) print 'background:#adadcf;';
+						else if ($line->qty == 2) print 'background:#ddddff;';
+						else if ($line->qty == 50) print '';
 						else print 'background:#eeeeff;';
 
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
 					}
 					else
 					{
-						if($line->qty==99) print 'background:#ddffdd';
-						else if($line->qty==98) print 'background:#ddddff;';
-						else if($line->qty==2) print 'background:#eeeeff; ';
-						else if($line->qty==50) print '';
-						else print 'background:#eeffee;' ;
+						if ($line->qty == 99) print 'background:#ddffdd';
+						else if ($line->qty == 98) print 'background:#ddddff;';
+						else if ($line->qty == 2) print 'background:#eeeeff; ';
+						else if ($line->qty == 50) print '';
+						else print 'background:#eeffee;';
 					}
 
 			?>;">
 
-				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 
-						$params=array('line'=>$line);
-						$reshook=$hookmanager->executeHooks('formEditProductOptions',$params,$object,$action);
+						$params = array('line'=>$line);
+						$reshook = $hookmanager->executeHooks('formEditProductOptions', $params, $object, $action);
 
 						echo '<div id="line_'.$line->id.'"></div>'; // Imitation Dolibarr
 						echo '<input type="hidden" value="'.$line->id.'" name="lineid">';
@@ -1759,7 +1759,7 @@ 
 						echo '<input id="product_id" type="hidden" value="'.$line->fk_product.'" name="type">';
 						echo '<input id="special_code" type="hidden" value="'.$line->special_code.'" name="type">';
 
-						$isFreeText=false;
+						$isFreeText = false;
 						if (TSubtotal::isTitle($line))
 						{
 							$qty_displayed = $line->qty;
@@ -1781,13 +1781,13 @@ 
 						    $line->description = '';
 						}
 						$newlabel = $line->label;
-						if($line->label=='' && !$isFreeText) {
-							if(TSubtotal::isSubtotal($line)) {
+						if ($line->label == '' && !$isFreeText) {
+							if (TSubtotal::isSubtotal($line)) {
 								$newlabel = $line->description.' '.$this->getTitle($object, $line);
-								$line->description='';
-							} elseif( (float)DOL_VERSION < 6 ) {
-								$newlabel= $line->description;
-								$line->description='';
+								$line->description = '';
+							} elseif ((float) DOL_VERSION < 6) {
+								$newlabel = $line->description;
+								$line->description = '';
 							}
 						}
 
@@ -1796,10 +1796,10 @@ 
 
 						if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
 
-						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) )
+						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)))
 						{
 							$select = '<select name="subtotal_level">';
-							for ($j=1; $j<10; $j++)
+							for ($j = 1; $j < 10; $j++)
 							{
 								if (!empty($readonlyForSituation)) {
 									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
@@ -1812,7 +1812,7 @@ 
 
 
 						echo '<div class="subtotal_underline" style="margin-left:24px;">';
-							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;&nbsp;';
+							echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label> <input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' />&nbsp;&nbsp;';
 
 							if (TSubtotal::isTitle($line))
 							{
@@ -1830,9 +1830,9 @@ 
 							else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
-						if($line->qty<10) {
+						if ($line->qty < 10) {
 							// WYSIWYG editor
-							require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+							require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 							$nbrows = ROWS_2;
 							$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
 							if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
@@ -1852,25 +1852,25 @@ 
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
-							if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
+							if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
 							{
-								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
+								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty - 1);
 
 								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
+								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
 							}
 						 }
 						 else
 						 {
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+							if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal');
+							else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 						 }
 
 
 						 // Get display styles and apply them
 						 $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
-						 $titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
-						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
+						 $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
+						 $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
 
 						 if (empty($line->label)) {
 							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
@@ -1878,16 +1878,16 @@ 
 						 }
 						 else {
 
-							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
+							if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
 							}
-							else{
+							else {
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';
 							}
 
 						 }
-						if($line->qty>90) print ' : ';
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						if ($line->qty > 90) print ' : ';
+						if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
 
 
 
@@ -1896,7 +1896,7 @@ 
 			?></td>
 
 			<?php
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					/* Total */
 					$total_line = $this->getTotalLineFromObject($object, $line, '');
 					echo '<td class="nowrap liencolht" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>';
@@ -1909,7 +1909,7 @@ 
 				<?php
 				if ($action != 'selectlines') {
 
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
 						?>
 						<input id="savelinebutton" class="button" type="submit" name="save" value="<?php echo $langs->trans('Save') ?>" />
 						<br />
@@ -1925,13 +1925,13 @@ 
 						<?php
 
 					}
-					else{
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
+					else {
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
 						{
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) ) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'. img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
+							if (TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref)) echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=duplicate&lineid='.$line->id.'">'.img_picto($langs->trans('Duplicate'), 'duplicate@subtotal').'</a>';
 						}
 
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK))
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK))
 						{
 							echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=editline&lineid='.$line->id.'">'.img_edit().'</a>';
 						}
@@ -1946,7 +1946,7 @@ 
 				<?php
 
 				if ($action != 'editline' && $action != 'selectlines') {
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
 						{
 
 							if ($object->situation_counter == 1 || !$object->situation_cycle_ref)
@@ -1954,7 +1954,7 @@ 
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>';
 							}
 
-							if(TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref) )
+							if (TSubtotal::isTitle($line) && ($object->situation_counter == 1 || !$object->situation_cycle_ref))
 							{
 								$img_delete = ((float) DOL_VERSION >= 3.8) ? img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal') : img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteallline&lineid='.$line->id.'">'.$img_delete.'</a>';
@@ -1965,7 +1965,7 @@ 
 			</td>
 
 			<?php
-			if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
+			if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
 			{
 				echo '<td class="subtotal_nc">';
 				echo '<input id="subtotal_nc-'.$line->id.'" class="subtotal_nc_chkbx" data-lineid="'.$line->id.'" type="checkbox" name="subtotal_nc" value="1" '.(!empty($line->array_options['options_subtotal_nc']) ? 'checked="checked"' : '').' />';
@@ -1976,11 +1976,11 @@ 
 			<td align="center" class="tdlineupdown">
 			</td>
 			<?php } else { ?>
-			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0  && $createRight ))?' class="tdlineupdown"':''); ?>></td>
+			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight)) ? ' class="tdlineupdown"' : ''); ?>></td>
 			<?php } ?>
 
-			<?php  if($action == 'selectlines'){ // dolibarr 8 ?>
-			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td>
+			<?php  if ($action == 'selectlines') { // dolibarr 8 ?>
+			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td>
 			<?php } ?>
 
 			</tr>
@@ -1988,29 +1988,29 @@ 
 
 
 			// Affichage des extrafields à la Dolibarr (car sinon non affiché sur les titres)
-			if(TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
+			if (TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
 
-				require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 				// Extrafields
 				$extrafieldsline = new ExtraFields($db);
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
-				$colspan+=3; $mode = 'view';
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
+				$colspan += 3; $mode = 'view';
+				if ($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
 
 				$ex_element = $line->element;
 				$line->element = 'tr_extrafield_title '.$line->element; // Pour pouvoir manipuler ces tr
-				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ','colspan'=>$colspan));
+				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ', 'colspan'=>$colspan));
 				$isExtraSelected = false;
-				foreach($line->array_options as $option) {
-					if(!empty($option) && $option != "-1") {
+				foreach ($line->array_options as $option) {
+					if (!empty($option) && $option != "-1") {
 						$isExtraSelected = true;
 						break;
 					}
 				}
 
-				if($mode === 'edit') {
+				if ($mode === 'edit') {
 					?>
 					<script>
 						$(document).ready(function(){
@@ -2018,7 +2018,7 @@ 
 							var all_tr_extrafields = $("tr.tr_extrafield_title");
 							<?php
 							// Si un extrafield est rempli alors on affiche directement les extrafields
-							if(!$isExtraSelected) {
+							if (!$isExtraSelected) {
 								echo 'all_tr_extrafields.hide();';
 								echo 'var trad = "'.$langs->trans('showExtrafields').'";';
 								echo 'var extra = 0;';
@@ -2064,7 +2064,7 @@ 
 
 
 	function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) {
-		global $conf,$langs;
+		global $conf, $langs;
 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
@@ -2164,23 +2164,23 @@ 
 	    $ThtmlData['data-qty']          = 0; //$line->qty;
 	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 
-	    if(TSubtotal::isTitle($line)){
+	    if (TSubtotal::isTitle($line)) {
 	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
+	    }elseif (TSubtotal::isSubtotal($line)) {
 	        $ThtmlData['data-issubtotal'] = 'subtotal';
 	    }
-	    else{
+	    else {
 	        $ThtmlData['data-issubtotal'] = 'freetext';
 	    }
 
 
 	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+	    $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
+	    $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)
+	    if ($reshook > 0)
 	    {
 	        $ThtmlData = $hookmanager->resArray;
 	    }
@@ -2193,14 +2193,14 @@ 
 	function implodeHtmlData($ThtmlData = array())
 	{
 	    $data = '';
-	    foreach($ThtmlData as $k => $h )
+	    foreach ($ThtmlData as $k => $h)
 	    {
-	        if(is_array($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;
@@ -2208,26 +2208,26 @@ 
 
 	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)
 	    {
 
 	        ?>
@@ -2245,7 +2245,7 @@ 
 				moveBlockCol.disableSelection(); // prevent selection
 <?php if ($object->statut == 0) { ?>
 				// apply some graphical stuff
-				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png',2);  ?>)');
+				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png', 2); ?>)');
 				moveBlockCol.css("background-repeat","no-repeat");
 				moveBlockCol.css("background-position","center center");
 				moveBlockCol.css("cursor","move");

lib/subtotal.lib.php

Spacing +19 added lines, -19 removed lines

@@ -41,21 +41,21 @@ 
     $head[$h][2] = 'about';
     $h++;
 
-    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel=false);
+    complete_head_from_modules($conf, $langs, $object, $head, $h, 'subtotal', $showLabel = false);
 
     return $head;
 }
 
-function getHtmlSelectTitle(&$object, $showLabel=false)
+function getHtmlSelectTitle(&$object, $showLabel = false)
 {
 	global $langs;
 	
-	require_once DOL_DOCUMENT_ROOT . '/core/lib/functions.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 	dol_include_once('/subtotal/class/subtotal.class.php');
 	$TTitle = TSubtotal::getAllTitleFromDocument($object);
 	$html = '';
-	if ($showLabel) $html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
-	$html.= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
+	if ($showLabel) $html .= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
+	$html .= '<select onChange="$(\'select[name=under_title]\').val(this.value);" name="under_title" class="under_title minwidth200"><option value="-1"></option>';
 	
 	$nbsp = '&nbsp;';
 	foreach ($TTitle as &$line)
@@ -70,7 +70,7 @@ 
 
 function getTFreeText()
 {
-	global $db,$conf;
+	global $db, $conf;
 	
 	$TFreeText = array();
 	
@@ -88,19 +88,19 @@ 
 	return $TFreeText;
 }
 
-function getHtmlSelectFreeText($withEmpty=true)
+function getHtmlSelectFreeText($withEmpty = true)
 {
 	global $langs;
 	
 	$TFreeText = getTFreeText();
 	$html = '<label for="free_text">'.$langs->trans('subtotalLabelForFreeText').'</label>';
-	$html.= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
-	if ($withEmpty) $html.= '<option value=""></option>';
+	$html .= '<select onChange="getTFreeText($(this));" name="free_text" class="minwidth200">';
+	if ($withEmpty) $html .= '<option value=""></option>';
 
 	$TFreeTextContents = array();
 	foreach ($TFreeText as $id => $tab)
 	{
-		$html.= '<option value="'.$id.'">'.$tab->label.'</option>';
+		$html .= '<option value="'.$id.'">'.$tab->label.'</option>';
 		$TFreeTextContents[$id] = $tab->content;
 	}
 
@@ -128,7 +128,7 @@ 
 function _updateSubtotalLine(&$object, &$line)
 {
 	$label = GETPOST('line-title');
-	$description = ($line->qty>90) ? '' : GETPOST('line-description');
+	$description = ($line->qty > 90) ? '' : GETPOST('line-description');
 	$pagebreak = (int) GETPOST('line-pagebreak');
 
 	$level = GETPOST('subtotal_level', 'int');
@@ -145,7 +145,7 @@ 
 
 function _updateSubtotalBloc($object, $line)
 {
-	global $conf,$langs;
+	global $conf, $langs;
 	
 	$subtotal_tva_tx = $subtotal_tva_tx_init = GETPOST('subtotal_tva_tx', 'int');
 	$subtotal_progress = $subtotal_progress_init = GETPOST('subtotal_progress', 'int');
@@ -224,9 +224,9 @@ 
  * @param	$lineid			= title lineid
  * @param	$subtotal_nc	0 = "Compris" prise en compte des totaux des lignes; 1 = "Non compris" non prise en compte des totaux du bloc; null = update de toutes les lignes 
  */
-function _updateLineNC($element, $elementid, $lineid, $subtotal_nc=null)
+function _updateLineNC($element, $elementid, $lineid, $subtotal_nc = null)
 {
-	global $db,$langs,$tmp_object_nc;
+	global $db, $langs, $tmp_object_nc;
 	
 	$error = 0;
 	if (empty($element)) $error++;
@@ -266,7 +266,7 @@ 
 	{
 		foreach ($object->lines as &$l)
 		{
-			if($l->id == $lineid) {
+			if ($l->id == $lineid) {
 				$line = $l;
 				break;
 			}
@@ -276,12 +276,12 @@ 
 		{
 			$db->begin();
 			
-			if(TSubtotal::isModSubtotalLine($line))
+			if (TSubtotal::isModSubtotalLine($line))
 			{
-				if(TSubtotal::isTitle($line)) {
+				if (TSubtotal::isTitle($line)) {
 					// Update le contenu du titre (ainsi que le titre lui même)
 					$TTitleBlock = TSubtotal::getLinesFromTitleId($object, $lineid, true);
-					foreach($TTitleBlock as &$line_block)
+					foreach ($TTitleBlock as &$line_block)
 					{
 						$res = doUpdate($object, $line_block, $subtotal_nc);
 					}
@@ -315,7 +315,7 @@ 
     
 	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) return 1;
 	// Update extrafield et total
-	if(! empty($subtotal_nc)) {
+	if (!empty($subtotal_nc)) {
 		$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
 			$line->multicurrency_total_ht = $line->multicurrency_total_tva = $line->multicurrency_total_ttc = 0;
 

script/interface.php

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 	dol_include_once('/supplier_proposal/class/supplier_proposal.class.php');
 	dol_include_once('/fourn/class/fournisseur.facture.class.php');
 	
-	$get=GETPOST('get');
-	$set=GETPOST('set');
+	$get = GETPOST('get');
+	$set = GETPOST('set');
 	
 	switch ($get) {
 		default:
@@ -20,7 +20,7 @@ 
 	
 	switch ($set) {
 		case 'updateLineNC': // Gestion du Compris/Non Compris via les titres et/ou lignes
-			echo json_encode( _updateLineNC(GETPOST('element'), GETPOST('elementid'), GETPOST('lineid'), GETPOST('subtotal_nc')) );
+			echo json_encode(_updateLineNC(GETPOST('element'), GETPOST('elementid'), GETPOST('lineid'), GETPOST('subtotal_nc')));
 			
 			break;
 		default:

class/subtotal.class.php

Spacing +190 added lines, -190 removed lines

@@ -5,28 +5,28 @@ 
 	
 	static $module_number = 104777;
 	
-	static function addSubTotalLine(&$object, $label, $qty, $rang=-1) {
+	static function addSubTotalLine(&$object, $label, $qty, $rang = -1) {
 		
 		$res = 0;
 		
-		if( (float)DOL_VERSION <= 3.4 ) {
+		if ((float) DOL_VERSION <= 3.4) {
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
+			if ($object->element == 'facture') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, -1, TSubtotal::$module_number);
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
+			else if ($object->element == 'propal') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, -1, TSubtotal::$module_number);
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
+			else if ($object->element == 'commande') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, -1, TSubtotal::$module_number);
 
 		}
 		else {
 			$desc = '';
-			if ((float) DOL_VERSION < 6  || $qty==50) {
+			if ((float) DOL_VERSION < 6 || $qty == 50) {
 				$desc = $label;
 				$label = '';
 			}
@@ -34,39 +34,39 @@ 
 			/**
 			 * @var $object Facture
 			 */
-			if($object->element=='facture') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
+			if ($object->element == 'facture') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, $rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
 			/**
 			 * @var $object Facture fournisseur
 			 */
-			else if($object->element=='invoice_supplier') {
+			else if ($object->element == 'invoice_supplier') {
 			    $object->special_code = TSubtotal::$module_number;
 			    $rang = $object->line_max() + 1;
-			    $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
+			    $res = $object->addline($label, 0, 0, 0, 0, $qty, 0, 0, '', '', 0, 0, 'HT', 9, $rang);
 			}
 			/**
 			 * @var $object Propal
 			 */
-			else if($object->element=='propal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if ($object->element == 'propal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
 			/**
 			 * @var $object Propal Fournisseur
 			 */
-			else if($object->element=='supplier_proposal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
+			else if ($object->element == 'supplier_proposal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
 			
 			/**
 			 * @var $object Commande
 			 */
-			else if($object->element=='commande') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
+			else if ($object->element == 'commande') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, $rang, TSubtotal::$module_number, 0, null, 0, $label);
 			/**
 			 * @var $object Commande fournisseur
 			 */
-			else if($object->element=='order_supplier') {
+			else if ($object->element == 'order_supplier') {
 			    $object->special_code = TSubtotal::$module_number;
-			    $res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
+			    $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, '', 0, 'HT', 0, 9);
 			}
 			/**
 			 * @var $object Facturerec
 			 */
-			else if($object->element=='facturerec') $res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label); 
+			else if ($object->element == 'facturerec') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number, $label); 
 			
 		}
 	
@@ -77,20 +77,20 @@ 
 
 	public static function generateDoc(&$object)
 	{
-		global $conf,$langs,$db;
+		global $conf, $langs, $db;
 		
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
 		{
-			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
-			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
-			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
+			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
+			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
+			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 			
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = GETPOST('lang_id', 'alpha');
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
+			if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
 				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
-			if (! empty($newlang)) {
+			if (!empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
 			}
@@ -104,7 +104,7 @@ 
 			}
 			else
 			{
-				if ($object->element!= 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				if ($object->element != 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
 		}
 	}
@@ -116,11 +116,11 @@ 
 	 * @param type $rang_start
 	 * @param type $move_to
 	 */
-	public static function updateRang(&$object, $rang_start, $move_to=1)
+	public static function updateRang(&$object, $rang_start, $move_to = 1)
 	{
 		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
 		
-		$row=new GenericObject($object->db);
+		$row = new GenericObject($object->db);
 		$row->table_element_line = $object->table_element_line;
 		$row->fk_element = $object->fk_element;
 		$row->id = $object->id;
@@ -129,7 +129,7 @@ 
 		{
 			if ($line->rang < $rang_start) continue;
 			
-			$row->updateRangOfLine($line->id, $line->rang+$move_to);
+			$row->updateRangOfLine($line->id, $line->rang + $move_to);
 		}
 	}
 	
@@ -158,7 +158,7 @@ 
 			{
 				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
 				
-				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100-$title_niveau, $rang_to_add);
+				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100 - $title_niveau, $rang_to_add);
 				
 				$object->lines[] = $object->line; // ajout de la ligne dans le tableau de ligne (Dolibarr ne le fait pas)
 				if ($rang_to_add != -1) 
@@ -170,14 +170,14 @@ 
 		}
 	}
 	
-	public static function addTitle(&$object, $label, $level, $rang=-1)
+	public static function addTitle(&$object, $label, $level, $rang = -1)
 	{
 		self::addSubTotalLine($object, $label, $level, $rang);
 	}
 	
-	public static function addTotal(&$object, $label, $level, $rang=-1)
+	public static function addTotal(&$object, $label, $level, $rang = -1)
 	{
-		self::addSubTotalLine($object, $label, (100-$level), $rang);
+		self::addSubTotalLine($object, $label, (100 - $level), $rang);
 	}
 
 	/**
@@ -188,7 +188,7 @@ 
 	 * 
 	 * @return array
 	 */
-	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total=false)
+	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total = false)
 	{
 		$TTitle = self::getAllTitleFromDocument($object, $get_block_total);
 		
@@ -209,7 +209,7 @@ 
 	 * @param boolean								$return_rang_on_false	si true alors renvoi le rang où devrait ce trouver le sous-total
 	 * @return boolean
 	 */
-	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode=false, $return_rang_on_false=false)
+	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode = false, $return_rang_on_false = false)
 	{
 		if (empty($object->lines) || !is_array($object->lines)) return false;
 		
@@ -235,7 +235,7 @@ 
 		return ($return_rang_on_false) ? -1 : false;
 	}
 	
-	public static function getAllTitleFromDocument(&$object, $get_block_total=false)
+	public static function getAllTitleFromDocument(&$object, $get_block_total = false)
 	{
 		$TRes = array();
 		if (!empty($object->lines))
@@ -355,10 +355,10 @@ 
 		return false;
 	}
 	
-	public static function isTitle(&$line, $level=-1)
+	public static function isTitle(&$line, $level = -1)
 	{
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
-		if($res && $level > -1) {
+		if ($res && $level > -1) {
 			return $line->qty == $level;
 		} else return $res;
 		
@@ -379,43 +379,43 @@ 
 		return self::isTitle($line) || self::isSubtotal($line) || self::isFreeText($line);
 	}
 
-	public static function getFreeTextHtml(&$line, $readonly=0)
+	public static function getFreeTextHtml(&$line, $readonly = 0)
 	{
 		global $conf;
 		
 		// Copie du fichier "objectline_edit.tpl.php"
 		// editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$nbrows=ROWS_2;
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
-		$toolbarname='dolibarr_details';
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
-		$text = !empty($line->description)?$line->description:$line->label;
-		$doleditor=new DolEditor('line-description',$text,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%', $readonly);
+		$nbrows = ROWS_2;
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
+		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
+		$toolbarname = 'dolibarr_details';
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
+		$text = !empty($line->description) ? $line->description : $line->label;
+		$doleditor = new DolEditor('line-description', $text, '', 164, $toolbarname, '', false, true, $enable, $nbrows, '98%', $readonly);
 		return $doleditor->Create(1);
 	}
 	
-	public static function duplicateLines(&$object, $lineid, $withBlockLine=false)
+	public static function duplicateLines(&$object, $lineid, $withBlockLine = false)
 	{
-		global $db,$user,$conf;
+		global $db, $user, $conf;
 
 		$createRight = $user->rights->{$object->element}->creer;
-		if($object->element == 'facturerec' )
+		if ($object->element == 'facturerec')
 		{
 		    $object->statut = 0; // hack for facture rec
 		    $createRight = $user->rights->facture->creer;
 		}
-		elseif($object->element == 'order_supplier' )
+		elseif ($object->element == 'order_supplier')
 		{
 		    $createRight = $user->rights->fournisseur->commande->creer;
 		}
-		elseif($object->element == 'invoice_supplier' )
+		elseif ($object->element == 'invoice_supplier')
 		{
 		    $createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
-		if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
+		if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
 		{
 			dol_include_once('/subtotal/lib/subtotal.lib.php');
 			
@@ -448,7 +448,7 @@ 
 						case 'order_supplier':
 						    $object->line = $line;
 						    $object->line->fk_commande = $object->id;
-						    $object->line->rang = $object->line_max() +1;
+						    $object->line->rang = $object->line_max() + 1;
 						    $res = $object->line->insert(1);
 							break;
 							
@@ -488,7 +488,7 @@ 
 					{
 						$object->line_from = $line;
 						// Call trigger
-						$result=$object->call_trigger('LINE_DUPLICATE',$user); // $object->line
+						$result = $object->call_trigger('LINE_DUPLICATE', $user); // $object->line
 						if ($result < 0)
 						{
 							$object->db->rollback();
@@ -518,7 +518,7 @@ 
 		}
 	}
 	
-	public static function getLinesFromTitle(&$object, $key_trad, $level=1, $under_title='', $withBlockLine=false, $key_is_id=false)
+	public static function getLinesFromTitle(&$object, $key_trad, $level = 1, $under_title = '', $withBlockLine = false, $key_is_id = false)
 	{
 		global $langs;
 		
@@ -530,17 +530,17 @@ 
 		
 		$TLine = array();
 		$add_line = false;
-		$under_title_found=false;
+		$under_title_found = false;
 		
 		foreach ($object->lines as $key => &$line)
 		{
 			if (!$under_title_found && !empty($TTitle_under_search))
 			{
-				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) $under_title_found = true;
+				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search))) $under_title_found = true;
 			}
 			else
 			{
-				if ( ($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search) )))
+				if (($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search))))
 				{
 					if ($key_is_id) $level = $line->qty;
 					
@@ -548,7 +548,7 @@ 
 					if ($withBlockLine) $TLine[] = $line;
 					continue;
 				}
-				elseif ($add_line && $line->product_type == 9 && (100 - $line->qty == $level) ) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
+				elseif ($add_line && $line->product_type == 9 && (100 - $line->qty == $level)) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
 				{
 					if ($withBlockLine) $TLine[] = $line;
 					break;
@@ -556,7 +556,7 @@ 
 				
 				if ($add_line)
 				{
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line))) continue;
 					else $TLine[] = $line;
 				}
 			}
@@ -565,12 +565,12 @@ 
 		return $TLine;
 	}
 	
-	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine=false)
+	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine = false)
 	{
 		return self::getLinesFromTitle($object, $lineid, '', '', $withBlockLine, true);
 	}
 	
-	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null)
+	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 0, $fk_unit = null)
 	{
 		$res = 0;
 		$object->db->begin();
@@ -582,7 +582,7 @@ 
 		        break;
 		        
 		    case 'supplier_proposal':
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
+		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options, '', $fk_unit);
 		        break;
 		        
 			case 'commande':
@@ -611,9 +611,9 @@ 
 				$factureRecLine->fetch($rowid);
 				$factureRecLine->array_options = $array_options;
 				$factureRecLine->insertExtraFields();
-				$rang=$factureRecLine->rang;
+				$rang = $factureRecLine->rang;
 				
-				$fk_product=0; $fk_remise_except=''; $pu_ttc=0;	
+				$fk_product = 0; $fk_remise_except = ''; $pu_ttc = 0;	
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $info_bits, $fk_remise_except, $pu_ttc, $type, $rang, $special_code, $label, $fk_unit);
 				break;
 		}
@@ -629,7 +629,7 @@ 
 		global $db, $object;
 		
 		$TTitle = array();
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
+		if (!empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
 		else {
 			if ($origin_line->element == 'propaldet')
 			{
@@ -709,7 +709,7 @@ 
 	 */
 	public static function addRecapPage(&$parameters, &$origin_pdf)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 		
 		$origin_file = $parameters['file'];
 		$outputlangs = $parameters['outputlangs'];
@@ -725,21 +725,21 @@ 
 		$objmarge->marge_droite = 10;
 		
 		$objectref = dol_sanitizeFileName($object->ref);
-		if ($object->element == 'propal') $dir = $conf->propal->dir_output . '/' . $objectref;
-		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output . '/' . $objectref;
-		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output . '/' . $objectref;
+		if ($object->element == 'propal') $dir = $conf->propal->dir_output.'/'.$objectref;
+		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output.'/'.$objectref;
+		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output.'/'.$objectref;
 		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
 		else
 		{
 			setEventMessage($langs->trans('warning_subtotal_recap_object_element_unknown', $object->element), 'warnings');
 			return -1;
 		}
-		$file = $dir . '/' . $objectref . '_recap.pdf';
+		$file = $dir.'/'.$objectref.'_recap.pdf';
 
 //		$pdf=pdf_getInstance($origin_pdf->format);
-		$pdf=pdf_getInstance(array(210, 297)); // Format A4 Portrait
-		$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
-		$pdf->SetAutoPageBreak(1,0);
+		$pdf = pdf_getInstance(array(210, 297)); // Format A4 Portrait
+		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+		$pdf->SetAutoPageBreak(1, 0);
 	             
 		if (class_exists('TCPDF'))
 		{
@@ -748,49 +748,49 @@ 
 		}
 		$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))
+		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;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 		$pdf->SetSubject($outputlangs->transnoentities("subtotalRecap"));
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
 		$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("subtotalRecap")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
-		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite);   // Left, Top, Right
+		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite); // Left, Top, Right
 
-		$pagenb=0;
-		$pdf->SetDrawColor(128,128,128);
+		$pagenb = 0;
+		$pdf->SetDrawColor(128, 128, 128);
 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 		$pagenb++;
 		
 		
 		self::pagehead($objmarge, $pdf, $object, 1, $outputlangs);
-		$pdf->SetFont('','', $default_font_size - 1);
-		$pdf->MultiCell(0, 3, '');		// Set interline to 3
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetFont('', '', $default_font_size - 1);
+		$pdf->MultiCell(0, 3, ''); // Set interline to 3
+		$pdf->SetTextColor(0, 0, 0);
 		
-		$heightforinfotot = 25;	// Height reserved to output the info and total part
-		$heightforfooter = $objmarge->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
+		$heightforinfotot = 25; // Height reserved to output the info and total part
+		$heightforfooter = $objmarge->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
 		
 		$posx_designation = 25;
 		$posx_options = 150;
 		$posx_montant = 170;
 		
 		$tab_top = 72;
-		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?72:20); // TODO à vérifier
+		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 72 : 20); // TODO à vérifier
 		
 		$TTot = array('total_ht' => 0, 'total_ttc' => 0, 'TTotal_tva' => array());
 		
@@ -804,14 +804,14 @@ 
 			$nexY = $tab_top + 10;
 			
 			$nblignes = count($TLine);
-			foreach($TLine as $i => &$line)
+			foreach ($TLine as $i => &$line)
 			{
 				$curY = $nexY;
 				
 				if (self::getNiveau($line) == 1) 
 				{
-					$pdf->SetFont('','B', $default_font_size - 1);   // Into loop to work with multipage
-					$curY+=2;
+					$pdf->SetFont('', 'B', $default_font_size - 1); // Into loop to work with multipage
+					$curY += 2;
 					
 					$TTot['total_ht'] += $line->total_ht;
 					$TTot['total_tva'] += $line->total_tva;
@@ -830,67 +830,67 @@ 
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
 					}	
 				}
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+				else $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
 				
-				$pdf->SetTextColor(0,0,0);
+				$pdf->SetTextColor(0, 0, 0);
 				
 				$pdf->setTopMargin($tab_top_newpage + 10);
-				$pdf->setPageOrientation('', 1, $heightforfooter+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
-				$pageposbefore=$pdf->getPage();
+				$pdf->setPageOrientation('', 1, $heightforfooter + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+				$pageposbefore = $pdf->getPage();
 				
-				$showpricebeforepagebreak=1;
+				$showpricebeforepagebreak = 1;
 				
 				$decalage = (self::getNiveau($line) - 1) * 2;
 				
 				// Print: Designation
 				$label = $line->label;
-				if( (float)DOL_VERSION < 6 ) {
+				if ((float) DOL_VERSION < 6) {
 					$label = !empty($line->label) ? $line->label : $line->desc;
 				}
 				
 				
 				$pdf->startTransaction();
-				$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
-				$pageposafter=$pdf->getPage();
+				$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
+				$pageposafter = $pdf->getPage();
 				if ($pageposafter > $pageposbefore)	// There is a pagebreak
 				{
 					$pdf->rollbackTransaction(true);
-					$pageposafter=$pageposbefore;
+					$pageposafter = $pageposbefore;
 					//print $pageposafter.'-'.$pageposbefore;exit;
-					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
-					$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
+					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+					$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
 
-					$pageposafter=$pdf->getPage();
-					$posyafter=$pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$posyafter = $pdf->GetY();
 					//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot)))	// There is no space left for total+free text
+					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter + $heightforinfotot)))	// There is no space left for total+free text
 					{
-						if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
+						if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
 						{
-							$pdf->AddPage('','',true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
-							$pdf->setPage($pageposafter+1);
+							$pdf->setPage($pageposafter + 1);
 						}
 					}
 					else
 					{
 						// We found a page break
-						$showpricebeforepagebreak=0;
+						$showpricebeforepagebreak = 0;
 					}
 				}
 				else	// No pagebreak
 				{
 					$pdf->commitTransaction();
 				}
-				$posYAfterDescription=$pdf->GetY();
+				$posYAfterDescription = $pdf->GetY();
 
 				$nexY = $pdf->GetY();
-				$pageposafter=$pdf->getPage();
+				$pageposafter = $pdf->getPage();
 
 				$pdf->setPage($pageposbefore);
 				$pdf->setTopMargin($objmarge->marge_haute);
-				$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+				$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 
 				// We suppose that a too long description or photo were moved completely on next page
 				if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -903,14 +903,14 @@ 
 				if (!empty($line->total_options))
 				{
 					$pdf->SetXY($posx_options, $curY);
-					$pdf->MultiCell($posx_montant-$posx_options-0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
+					$pdf->MultiCell($posx_montant - $posx_options - 0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
 				}
 				
 				// Print: Montant
 				$pdf->SetXY($posx_montant, $curY);
-				$pdf->MultiCell($objmarge->page_largeur-$objmarge->marge_droite-$posx_montant-0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
+				$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant - 0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
 				
-				$nexY+=2;    // Passe espace entre les lignes
+				$nexY += 2; // Passe espace entre les lignes
 
 				// Detect if some page were added automatically and output _tableau for past pages
 				while ($pagenb < $pageposafter)
@@ -927,7 +927,7 @@ 
 					
 					$pagenb++;
 					$pdf->setPage($pagenb);
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
 				}
 			}
@@ -937,19 +937,19 @@ 
 		if ($pagenb == 1)
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforinfotot - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
 		}
 		else
 		{
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
 		}
 		
 		// Affiche zone totaux
-		$posy=self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
+		$posy = self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
 		
 		$pdf->Close();
-		$pdf->Output($file,'F');
+		$pdf->Output($file, 'F');
 		
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
 		
@@ -961,7 +961,7 @@ 
 		$level = $line->qty; // TODO à améliorer
 		
 		$pdf->SetXY($objmarge->marge_gauche, $curY);
-		$pdf->MultiCell($posx_designation-$objmarge->marge_gauche-0.8, 5, $level, 0, 'L', 0);
+		$pdf->MultiCell($posx_designation - $objmarge->marge_gauche - 0.8, 5, $level, 0, 'L', 0);
 	}
 	
 	/**
@@ -975,50 +975,50 @@ 
 	 */
 	private static function pagehead(&$objmarge, &$pdf, &$object, $showdetail, $outputlangs)
 	{
-		global $conf,$mysoc;
+		global $conf, $mysoc;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
-		pdf_pagehead($pdf,$outputlangs,$objmarge->page_hauteur);
+		pdf_pagehead($pdf, $outputlangs, $objmarge->page_hauteur);
 
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFont('','B', $default_font_size + 3);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
 
-		$posy=$objmarge->marge_haute;
-		$posx=$objmarge->page_largeur-$objmarge->marge_droite-100;
+		$posy = $objmarge->marge_haute;
+		$posx = $objmarge->page_largeur - $objmarge->marge_droite - 100;
 		
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
 		if ($mysoc->logo)
 		{
 			if (is_readable($logo))
 			{
-			    $height=pdf_getHeightForLogo($logo);
-			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
+			    $height = pdf_getHeightForLogo($logo);
+			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height); // width=0 (auto)
 			}
 			else
 			{
-				$pdf->SetTextColor(200,0,0);
-				$pdf->SetFont('','B',$default_font_size - 2);
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
+				$pdf->SetTextColor(200, 0, 0);
+				$pdf->SetFont('', 'B', $default_font_size - 2);
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
 			}
 			
-			$posy+=35;
+			$posy += 35;
 		}
 		else
 		{
-			$text=$mysoc->name;
+			$text = $mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
 			
-			$posy+=15;
+			$posy += 15;
 		}
 		
 		
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 		
 		$key = 'subtotalPropalTitle';
 		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
@@ -1027,14 +1027,14 @@ 
 		
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
 		
-		$pdf->SetFont('','', $default_font_size);
-		$pdf->SetXY($objmarge->page_largeur-$objmarge->marge_droite-40,$posy);
+		$pdf->SetFont('', '', $default_font_size);
+		$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - 40, $posy);
 		$pdf->MultiCell(40, 4, dol_print_date($object->date, 'daytext'), '', 'R');
 		
 		$posy += 8;
 			
-		$pdf->SetFont('','B', $default_font_size + 2);
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
 		$pdf->MultiCell(70, 4, $outputlangs->transnoentities('subtotalRecapLot'), '', 'L');
 		
 	}
@@ -1052,44 +1052,44 @@ 
 	 *   @param		string		$currency		Currency code
 	 *   @return	void
 	 */
-	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
+	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
 	{
 		global $conf;
 		
 		// Force to disable hidetop and hidebottom
-		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 
 		// Amount in (at tab_top - 1)
-		$pdf->SetTextColor(0,0,0);
-		$pdf->SetFont('','',$default_font_size);
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size);
 
 		if (empty($hidetop))
 		{
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
-			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4.5);
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4.5);
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
 			
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite - $objmarge->marge_gauche, 8, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
 			
 			
-			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top); // line prend une position y en 2eme param et 4eme param
 
-			$pdf->SetXY($posx_designation, $tab_top+2);
-			$pdf->MultiCell($posx_options - $posx_designation,2, $outputlangs->transnoentities("Designation"),'','L');
-			$pdf->SetXY($posx_options, $tab_top+2);
-			$pdf->MultiCell($posx_montant - $posx_options,2, $outputlangs->transnoentities("Options"),'','R');
-			$pdf->SetXY($posx_montant, $tab_top+2);
-			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant,2, $outputlangs->transnoentities("Amount"),'','R');
+			$pdf->SetXY($posx_designation, $tab_top + 2);
+			$pdf->MultiCell($posx_options - $posx_designation, 2, $outputlangs->transnoentities("Designation"), '', 'L');
+			$pdf->SetXY($posx_options, $tab_top + 2);
+			$pdf->MultiCell($posx_montant - $posx_options, 2, $outputlangs->transnoentities("Options"), '', 'R');
+			$pdf->SetXY($posx_montant, $tab_top + 2);
+			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant, 2, $outputlangs->transnoentities("Amount"), '', 'R');
 			
-			$pdf->line($objmarge->marge_gauche, $tab_top+8, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top+8);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top + 8, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top + 8); // line prend une position y en 2eme param et 4eme param
 		}
 		else
 		{
-			$pdf->line($objmarge->marge_gauche, $tab_top-2, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top-2);	// line prend une position y en 2eme param et 4eme param
+			$pdf->line($objmarge->marge_gauche, $tab_top - 2, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top - 2); // line prend une position y en 2eme param et 4eme param
 		}
 		
 	}
@@ -1098,29 +1098,29 @@ 
 	{
 		global $conf;
 		
-		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur-$objmarge->marge_droite, $posy);	// line prend une position y en 2eme param et 4eme param
+		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur - $objmarge->marge_droite, $posy); // line prend une position y en 2eme param et 4eme param
 		
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
 		
-		$tab2_top = $posy+2;
+		$tab2_top = $posy + 2;
 		$tab2_hl = 4;
-		$pdf->SetFont('','', $default_font_size - 1);
+		$pdf->SetFont('', '', $default_font_size - 1);
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
 		if ($objmarge->page_largeur < 210) // To work with US executive format
 		{
-			$col2x-=20;
+			$col2x -= 20;
 		}
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
 
-		$useborder=0;
+		$useborder = 0;
 		$index = 0;
 
 		// Total HT
-		$pdf->SetFillColor(255,255,255);
+		$pdf->SetFillColor(255, 255, 255);
 		$pdf->SetXY($col1x, $tab2_top + 0);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
 
 		// $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1) ? $TTot['multicurrency_total_ht'] : $TTot['total_ht'];
 		$total_ht = $TTot['total_ht'];
@@ -1128,10 +1128,10 @@ 
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', 1);
 
 		// Show VAT by rates and total
-		$pdf->SetFillColor(248,248,248);
+		$pdf->SetFillColor(248, 248, 248);
 		
-		$atleastoneratenotnull=0;
-		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
+		$atleastoneratenotnull = 0;
+		foreach ($TTot['TTotal_tva'] as $tvakey => $tvaval)
 		{
 			if ($tvakey != 0)    // On affiche pas taux 0
 			{
@@ -1140,15 +1140,15 @@ 
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 
-				$tvacompl='';
-				if (preg_match('/\*/',$tvakey))
+				$tvacompl = '';
+				if (preg_match('/\*/', $tvakey))
 				{
-					$tvakey=str_replace('*','',$tvakey);
+					$tvakey = str_replace('*', '', $tvakey);
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
 				}
-				$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
-				$totalvat.=vatrate($tvakey,1).$tvacompl;
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
+				$totalvat = $outputlangs->transnoentities("TotalVAT").' ';
+				$totalvat .= vatrate($tvakey, 1).$tvacompl;
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
 
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1158,16 +1158,16 @@ 
 		// Total TTC
 		$index++;
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-		$pdf->SetTextColor(0,0,60);
-		$pdf->SetFillColor(224,224,224);
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFillColor(224, 224, 224);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
 
 		// $total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $TTot['multicurrency_total_ttc'] : $TTot['total_ttc'];
 		$total_ttc = $TTot['total_ttc'];
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
 
-		$pdf->SetTextColor(0,0,0);
+		$pdf->SetTextColor(0, 0, 0);
 				
 		$index++;
 		return ($tab2_top + ($tab2_hl * $index));
@@ -1186,22 +1186,22 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
+    private static function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
     {
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
-	    $pdf->line($x, $y+$h, $x, $y);
+	    if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
+	    $pdf->line($x + $l, $y, $x + $l, $y + $h);
+	    if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
+	    $pdf->line($x, $y + $h, $x, $y);
     }
 	
 	
-	public static function concat(&$outputlangs, $files, $fileoutput='')
+	public static function concat(&$outputlangs, $files, $fileoutput = '')
 	{
 		global $conf;
 		
 		if (empty($fileoutput)) $fileoutput = $file[0];
 		
-		$pdf=pdf_getInstance();
+		$pdf = pdf_getInstance();
         if (class_exists('TCPDF'))
         {
             $pdf->setPrintHeader(false);
@@ -1209,10 +1209,10 @@ 
         }
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
 
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+        if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
 
 		
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			$pagecount = $pdf->setSourceFile($file);
 			for ($i = 1; $i <= $pagecount; $i++)
@@ -1224,8 +1224,8 @@ 
 			}
 		}
 		
-		$pdf->Output($fileoutput,'F');
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
+		$pdf->Output($fileoutput, 'F');
+		if (!empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
 
 		return $pagecount;
 	}
@@ -1238,7 +1238,7 @@ 
 	 */
 	public static function hasNcTitle(&$line)
 	{
-		if(isset($line->has_nc_title)) return $line->has_nc_title;
+		if (isset($line->has_nc_title)) return $line->has_nc_title;
 
 		$TTitle = self::getAllTitleFromLine($line);
 		foreach ($TTitle as &$line_title)