ATM-Consulting / dolibarr_module_subtotal

script/maj_subtotal_nc.php

Spacing +6 added lines, -6 removed lines

@@ -13,19 +13,19 @@
 $sql = 'SELECT rowid';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'propal';
 $sql .= ' WHERE total_ht + tva != total';
-if(! empty($limit)) $sql .= ' LIMIT '.$limit;
+if (!empty($limit)) $sql .= ' LIMIT '.$limit;
 
 $resql = $db->query($sql);
-if($resql) {
+if ($resql) {
 	$db->begin();
-	while($obj = $db->fetch_object($resql)) {
+	while ($obj = $db->fetch_object($resql)) {
 		$propal = new Propal($db);
 		var_dump($obj->rowid);
 		$propal->fetch($obj->rowid);
 
-		foreach($propal->lines as &$l) {
-			if(empty($l->array_options)) $l->fetch_optionals();
-			if(! empty($l->array_options['options_subtotal_nc']) && ! TSubtotal::isModSubtotalLine($l)) {
+		foreach ($propal->lines as &$l) {
+			if (empty($l->array_options)) $l->fetch_optionals();
+			if (!empty($l->array_options['options_subtotal_nc']) && !TSubtotal::isModSubtotalLine($l)) {
 				_updateLineNC($propal->element, $propal->id, $l->id, $l->array_options['options_subtotal_nc']);
 			}
 		}

Braces +6 added lines, -2 removed lines

@@ -13,7 +13,9 @@ 
 $sql = 'SELECT rowid';
 $sql .= ' FROM '.MAIN_DB_PREFIX.'propal';
 $sql .= ' WHERE total_ht + tva != total';
-if(! empty($limit)) $sql .= ' LIMIT '.$limit;
+if(! empty($limit)) {
+	$sql .= ' LIMIT '.$limit;
+}
 
 $resql = $db->query($sql);
 if($resql) {
@@ -24,7 +26,9 @@ 
 		$propal->fetch($obj->rowid);
 
 		foreach($propal->lines as &$l) {
-			if(empty($l->array_options)) $l->fetch_optionals();
+			if(empty($l->array_options)) {
+				$l->fetch_optionals();
+			}
 			if(! empty($l->array_options['options_subtotal_nc']) && ! TSubtotal::isModSubtotalLine($l)) {
 				_updateLineNC($propal->element, $propal->id, $l->id, $l->array_options['options_subtotal_nc']);
 			}

lib/subtotal.lib.php

Indentation +34 added lines, -34 removed lines

@@ -25,25 +25,25 @@ 
 
 function subtotalAdminPrepareHead()
 {
-    global $langs, $conf;
+	global $langs, $conf;
 
-    $langs->load("subtotal@subtotal");
+	$langs->load("subtotal@subtotal");
 
-    $h = 0;
-    $head = array();
+	$h = 0;
+	$head = array();
 
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
-    $head[$h][1] = $langs->trans("Parameters");
-    $head[$h][2] = 'settings';
-    $h++;
-    $head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
-    $head[$h][1] = $langs->trans("About");
-    $head[$h][2] = 'about';
-    $h++;
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_setup.php", 1);
+	$head[$h][1] = $langs->trans("Parameters");
+	$head[$h][2] = 'settings';
+	$h++;
+	$head[$h][0] = dol_buildpath("/subtotal/admin/subtotal_about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$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;
+	return $head;
 }
 
 function getHtmlSelectTitle(&$object, $showLabel=false)
@@ -130,8 +130,8 @@ 
 	$label = GETPOST('line-title');
 	$description = ($line->qty>90) ? '' : GETPOST('line-description');
 	$pagebreak = (int) GETPOST('line-pagebreak');
-    $showTotalHT = (int) GETPOST('line-showTotalHT');
-    $showReduc = (int) GETPOST('line-showReduc');
+	$showTotalHT = (int) GETPOST('line-showTotalHT');
+	$showReduc = (int) GETPOST('line-showReduc');
 
 	$level = GETPOST('subtotal_level', 'int');
 	if (!empty($level))
@@ -139,8 +139,8 @@ 
 		if ($line->qty > 90) $line->qty = 100 - $level; // Si on edit une ligne sous-total
 		else $line->qty = $level;
 	}
-    $line->array_options['options_show_total_ht'] = $showTotalHT;
-    $line->array_options['options_show_reduc'] = $showReduc;
+	$line->array_options['options_show_total_ht'] = $showTotalHT;
+	$line->array_options['options_show_reduc'] = $showReduc;
 	
 	$res = TSubtotal::doUpdateLine($object, $line->id, $description, 0, $line->qty, 0, '', '', 0, 9, 0, 0, 'HT', $pagebreak, 0, 1, null, 0, $label, TSubtotal::$module_number, $line->array_options);
 
@@ -246,17 +246,17 @@ 
 			$classname = ucfirst($element);
 			
 			switch ($element) {
-			    case 'supplier_proposal':
-			        $classname = 'SupplierProposal';
-			        break;
+				case 'supplier_proposal':
+					$classname = 'SupplierProposal';
+					break;
 			        
-			    case 'order_supplier':
-			        $classname = 'CommandeFournisseur';
-			        break;
+				case 'order_supplier':
+					$classname = 'CommandeFournisseur';
+					break;
 			        
-			    case 'invoice_supplier':
-			        $classname = 'FactureFournisseur';
-			        break;
+				case 'invoice_supplier':
+					$classname = 'FactureFournisseur';
+					break;
 			}
 			
 			$object = new $classname($db); // Propal | Commande | Facture
@@ -329,14 +329,14 @@ 
 		else $res = $line->update($user, $notrigger);
 	}
 	else {
-	    if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
-	        if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
+		if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
+			if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
 	        
-	        require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-	        $extrafields=new ExtraFields($object->db);
-	        $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-	        $line->fetch_optionals($line->id,$extralabels);
-	    }
+			require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+			$extrafields=new ExtraFields($object->db);
+			$extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
+			$line->fetch_optionals($line->id,$extralabels);
+		}
 		$line->array_options['options_subtotal_nc'] = 0;
 		if($object->element == 'order_supplier') $line->update($user);
 		$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $notrigger);

Spacing +25 added lines, -25 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');
     $showTotalHT = (int) GETPOST('line-showTotalHT');
     $showReduc = (int) GETPOST('line-showReduc');
@@ -149,7 +149,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');
@@ -228,9 +228,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, $notrigger = 0)
+function _updateLineNC($element, $elementid, $lineid, $subtotal_nc = null, $notrigger = 0)
 {
-	global $db,$langs,$tmp_object_nc;
+	global $db, $langs, $tmp_object_nc;
 	
 	$error = 0;
 	if (empty($element)) $error++;
@@ -270,7 +270,7 @@ 
 	{
 		foreach ($object->lines as &$l)
 		{
-			if($l->id == $lineid) {
+			if ($l->id == $lineid) {
 				$line = $l;
 				break;
 			}
@@ -280,12 +280,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, $notrigger);
 					}
@@ -319,7 +319,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;
 
@@ -329,16 +329,16 @@ 
 		else $res = $line->update($user, $notrigger);
 	}
 	else {
-	    if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
-	        if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
+	    if (in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
+	        if (empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
 	        
 	        require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-	        $extrafields=new ExtraFields($object->db);
-	        $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-	        $line->fetch_optionals($line->id,$extralabels);
+	        $extrafields = new ExtraFields($object->db);
+	        $extralabels = $extrafields->fetch_name_optionals_label($object->table_element_line, true);
+	        $line->fetch_optionals($line->id, $extralabels);
 	    }
 		$line->array_options['options_subtotal_nc'] = 0;
-		if($object->element == 'order_supplier') $line->update($user);
+		if ($object->element == 'order_supplier') $line->update($user);
 		$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $notrigger);
 	}
 	

Braces +63 added lines, -29 removed lines

@@ -54,7 +54,9 @@ 
 	dol_include_once('/subtotal/class/subtotal.class.php');
 	$TTitle = TSubtotal::getAllTitleFromDocument($object);
 	$html = '';
-	if ($showLabel) $html.= '<label for="under_title">'.$langs->trans('subtotalLabelForUnderTitle').'</label>';
+	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;';
@@ -95,7 +97,9 @@ 
 	$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>';
+	if ($withEmpty) {
+		$html.= '<option value=""></option>';
+	}
 
 	$TFreeTextContents = array();
 	foreach ($TFreeText as $id => $tab)
@@ -136,8 +140,13 @@ 
 	$level = GETPOST('subtotal_level', 'int');
 	if (!empty($level))
 	{
-		if ($line->qty > 90) $line->qty = 100 - $level; // Si on edit une ligne sous-total
-		else $line->qty = $level;
+		if ($line->qty > 90) {
+			$line->qty = 100 - $level;
+		}
+		// Si on edit une ligne sous-total
+		else {
+			$line->qty = $level;
+		}
 	}
     $line->array_options['options_show_total_ht'] = $showTotalHT;
     $line->array_options['options_show_reduc'] = $showReduc;
@@ -166,13 +175,18 @@ 
 			{
 				$subtotal_tva_tx = $subtotal_tva_tx_init; // ré-init car la variable peut évoluer
 					
-				if (!empty($showBlockExtrafields)) $line->array_options = $array_options;
-				if ($subtotal_tva_tx == '') $subtotal_tva_tx = $line->tva_tx;
+				if (!empty($showBlockExtrafields)) {
+					$line->array_options = $array_options;
+				}
+				if ($subtotal_tva_tx == '') {
+					$subtotal_tva_tx = $line->tva_tx;
+				}
 				if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION)
 				{
 					$subtotal_progress = $subtotal_progress_init;
-					if ($subtotal_progress == '') $subtotal_progress = $line->situation_percent;
-					else
+					if ($subtotal_progress == '') {
+						$subtotal_progress = $line->situation_percent;
+					} else
 					{
 						$prev_percent = $line->get_prev_progress($object->id);
 						if ($subtotal_progress < $prev_percent)
@@ -185,14 +199,21 @@ 
 				
 				$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $subtotal_tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $subtotal_progress, $line->fk_unit);
 
-				if ($res > 0) $success_updated_line++;
-				else $error_updated_line++;
+				if ($res > 0) {
+					$success_updated_line++;
+				} else {
+					$error_updated_line++;
+				}
 			}
 		}
 
-		if ($nb_progress_not_updated > 0) setEventMessage($langs->trans('subtotal_nb_progress_not_updated', $nb_progress_not_updated), 'warnings');
+		if ($nb_progress_not_updated > 0) {
+			setEventMessage($langs->trans('subtotal_nb_progress_not_updated', $nb_progress_not_updated), 'warnings');
+		}
 		
-		if ($success_updated_line > 0) setEventMessage($langs->trans('subtotal_success_updated_line', $success_updated_line));
+		if ($success_updated_line > 0) {
+			setEventMessage($langs->trans('subtotal_success_updated_line', $success_updated_line));
+		}
 		if ($error_updated_line > 0)
 		{
 			setEventMessage($langs->trans('subtotal_error_updated_line', $error_updated_line), 'errors');
@@ -233,15 +254,16 @@ 
 	global $db,$langs,$tmp_object_nc;
 	
 	$error = 0;
-	if (empty($element)) $error++;
+	if (empty($element)) {
+		$error++;
+	}
 	
 	if (!$error)
 	{
 		if (!empty($tmp_object_nc) && $tmp_object_nc->element == $element && $tmp_object_nc->id == $elementid)
 		{
 			$object = $tmp_object_nc;
-		}
-		else
+		} else
 		{
 			$classname = ucfirst($element);
 			
@@ -261,8 +283,11 @@ 
 			
 			$object = new $classname($db); // Propal | Commande | Facture
 			$res = $object->fetch($elementid);
-			if ($res < 0) $error++;
-			else $tmp_object_nc = $object;
+			if ($res < 0) {
+				$error++;
+			} else {
+				$tmp_object_nc = $object;
+			}
 		}
 	}
 	
@@ -290,21 +315,21 @@ 
 						$res = doUpdate($object, $line_block, $subtotal_nc, $notrigger);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$res = doUpdate($object, $line, $subtotal_nc, $notrigger);
 			}
 			
 			$res = $object->update_price(1);
-			if ($res <= 0) $error++;
+			if ($res <= 0) {
+				$error++;
+			}
 			
 			if (!$error)
 			{
 				setEventMessage($langs->trans('subtotal_update_nc_success'));
 				$db->commit();
-			}
-			else
+			} else
 			{
 				setEventMessage($langs->trans('subtotal_update_nc_error'), 'errors');
 				$db->rollback();
@@ -317,7 +342,9 @@ 
 {
 	global $user;
 	
-	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) return 1;
+	if (TSubtotal::isFreeText($line) || TSubtotal::isSubtotal($line)) {
+		return 1;
+	}
 	// Update extrafield et total
 	if(! empty($subtotal_nc)) {
 		$line->total_ht = $line->total_tva = $line->total_ttc = $line->total_localtax1 = $line->total_localtax2 = 
@@ -325,12 +352,17 @@ 
 
 		$line->array_options['options_subtotal_nc'] = 1;
 
-		if ($line->element == 'propaldet') $res = $line->update($notrigger);
-		else $res = $line->update($user, $notrigger);
-	}
-	else {
+		if ($line->element == 'propaldet') {
+			$res = $line->update($notrigger);
+		} else {
+			$res = $line->update($user, $notrigger);
+		}
+	} else {
 	    if(in_array($object->element, array('invoice_supplier', 'order_supplier', 'supplier_proposal'))) {
-	        if(empty($line->label)) $line->label = $line->description; // supplier lines don't have the field label
+	        if(empty($line->label)) {
+	        	$line->label = $line->description;
+	        }
+	        // supplier lines don't have the field label
 	        
 	        require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
 	        $extrafields=new ExtraFields($object->db);
@@ -338,7 +370,9 @@ 
 	        $line->fetch_optionals($line->id,$extralabels);
 	    }
 		$line->array_options['options_subtotal_nc'] = 0;
-		if($object->element == 'order_supplier') $line->update($user);
+		if($object->element == 'order_supplier') {
+			$line->update($user);
+		}
 		$res = TSubtotal::doUpdateLine($object, $line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->product_type, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->fk_parent_line, $line->skip_update_total, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $notrigger);
 	}
 	

core/triggers/interface_90_modSubtotal_subtotaltrigger.class.php

Indentation +521 added lines, -521 removed lines

@@ -36,68 +36,68 @@ 
 class Interfacesubtotaltrigger
 {
 
-    private $db;
-
-    /**
-     * Constructor
-     *
-     * 	@param		DoliDB		$db		Database handler
-     */
-    public function __construct($db)
-    {
-        $this->db = $db;
-
-        $this->name = preg_replace('/^Interface/i', '', get_class($this));
-        $this->family = "demo";
-        $this->description = "Triggers of this module are empty functions."
-            . "They have no effect."
-            . "They are provided for tutorial purpose only.";
-        // 'development', 'experimental', 'dolibarr' or version
-        $this->version = 'development';
-        $this->picto = 'titre@titre';
-    }
-
-    /**
-     * Trigger name
-     *
-     * 	@return		string	Name of trigger file
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Trigger description
-     *
-     * 	@return		string	Description of trigger file
-     */
-    public function getDesc()
-    {
-        return $this->description;
-    }
-
-    /**
-     * Trigger version
-     *
-     * 	@return		string	Version of trigger file
-     */
-    public function getVersion()
-    {
-        global $langs;
-        $langs->load("admin");
-
-        if ($this->version == 'development') {
-            return $langs->trans("Development");
-        } elseif ($this->version == 'experimental')
-
-                return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else {
-            return $langs->trans("Unknown");
-        }
-    }
+	private $db;
+
+	/**
+	 * Constructor
+	 *
+	 * 	@param		DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "demo";
+		$this->description = "Triggers of this module are empty functions."
+			. "They have no effect."
+			. "They are provided for tutorial purpose only.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		$this->picto = 'titre@titre';
+	}
+
+	/**
+	 * Trigger name
+	 *
+	 * 	@return		string	Name of trigger file
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Trigger description
+	 *
+	 * 	@return		string	Description of trigger file
+	 */
+	public function getDesc()
+	{
+		return $this->description;
+	}
+
+	/**
+	 * Trigger version
+	 *
+	 * 	@return		string	Version of trigger file
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') {
+			return $langs->trans("Development");
+		} elseif ($this->version == 'experimental')
+
+				return $langs->trans("Experimental");
+		elseif ($this->version == 'dolibarr') return DOL_VERSION;
+		elseif ($this->version) return $this->version;
+		else {
+			return $langs->trans("Unknown");
+		}
+	}
 	
 	public function addToBegin(&$parent, &$object, $rang)
 	{
@@ -147,27 +147,27 @@ 
 		}
 	}
 	
-    /**
-     * Function called when a Dolibarrr business event is done.
-     * All functions "run_trigger" are triggered if file
-     * is inside directory core/triggers
-     *
-     * 	@param		string		$action		Event action code
-     * 	@param		Object		$object		Object
-     * 	@param		User		$user		Object user
-     * 	@param		Translate	$langs		Object langs
-     * 	@param		conf		$conf		Object conf
-     * 	@return		int						<0 if KO, 0 if no triggered ran, >0 if OK
-     */
-    public function run_trigger($action, $object, $user, $langs, $conf)
-    {
-        // Put here code you want to execute when a Dolibarr business events occurs.
-        // Data and type of action are stored into $object and $action
-        // Users
-        dol_include_once('/subtotal/class/subtotal.class.php');
-        $langs->load('subtotal@subtotal');
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "run_trigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * 	@param		string		$action		Event action code
+	 * 	@param		Object		$object		Object
+	 * 	@param		User		$user		Object user
+	 * 	@param		Translate	$langs		Object langs
+	 * 	@param		conf		$conf		Object conf
+	 * 	@return		int						<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function run_trigger($action, $object, $user, $langs, $conf)
+	{
+		// Put here code you want to execute when a Dolibarr business events occurs.
+		// Data and type of action are stored into $object and $action
+		// Users
+		dol_include_once('/subtotal/class/subtotal.class.php');
+		$langs->load('subtotal@subtotal');
    
-        if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT')))
+		if (!empty($conf->global->SUBTOTAL_ALLOW_ADD_LINE_UNDER_TITLE) && in_array($action, array('LINEPROPAL_INSERT', 'LINEORDER_INSERT', 'LINEBILL_INSERT')))
 		{
 			
 			$rang = GETPOST('under_title', 'int'); // Rang du titre
@@ -199,7 +199,7 @@ 
 		}
         
 		
-        if ($action == 'LINEBILL_INSERT' && $object->special_code != TSubtotal::$module_number)
+		if ($action == 'LINEBILL_INSERT' && $object->special_code != TSubtotal::$module_number)
 		{
 			$subtotal_add_title_bloc_from_orderstoinvoice = GETPOST('subtotal_add_title_bloc_from_orderstoinvoice');
 			if (!empty($subtotal_add_title_bloc_from_orderstoinvoice))
@@ -255,7 +255,7 @@ 
 		
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE')))
 		{
-            if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
+			if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
 
 			$doli_action = GETPOST('action');
 			$set = GETPOST('set');
@@ -321,173 +321,173 @@ 
 		}
 		
         
-        if ($action == 'USER_LOGIN') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_UPDATE_SESSION') {
-            // Warning: To increase performances, this action is triggered only if
-            // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_CREATE_FROM_CONTACT') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_NEW_PASSWORD') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_ENABLEDISABLE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_LOGOUT') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_SETINGROUP') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'USER_REMOVEFROMGROUP') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Groups
-        elseif ($action == 'GROUP_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'GROUP_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'GROUP_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Companies
-        elseif ($action == 'COMPANY_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'COMPANY_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'COMPANY_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Contacts
-        elseif ($action == 'CONTACT_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTACT_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTACT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Products
-        elseif ($action == 'PRODUCT_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PRODUCT_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PRODUCT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Customer orders
-        elseif ($action == 'ORDER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_BUILDDOC') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_SENTBYMAIL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEORDER_INSERT') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEORDER_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Supplier orders
-        elseif ($action == 'ORDER_SUPPLIER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Proposals
-        elseif ($action == 'PROPAL_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
+		if ($action == 'USER_LOGIN') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_UPDATE_SESSION') {
+			// Warning: To increase performances, this action is triggered only if
+			// constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_CREATE_FROM_CONTACT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_ENABLEDISABLE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_LOGOUT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_SETINGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'USER_REMOVEFROMGROUP') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Groups
+		elseif ($action == 'GROUP_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'GROUP_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Companies
+		elseif ($action == 'COMPANY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'COMPANY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Contacts
+		elseif ($action == 'CONTACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Products
+		elseif ($action == 'PRODUCT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PRODUCT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Customer orders
+		elseif ($action == 'ORDER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEORDER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Supplier orders
+		elseif ($action == 'ORDER_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Proposals
+		elseif ($action == 'PROPAL_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
 			
 			$doli_action = GETPOST('action');
 
@@ -520,277 +520,277 @@ 
 				if (!empty($line)) $object->update_price(1);
 			}
 			
-        } elseif ($action == 'PROPAL_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_BUILDDOC') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_SENTBYMAIL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_CLOSE_SIGNED') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_CLOSE_REFUSED') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROPAL_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEPROPAL_INSERT') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEPROPAL_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEPROPAL_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Contracts
-        elseif ($action == 'CONTRACT_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTRACT_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTRACT_ACTIVATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTRACT_CANCEL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTRACT_CLOSE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CONTRACT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
+		} elseif ($action == 'PROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_SIGNED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_CLOSE_REFUSED') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEPROPAL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Contracts
+		elseif ($action == 'CONTRACT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_ACTIVATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_CLOSE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CONTRACT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
 
 		elseif ($action == 'BILL_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'BILL_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'BILL_BUILDDOC') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'BILL_SENTBYMAIL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'BILL_CANCEL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'BILL_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEBILL_INSERT') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_CANCEL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'BILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_INSERT') {
 				
-        	dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'LINEBILL_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Payments
-        elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PAYMENT_ADD_TO_BANK') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PAYMENT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Interventions
-        elseif ($action == 'FICHEINTER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'FICHEINTER_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'FICHEINTER_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'FICHEINTER_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Members
-        elseif ($action == 'MEMBER_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_SUBSCRIPTION') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_NEW_PASSWORD') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_RESILIATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'MEMBER_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Categories
-        elseif ($action == 'CATEGORY_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CATEGORY_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'CATEGORY_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Projects
-        elseif ($action == 'PROJECT_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROJECT_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'PROJECT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Project tasks
-        elseif ($action == 'TASK_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'TASK_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'TASK_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Task time spent
-        elseif ($action == 'TASK_TIMESPENT_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'TASK_TIMESPENT_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'TASK_TIMESPENT_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // Shipping
-        elseif ($action == 'SHIPPING_CREATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SHIPPING_MODIFY') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SHIPPING_VALIDATE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SHIPPING_SENTBYMAIL') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SHIPPING_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'SHIPPING_BUILDDOC') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        // File
-        elseif ($action == 'FILE_UPLOAD') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        } elseif ($action == 'FILE_DELETE') {
-            dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
-            );
-        }
-
-        return 0;
-    }
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'LINEBILL_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Payments
+		elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_ADD_TO_BANK') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PAYMENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Interventions
+		elseif ($action == 'FICHEINTER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FICHEINTER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Members
+		elseif ($action == 'MEMBER_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_SUBSCRIPTION') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_NEW_PASSWORD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_RESILIATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'MEMBER_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Categories
+		elseif ($action == 'CATEGORY_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'CATEGORY_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Projects
+		elseif ($action == 'PROJECT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'PROJECT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Project tasks
+		elseif ($action == 'TASK_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Task time spent
+		elseif ($action == 'TASK_TIMESPENT_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'TASK_TIMESPENT_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// Shipping
+		elseif ($action == 'SHIPPING_CREATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_MODIFY') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_VALIDATE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_SENTBYMAIL') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'SHIPPING_BUILDDOC') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		// File
+		elseif ($action == 'FILE_UPLOAD') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		} elseif ($action == 'FILE_DELETE') {
+			dol_syslog(
+				"Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+			);
+		}
+
+		return 0;
+	}
 }
\ No newline at end of file

Spacing +112 added lines, -112 removed lines

@@ -107,13 +107,13 @@ 
 			if ($object->id != $line->id && $line->rang > $rang)
 			{
 				// Update du rang de toutes les lignes suivant mon titre
-				$parent->updateRangOfLine($line->id, $line->rang+1);
+				$parent->updateRangOfLine($line->id, $line->rang + 1);
 			}
 		}
 		
 		// Update du rang de la ligne fraichement ajouté pour la déplacer sous mon titre
-		$parent->updateRangOfLine($object->id, $rang+1);
-		$object->rang = $rang+1;
+		$parent->updateRangOfLine($object->id, $rang + 1);
+		$object->rang = $rang + 1;
 	}
 	
 	public function addToEnd(&$parent, &$object, $rang)
@@ -136,7 +136,7 @@ 
 			
 			if ($subtotal_line_found)
 			{
-				$parent->updateRangOfLine($line->id, $line->rang+1);
+				$parent->updateRangOfLine($line->id, $line->rang + 1);
 			}
 		}
 		
@@ -255,14 +255,14 @@ 
 		
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE')))
 		{
-            if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
+            if (!function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
 
 			$doli_action = GETPOST('action');
 			$set = GETPOST('set');
-			if ( (in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add', 'create')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet')))
+			if ((in_array($doli_action, array('updateligne', 'updateline', 'addline', 'add', 'create')) || $set == 'defaultTVA') && !TSubtotal::isTitle($object) && !TSubtotal::isSubtotal($object) && in_array($object->element, array('propaldet', 'commandedet', 'facturedet')))
 			{
 				 dol_syslog(
-					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id
+					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id
 				);
 				 
 				$TTitle = TSubtotal::getAllTitleFromLine($object);
@@ -282,9 +282,9 @@ 
 				}
 
 				// $object correspond à la ligne ajoutée
-				if(empty($object->array_options)) $object->fetch_optionals();
+				if (empty($object->array_options)) $object->fetch_optionals();
 
-				if(! empty($object->array_options['options_subtotal_nc'])) {
+				if (!empty($object->array_options['options_subtotal_nc'])) {
 					$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
 
@@ -296,11 +296,11 @@ 
 
 				// Correction d'un bug lors de la création d'une commande depuis une propale qui a, au moins, une ligne NC
 				$parent_element = '';
-				if($object->element == 'propaldet') $parent_element = 'propal';
-				if($object->element == 'commandedet') $parent_element = 'commande';
-				if($object->element == 'facturedet') $parent_element = 'facture';
+				if ($object->element == 'propaldet') $parent_element = 'propal';
+				if ($object->element == 'commandedet') $parent_element = 'commande';
+				if ($object->element == 'facturedet') $parent_element = 'facture';
 
-				if(! empty($parent_element) && ! empty($object->array_options['options_subtotal_nc'])) {
+				if (!empty($parent_element) && !empty($object->array_options['options_subtotal_nc'])) {
 					_updateLineNC($parent_element, $object->{'fk_'.$parent_element}, $object->id, $object->array_options['options_subtotal_nc'], 1);
 				}
 			}
@@ -308,12 +308,12 @@ 
 		
 		// Les lignes libres (y compris les sous-totaux) créées à partir d'une facture modèle n'ont pas la TVA de la ligne du modèle mais la TVA par défaut
 		if ($action == 'BILL_CREATE' && $object->fac_rec > 0) {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			$object->fetch_lines(); // Lignes pas rajoutées à $object->lines par les appels à addline();
 
-			foreach($object->lines as &$line) {
-				if(TSubtotal::isSubtotal($line) && ! empty($line->tva_tx)) {
+			foreach ($object->lines as &$line) {
+				if (TSubtotal::isSubtotal($line) && !empty($line->tva_tx)) {
 					$line->tva_tx = 0;
 					$line->update();
 				}
@@ -323,170 +323,170 @@ 
         
         if ($action == 'USER_LOGIN') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_UPDATE_SESSION') {
             // Warning: To increase performances, this action is triggered only if
             // constant MAIN_ACTIVATE_UPDATESESSIONTRIGGER is set to 1.
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_CREATE_FROM_CONTACT') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_NEW_PASSWORD') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_ENABLEDISABLE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_LOGOUT') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_SETINGROUP') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'USER_REMOVEFROMGROUP') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Groups
         elseif ($action == 'GROUP_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'GROUP_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'GROUP_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Companies
         elseif ($action == 'COMPANY_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'COMPANY_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'COMPANY_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Contacts
         elseif ($action == 'CONTACT_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTACT_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTACT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Products
         elseif ($action == 'PRODUCT_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PRODUCT_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PRODUCT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Customer orders
         elseif ($action == 'ORDER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_BUILDDOC') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_SENTBYMAIL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEORDER_INSERT') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEORDER_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Supplier orders
         elseif ($action == 'ORDER_SUPPLIER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_SUPPLIER_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SUPPLIER_ORDER_BUILDDOC') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Proposals
         elseif ($action == 'PROPAL_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif (in_array($action, array('PROPAL_CLONE', 'ORDER_CLONE', 'BILL_CLONE'))) {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
 			
 			$doli_action = GETPOST('action');
@@ -494,7 +494,7 @@ 
 			if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($doli_action, array('confirm_clone')))
 			{
 				dol_syslog(
-					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". object=".$object->element." id=" . $object->id
+					"[SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS] Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". object=".$object->element." id=".$object->id
 				);
 				
 				// En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine
@@ -522,272 +522,272 @@ 
 			
         } elseif ($action == 'PROPAL_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_BUILDDOC') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_SENTBYMAIL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_CLOSE_SIGNED') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_CLOSE_REFUSED') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROPAL_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEPROPAL_INSERT') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEPROPAL_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEPROPAL_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Contracts
         elseif ($action == 'CONTRACT_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTRACT_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTRACT_ACTIVATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTRACT_CANCEL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTRACT_CLOSE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CONTRACT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
 		elseif ($action == 'BILL_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'BILL_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'BILL_BUILDDOC') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'BILL_SENTBYMAIL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'BILL_CANCEL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'BILL_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEBILL_INSERT') {
 				
         	dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'LINEBILL_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Payments
         elseif ($action == 'PAYMENT_CUSTOMER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PAYMENT_SUPPLIER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PAYMENT_ADD_TO_BANK') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PAYMENT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Interventions
         elseif ($action == 'FICHEINTER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'FICHEINTER_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'FICHEINTER_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'FICHEINTER_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Members
         elseif ($action == 'MEMBER_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_SUBSCRIPTION') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_NEW_PASSWORD') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_RESILIATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'MEMBER_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Categories
         elseif ($action == 'CATEGORY_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CATEGORY_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'CATEGORY_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Projects
         elseif ($action == 'PROJECT_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROJECT_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'PROJECT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Project tasks
         elseif ($action == 'TASK_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'TASK_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'TASK_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Task time spent
         elseif ($action == 'TASK_TIMESPENT_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'TASK_TIMESPENT_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'TASK_TIMESPENT_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // Shipping
         elseif ($action == 'SHIPPING_CREATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SHIPPING_MODIFY') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SHIPPING_VALIDATE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SHIPPING_SENTBYMAIL') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SHIPPING_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'SHIPPING_BUILDDOC') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 
         // File
         elseif ($action == 'FILE_UPLOAD') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         } elseif ($action == 'FILE_DELETE') {
             dol_syslog(
-                "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
+                "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id
             );
         }
 

Braces +73 added lines, -32 removed lines

@@ -89,12 +89,14 @@ 
 
         if ($this->version == 'development') {
             return $langs->trans("Development");
-        } elseif ($this->version == 'experimental')
-
+        } elseif ($this->version == 'experimental') {
+        
                 return $langs->trans("Experimental");
-        elseif ($this->version == 'dolibarr') return DOL_VERSION;
-        elseif ($this->version) return $this->version;
-        else {
+        } elseif ($this->version == 'dolibarr') {
+        	return DOL_VERSION;
+        } elseif ($this->version) {
+        	return $this->version;
+        } else {
             return $langs->trans("Unknown");
         }
     }
@@ -122,14 +124,18 @@ 
 		$subtotal_line_found = false;
 		foreach ($parent->lines as $k => &$line)
 		{
-			if ($line->rang < $rang) continue;
-			elseif ($line->rang == $rang) // Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc
+			if ($line->rang < $rang) {
+				continue;
+			} elseif ($line->rang == $rang) {
+				// Je suis sur la ligne de titre où je souhaite ajouter ma nouvelle ligne en fin de bloc
 			{
 				$title_level = $line->qty;
 			}
-			elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) // Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total
+			} elseif (!$subtotal_line_found && $title_level > -1 && ($line->qty == 100 - $title_level)) {
+				// Le level de mon titre a été trouvé avant, donc maintenant je vais m'arrêter jusqu'à trouver un sous-total
 			{
 				$subtotal_line_found = true;
+			}
 				$rang = $line->rang;
 			}
 			
@@ -191,8 +197,11 @@ 
 						break;
 				}
 				
-				if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) $this->addToEnd($parent, $object, $rang);
-				else $this->addToBegin($parent, $object, $rang);
+				if (!empty($conf->global->SUBTOTAL_ADD_LINE_UNDER_TITLE_AT_END_BLOCK)) {
+					$this->addToEnd($parent, $object, $rang);
+				} else {
+					$this->addToBegin($parent, $object, $rang);
+				}
 				
 			}
 			
@@ -220,7 +229,9 @@ 
 						$commande->fetch($current_fk_commande);
 						
 						$label = $conf->global->SUBTOTAL_TEXT_FOR_TITLE_ORDETSTOINVOICE;
-						if (empty($label)) $label = 'Commande [__REFORDER__] - Référence client : [__REFCUSTOMER__]';
+						if (empty($label)) {
+							$label = 'Commande [__REFORDER__] - Référence client : [__REFCUSTOMER__]';
+						}
 						$label = str_replace(array('__REFORDER__', '__REFCUSTOMER__'), array($commande->ref, $commande->ref_client), $label);
 						
 						TSubtotal::addTitle($facture, $label, 1, $rang);
@@ -255,7 +266,9 @@ 
 		
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && in_array($action, array('LINEPROPAL_INSERT', 'LINEPROPAL_UPDATE', 'LINEORDER_INSERT', 'LINEORDER_UPDATE', 'LINEBILL_INSERT', 'LINEBILL_UPDATE')))
 		{
-            if(! function_exists('_updateLineNC')) dol_include_once('/subtotal/lib/subtotal.lib.php');
+            if(! function_exists('_updateLineNC')) {
+            	dol_include_once('/subtotal/lib/subtotal.lib.php');
+            }
 
 			$doli_action = GETPOST('action');
 			$set = GETPOST('set');
@@ -273,32 +286,50 @@ 
 						$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
 
-						if ($object->element == 'propal') $res = $object->update(1);
-						else $res = $object->update($user, 1);
+						if ($object->element == 'propal') {
+							$res = $object->update(1);
+						} else {
+							$res = $object->update($user, 1);
+						}
 						
-						if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+						if ($res > 0) {
+							setEventMessage($langs->trans('subtotal_update_nc_success'));
+						}
 						break;
 					}
 				}
 
 				// $object correspond à la ligne ajoutée
-				if(empty($object->array_options)) $object->fetch_optionals();
+				if(empty($object->array_options)) {
+					$object->fetch_optionals();
+				}
 
 				if(! empty($object->array_options['options_subtotal_nc'])) {
 					$object->total_ht = $object->total_tva = $object->total_ttc = $object->total_localtax1 = $object->total_localtax2 = 
 							$object->multicurrency_total_ht = $object->multicurrency_total_tva = $object->multicurrency_total_ttc = 0;
 
-					if ($object->element == 'propaldet') $res = $object->update(1);
-					else $res = $object->update($user, 1);
+					if ($object->element == 'propaldet') {
+						$res = $object->update(1);
+					} else {
+						$res = $object->update($user, 1);
+					}
 
-					if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+					if ($res > 0) {
+						setEventMessage($langs->trans('subtotal_update_nc_success'));
+					}
 				}
 
 				// Correction d'un bug lors de la création d'une commande depuis une propale qui a, au moins, une ligne NC
 				$parent_element = '';
-				if($object->element == 'propaldet') $parent_element = 'propal';
-				if($object->element == 'commandedet') $parent_element = 'commande';
-				if($object->element == 'facturedet') $parent_element = 'facture';
+				if($object->element == 'propaldet') {
+					$parent_element = 'propal';
+				}
+				if($object->element == 'commandedet') {
+					$parent_element = 'commande';
+				}
+				if($object->element == 'facturedet') {
+					$parent_element = 'facture';
+				}
 
 				if(! empty($parent_element) && ! empty($object->array_options['options_subtotal_nc'])) {
 					_updateLineNC($parent_element, $object->{'fk_'.$parent_element}, $object->id, $object->array_options['options_subtotal_nc'], 1);
@@ -498,26 +529,38 @@ 
 				);
 				
 				// En fonction de l'objet et de la version, les lignes conservent l'id de l'objet d'origine
-				if (method_exists($object, 'fetch_lines')) $object->fetch_lines();
-				else $object->fetch($object->id);
+				if (method_exists($object, 'fetch_lines')) {
+					$object->fetch_lines();
+				} else {
+					$object->fetch($object->id);
+				}
 			
 				foreach ($object->lines as &$line)
 				{
-					if (empty($line->array_options)) $line->fetch_optionals();
+					if (empty($line->array_options)) {
+						$line->fetch_optionals();
+					}
 					
 					if (!TSubtotal::isModSubtotalLine($line) && !empty($line->array_options['options_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;
 
-						if ($line->element == 'propaldet') $res = $line->update(1);
-						else $res = $line->update($user, 1);
+						if ($line->element == 'propaldet') {
+							$res = $line->update(1);
+						} else {
+							$res = $line->update($user, 1);
+						}
 						
-						if ($res > 0) setEventMessage($langs->trans('subtotal_update_nc_success'));
+						if ($res > 0) {
+							setEventMessage($langs->trans('subtotal_update_nc_success'));
+						}
 					}
 				}
 				
-				if (!empty($line)) $object->update_price(1);
+				if (!empty($line)) {
+					$object->update_price(1);
+				}
 			}
 			
         } elseif ($action == 'PROPAL_MODIFY') {
@@ -587,9 +630,7 @@ 
             dol_syslog(
                 "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
             );
-        }
-
-		elseif ($action == 'BILL_MODIFY') {
+        } elseif ($action == 'BILL_MODIFY') {
             dol_syslog(
                 "Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id
             );

class/subtotal.class.php

Indentation +51 added lines, -51 removed lines

@@ -41,9 +41,9 @@ 
 			 * @var $object Facture fournisseur
 			 */
 			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);
+				$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);
 			}
 			/**
 			 * @var $object Propal
@@ -62,8 +62,8 @@ 
 			 * @var $object Commande fournisseur
 			 */
 			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);
+				$object->special_code = TSubtotal::$module_number;
+				$res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
 			}
 			/**
 			 * @var $object Facturerec
@@ -369,10 +369,10 @@ 
 	
 	public static function isSubtotal(&$line, $level=-1)
 	{
-	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
-	    if($res && $level > -1) {
-	        return self::getNiveau($line) == $level;
-	    } else return $res;
+		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
+		if($res && $level > -1) {
+			return self::getNiveau($line) == $level;
+		} else return $res;
 	}
 	
 	public static function isFreeText(&$line)
@@ -409,16 +409,16 @@ 
 		$createRight = $user->rights->{$object->element}->creer;
 		if($object->element == 'facturerec' )
 		{
-		    $object->statut = 0; // hack for facture rec
-		    $createRight = $user->rights->facture->creer;
+			$object->statut = 0; // hack for facture rec
+			$createRight = $user->rights->facture->creer;
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		
 		if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
@@ -443,8 +443,8 @@ 
 							break;
 							
 						case 'supplier_proposal':
-						    $res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
-						    break;
+							$res = $object->addline($line->desc, $line->subprice, $line->qty, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->fk_product, $line->remise_percent, 'HT', 0, $line->info_bits, $line->product_type, -1, $line->special_code, 0, 0, $line->pa_ht, $line->label, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->origin, $line->origin_id);
+							break;
 							
 						case 'commande':
 							//$desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocaltax2=0, $fk_product=0, $remise_percent=0, $info_bits=0, $fk_remise_except=0, $price_base_type='HT', $pu_ttc=0, $date_start='', $date_end='', $type=0, $rang=-1, $special_code=0, $fk_parent_line=0, $fk_fournprice=null, $pa_ht=0, $label='',$array_options=0, $fk_unit=null, $origin='', $origin_id=0)
@@ -452,10 +452,10 @@ 
 							break;
 							
 						case 'order_supplier':
-						    $object->line = $line;
-						    $object->line->fk_commande = $object->id;
-						    $object->line->rang = $object->line_max() +1;
-						    $res = $object->line->insert(1);
+							$object->line = $line;
+							$object->line->fk_commande = $object->id;
+							$object->line->rang = $object->line_max() +1;
+							$res = $object->line->insert(1);
 							break;
 							
 						case 'facture':
@@ -508,8 +508,8 @@ 
 					$object->db->commit();
 					foreach ($TLineAdded as &$line)
 					{
-					    // ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
-					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
+						// ça peut paraitre non optimisé de déclancher la fonction sur toutes les lignes mais ceci est nécessaire pour réappliquer l'état exact de chaque ligne
+						_updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
 				}
@@ -583,33 +583,33 @@ 
 		
 		switch ($object->element) 
 		{
-		    case 'propal':
-		        $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, $date_start, $date_end, $array_options, $fk_unit, 0, $notrigger);
-		        break;
+			case 'propal':
+				$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, $date_start, $date_end, $array_options, $fk_unit, 0, $notrigger);
+				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);
-		        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);
+				break;
 		        
 			case 'commande':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $date_start, $date_end, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $fk_unit, 0, $notrigger);
 				break;
 				
 			case 'order_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 			
 			case 'facture':
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $special_code, $array_options, $situation_percent, $fk_unit, 0, $notrigger);
 				break;
 				
 			case 'invoice_supplier':
-			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
-			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
-			    break;
+				$object->special_code = SELF::$module_number;
+				if (empty($desc)) $desc = $label;
+				$res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
+				break;
 				
 			case 'facturerec':
 				// Add extrafields and get rang
@@ -1000,8 +1000,8 @@ 
 		{
 			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
 			{
@@ -1192,13 +1192,13 @@ 
 	 * @param	int		$hidebottom		Hide bottom
 	 * @return	void
 	 */
-    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);
-    }
+	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);
+	}
 	
 	
 	public static function concat(&$outputlangs, $files, $fileoutput='')
@@ -1208,14 +1208,14 @@ 
 		if (empty($fileoutput)) $fileoutput = $file[0];
 		
 		$pdf=pdf_getInstance();
-        if (class_exists('TCPDF'))
-        {
-            $pdf->setPrintHeader(false);
-            $pdf->setPrintFooter(false);
-        }
-        $pdf->SetFont(pdf_getPDFFont($outputlangs));
+		if (class_exists('TCPDF'))
+		{
+			$pdf->setPrintHeader(false);
+			$pdf->setPrintFooter(false);
+		}
+		$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)

Spacing +192 added lines, -192 removed lines

@@ -5,30 +5,30 @@ 
 	
 	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 = '';
 			
-			$TNotElements = array ('invoice_supplier', 'order_supplier');
-			if ((float) DOL_VERSION < 6  || $qty==50 && !in_array($object->element, $TNotElements) ) {
+			$TNotElements = array('invoice_supplier', 'order_supplier');
+			if ((float) DOL_VERSION < 6 || $qty == 50 && !in_array($object->element, $TNotElements)) {
 				$desc = $label;
 				$label = '';
 			}
@@ -36,39 +36,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); 
 			
 		}
 	
@@ -79,20 +79,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);
 			}
@@ -106,7 +106,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);
 			}
 		}
 	}
@@ -118,11 +118,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;
@@ -131,7 +131,7 @@ 
 		{
 			if ($line->rang < $rang_start) continue;
 			
-			$row->updateRangOfLine($line->id, $line->rang+$move_to);
+			$row->updateRangOfLine($line->id, $line->rang + $move_to);
 		}
 	}
 	
@@ -160,7 +160,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) 
@@ -172,14 +172,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);
 	}
 
 	/**
@@ -190,7 +190,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);
 		
@@ -211,7 +211,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;
 		
@@ -237,7 +237,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))
@@ -358,19 +358,19 @@ 
 		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;
 		
 	}
 	
-	public static function isSubtotal(&$line, $level=-1)
+	public static function isSubtotal(&$line, $level = -1)
 	{
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
-	    if($res && $level > -1) {
+	    if ($res && $level > -1) {
 	        return self::getNiveau($line) == $level;
 	    } else return $res;
 	}
@@ -385,43 +385,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');
 			
@@ -454,7 +454,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;
 							
@@ -494,7 +494,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();
@@ -524,7 +524,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;
 		
@@ -536,17 +536,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;
 					
@@ -562,7 +562,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;
 				}
 			}
@@ -571,12 +571,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, $notrigger = 0)
+	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, $notrigger = 0)
 	{
 		$res = 0;
 		$object->db->begin();
@@ -588,7 +588,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':
@@ -617,9 +617,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;
 		}
@@ -635,7 +635,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')
 			{
@@ -715,7 +715,7 @@ 
 	 */
 	public static function addRecapPage(&$parameters, &$origin_pdf)
 	{
-		global $user,$conf,$langs;
+		global $user, $conf, $langs;
 		
 		$origin_file = $parameters['file'];
 		$outputlangs = $parameters['outputlangs'];
@@ -731,21 +731,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'))
 		{
@@ -754,49 +754,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());
 		
@@ -810,14 +810,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;
@@ -836,67 +836,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)) {
@@ -909,14 +909,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)
@@ -933,7 +933,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);
 				}
 			}
@@ -943,19 +943,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);
 		
@@ -967,7 +967,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);
 	}
 	
 	/**
@@ -981,50 +981,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';
@@ -1033,14 +1033,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');
 		
 	}
@@ -1058,44 +1058,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
 		}
 		
 	}
@@ -1104,29 +1104,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'];
@@ -1134,10 +1134,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
 			{
@@ -1146,15 +1146,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);
@@ -1164,16 +1164,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));
@@ -1192,22 +1192,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);
@@ -1215,10 +1215,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++)
@@ -1230,8 +1230,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;
 	}
@@ -1244,7 +1244,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)

Braces +277 added lines, -135 removed lines

@@ -13,18 +13,23 @@ 
 			/**
 			 * @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 {
+		} else {
 			$desc = '';
 			
 			$TNotElements = array ('invoice_supplier', 'order_supplier');
@@ -36,7 +41,9 @@ 
 			/**
 			 * @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
 			 */
@@ -48,16 +55,22 @@ 
 			/**
 			 * @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
 			 */
@@ -68,7 +81,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);
+			}
 			
 		}
 	
@@ -90,8 +105,9 @@ 
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = GETPOST('lang_id', 'alpha');
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
-				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
+							$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
+			}
 			if (! empty($newlang)) {
 				$outputlangs = new Translate("", $conf);
 				$outputlangs->setDefaultLang($newlang);
@@ -100,13 +116,18 @@ 
 			$ret = $object->fetch($object->id); // Reload to get new records
 			if ((float) DOL_VERSION <= 3.6)
 			{
-				if ($object->element == 'propal') propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'commande') commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-				elseif ($object->element == 'facture') facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
-			}
-			else
+				if ($object->element == 'propal') {
+					propale_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'commande') {
+					commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				} elseif ($object->element == 'facture') {
+					facture_pdf_create($db, $object, $object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				}
+			} 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);
+				}
 			}
 		}
 	}
@@ -120,7 +141,9 @@ 
 	 */
 	public static function updateRang(&$object, $rang_start, $move_to=1)
 	{
-		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		if (!class_exists('GenericObject')) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
+		}
 		
 		$row=new GenericObject($object->db);
 		$row->table_element_line = $object->table_element_line;
@@ -129,7 +152,9 @@ 
 		
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang < $rang_start) continue;
+			if ($line->rang < $rang_start) {
+				continue;
+			}
 			
 			$row->updateRangOfLine($line->id, $line->rang+$move_to);
 		}
@@ -152,21 +177,28 @@ 
 		foreach ($TTitle_reverse as $k => $title_line)
 		{
 			$title_niveau = self::getNiveau($title_line);
-			if ($title_niveau < $level_new_title) break;
+			if ($title_niveau < $level_new_title) {
+				break;
+			}
 			
 			$rang_to_add = self::titleHasTotalLine($object, $title_line, true, true);
 			
 			if (is_numeric($rang_to_add)) 
 			{
-				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
+				if ($rang_to_add != -1) {
+					self::updateRang($object, $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) 
 				{
-					if (method_exists($object, 'fetch_lines')) $object->fetch_lines();
-					else $object->fetch($object->id);
+					if (method_exists($object, 'fetch_lines')) {
+						$object->fetch_lines();
+					} else {
+						$object->fetch($object->id);
+					}
 				}
 			}
 		}
@@ -196,7 +228,9 @@ 
 		
 		foreach ($TTitle as $k => $title_line)
 		{
-			if (self::titleHasTotalLine($object, $title_line)) unset($TTitle[$k]);
+			if (self::titleHasTotalLine($object, $title_line)) {
+				unset($TTitle[$k]);
+			}
 		}
 		
 		return $TTitle;
@@ -213,23 +247,41 @@ 
 	 */
 	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;
+		if (empty($object->lines) || !is_array($object->lines)) {
+			return false;
+		}
 		
 		$title_niveau = self::getNiveau($title_line);
 		foreach ($object->lines as &$line)
 		{
-			if ($line->rang <= $title_line->rang) continue;
-			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) return false; // Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
-			if (!self::isSubtotal($line)) continue;
+			if ($line->rang <= $title_line->rang) {
+				continue;
+			}
+			if (self::isTitle($line) && self::getNiveau($line) <= $title_niveau) {
+				return false;
+			}
+			// Oups on croise un titre d'un niveau inférieur ou égale (exemple : je croise un titre niveau 2 alors que je suis sur un titre de niveau 3) pas lieu de continuer car un nouveau bloc commence
+			if (!self::isSubtotal($line)) {
+				continue;
+			}
 			
 			$subtotal_niveau = self::getNiveau($line);
 			
 			// Comparaison du niveau de la ligne de sous-total avec celui du titre
-			if ($subtotal_niveau == $title_niveau) return true; // niveau égale => Ok mon titre a un sous-total
-			elseif ($subtotal_niveau < $title_niveau) // niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
+			if ($subtotal_niveau == $title_niveau) {
+				return true;
+			}
+			// niveau égale => Ok mon titre a un sous-total
+			elseif ($subtotal_niveau < $title_niveau) {
+				// niveau inférieur trouvé (exemple : sous-total de niveau 1 contre mon titre de niveau 3)
 			{
-				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false; // mode strict niveau pas égale donc faux
-				else return true; // mode libre => OK je considère que mon titre à un sous-total
+				if ($strict_mode) return ($return_rang_on_false) ? $line->rang : false;
+			}
+			// mode strict niveau pas égale donc faux
+				else {
+					return true;
+				}
+				// mode libre => OK je considère que mon titre à un sous-total
 			}
 		}
 		
@@ -277,16 +329,19 @@ 
 		
 		foreach ($object->lines as &$l)
 		{
-			if ($l->rang <= $line->rang) continue;
-			elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
-			elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) break;
+			if ($l->rang <= $line->rang) {
+				continue;
+			} elseif (self::isSubtotal($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			} elseif ($breakOnTitle && self::isTitle($l) && self::getNiveau($l) <= self::getNiveau($line)) {
+				break;
+			}
 			
 			if (!empty($l->array_options['options_subtotal_nc']))
 			{
 				$tabprice = calcul_price_total($l->qty, $l->subprice, $l->remise_percent, $l->tva_tx, $l->localtax1_tx, $l->localtax2_tx, 0, 'HT', $l->info_bits, $l->product_type);
 				$TTot['total_options'] += $tabprice[0]; // total ht
-			}
-			else
+			} else
 			{
 				$TTot['total_pa_ht'] += $l->pa_ht * $l->qty;
 				$TTot['total_subprice'] += $l->subprice * $l->qty;
@@ -306,29 +361,41 @@ 
 
 	public static function getOrderIdFromLineId(&$db, $fk_commandedet)
 	{
-		if (empty($fk_commandedet)) return false;
+		if (empty($fk_commandedet)) {
+			return false;
+		}
 		
 		$sql = 'SELECT fk_commande FROM '.MAIN_DB_PREFIX.'commandedet WHERE rowid = '.$fk_commandedet;
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->fk_commande;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->fk_commande;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getLastLineOrderId(&$db, $fk_commande)
 	{
-		if (empty($fk_commande)) return false;
+		if (empty($fk_commande)) {
+			return false;
+		}
 		
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'commandedet WHERE fk_commande = '.$fk_commande.' ORDER BY rang DESC LIMIT 1';
 		$resql = $db->query($sql);
 		
-		if ($resql && ($row = $db->fetch_object($resql))) return $row->rowid;
-		else return false;
+		if ($resql && ($row = $db->fetch_object($resql))) {
+			return $row->rowid;
+		} else {
+			return false;
+		}
 	}
 	
 	public static function getParentTitleOfLine(&$object, $i)
 	{
-		if ($i <= 0) return false;
+		if ($i <= 0) {
+			return false;
+		}
 		
 		$skip_title = 0;
 		// Je parcours les lignes précédentes
@@ -347,8 +414,7 @@ 
 				//@INFO J'ai ma ligne titre qui contient ma ligne, par contre je check pas s'il y a un sous-total
 				return $line;
 				break;
-			}
-			elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
+			} elseif ($line->product_type == 9 && $line->qty >= 90 && $line->qty <= 99)
 			{
 				// Il s'agit d'un sous-total, ça veut dire que le prochain titre théoriquement doit être ignorer (je travail avec un incrément au cas ou je croise plusieurs sous-totaux)
 				$skip_title++;
@@ -363,7 +429,9 @@ 
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
 		if($res && $level > -1) {
 			return $line->qty == $level;
-		} else return $res;
+		} else {
+			return $res;
+		}
 		
 	}
 	
@@ -372,7 +440,9 @@ 
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
 	    if($res && $level > -1) {
 	        return self::getNiveau($line) == $level;
-	    } else return $res;
+	    } else {
+	    	return $res;
+	    }
 	}
 	
 	public static function isFreeText(&$line)
@@ -393,10 +463,14 @@ 
 		// 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;
+		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';
+		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);
@@ -411,12 +485,10 @@ 
 		{
 		    $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;
 		}
@@ -489,8 +561,9 @@ 
 
 					$TLineAdded[] = $object->line;
 					// Error from addline
-					if ($res <= 0) break;
-					else
+					if ($res <= 0) {
+						break;
+					} else
 					{
 						$object->line_from = $line;
 						// Call trigger
@@ -512,8 +585,7 @@ 
 					    _updateLineNC($object->element, $object->id, $line->id, $line->array_options['options_subtotal_nc']);
 					}
 					return count($TLineAdded);
-				}
-				else
+				} else
 				{
 					$object->db->rollback();
 					return -1;
@@ -529,10 +601,14 @@ 
 		global $langs;
 		
 		// Besoin de comparer sur les 2 formes d'écriture
-		if (!$key_is_id) $TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		if (!$key_is_id) {
+			$TTitle_search = array($langs->trans($key_trad), $langs->transnoentitiesnoconv($key_trad));
+		}
 		
 		$TTitle_under_search = array();
-		if (!empty($under_title)) $TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		if (!empty($under_title)) {
+			$TTitle_under_search = array($langs->trans($under_title), $langs->transnoentitiesnoconv($under_title));
+		}
 		
 		$TLine = array();
 		$add_line = false;
@@ -542,28 +618,37 @@ 
 		{
 			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;
-			}
-			else
+				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) $level = $line->qty;
+					if ($key_is_id) {
+						$level = $line->qty;
+					}
 					
 					$add_line = true;
-					if ($withBlockLine) $TLine[] = $line;
+					if ($withBlockLine) {
+						$TLine[] = $line;
+					}
 					continue;
-				}
-				elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $level) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
+				} elseif ($add_line && TSubtotal::isModSubtotalLine($line) && TSubtotal::getNiveau($line) == $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;
 				}
 				
 				if ($add_line)
 				{
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
-					else $TLine[] = $line;
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) {
+						continue;
+					} else {
+						$TLine[] = $line;
+					}
 				}
 			}
 		}
@@ -597,7 +682,9 @@ 
 				
 			case 'order_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $price_base_type, $info_bits, $type, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 			
@@ -607,7 +694,9 @@ 
 				
 			case 'invoice_supplier':
 			    $object->special_code = SELF::$module_number;
-			    if (empty($desc)) $desc = $label;
+			    if (empty($desc)) {
+			    	$desc = $label;
+			    }
 			    $res = $object->updateline($rowid, $desc, $pu, $txtva, $txlocaltax1, $txlocaltax2, $qty, 0, $price_base_type, $info_bits, $type, $remise_percent, 0, $date_start, $date_end, $array_options, $fk_unit);
 			    break;
 				
@@ -624,8 +713,11 @@ 
 				break;
 		}
 		
-		if ($res <= 0) $object->db->rollback();
-		else $object->db->commit();
+		if ($res <= 0) {
+			$object->db->rollback();
+		} else {
+			$object->db->commit();
+		}
 		
 		return $res;
 	}
@@ -635,24 +727,20 @@ 
 		global $db, $object;
 		
 		$TTitle = array();
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
-		else {
+		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {} else {
 			if ($origin_line->element == 'propaldet')
 			{
 				$object = new Propal($db);
 				$object->fetch($origin_line->fk_propal);
-			}
-			else if ($origin_line->element == 'commandedet')
+			} else if ($origin_line->element == 'commandedet')
 			{
 				$object = new Commande($db);
 				$object->fetch($origin_line->fk_commande);
-			}
-			else if ($origin_line->element == 'facturedet')
+			} else if ($origin_line->element == 'facturedet')
 			{
 				$object = new Facture($db);
 				$object->fetch($origin_line->fk_facture);
-			}
-			else
+			} else
 			{
 				return $TTitle;
 			}
@@ -662,8 +750,11 @@ 
 		$i = 0;
 		foreach ($object->lines as &$line)
 		{
-			if ($origin_line->id == $line->id) break;
-			else $i++;
+			if ($origin_line->id == $line->id) {
+				break;
+			} else {
+				$i++;
+			}
 		}
 		
 		$i--; // Skip la ligne d'origine
@@ -678,35 +769,43 @@ 
 				if (self::isSubtotal($object->lines[$y]))
 				{
 					$next_title_lvl_to_skip = self::getNiveau($object->lines[$y]);
-				}
-				elseif (self::isTitle($object->lines[$y]))
+				} elseif (self::isTitle($object->lines[$y]))
 				{
 					if ($object->lines[$y]->qty == $next_title_lvl_to_skip)
 					{
 						$next_title_lvl_to_skip = 0;
 						continue;
-					}
-					else
+					} else
 					{
-						if (empty($object->lines[$y]->array_options)) $object->lines[$y]->fetch_optionals();
+						if (empty($object->lines[$y]->array_options)) {
+							$object->lines[$y]->fetch_optionals();
+						}
 						$TTitle[$object->lines[$y]->id] = $object->lines[$y];
 						
-						if ($object->lines[$y]->qty == 1) break;
+						if ($object->lines[$y]->qty == 1) {
+							break;
+						}
 					}
 				}
 			}
 		}
 		
-		if ($reverse) $TTitle = array_reverse($TTitle, true);
+		if ($reverse) {
+			$TTitle = array_reverse($TTitle, true);
+		}
 		
 		return $TTitle;
 	}
 	
 	public static function getNiveau(&$line)
 	{
-		if (self::isTitle($line)) return $line->qty;
-		elseif (self::isSubtotal($line)) return 100 - $line->qty;
-		else return 0;
+		if (self::isTitle($line)) {
+			return $line->qty;
+		} elseif (self::isSubtotal($line)) {
+			return 100 - $line->qty;
+		} else {
+			return 0;
+		}
 	}
 	
 	/**
@@ -731,10 +830,16 @@ 
 		$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;
-		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
+		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');
@@ -769,7 +874,9 @@ 
 		$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
 
@@ -779,7 +886,9 @@ 
 			
 		// New page
 		$pdf->AddPage();
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
+		if (! empty($tplidx)) {
+			$pdf->useTemplate($tplidx);
+		}
 		$pagenb++;
 		
 		
@@ -835,8 +944,10 @@ 
 					{
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
 					}	
+				} else {
+					$pdf->SetFont('','', $default_font_size - 1);
 				}
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
+				// Into loop to work with multipage
 				
 				$pdf->SetTextColor(0,0,0);
 				
@@ -858,9 +969,11 @@ 
 				$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();
-				if ($pageposafter > $pageposbefore)	// There is a pagebreak
+				if ($pageposafter > $pageposbefore) {
+					// There is a pagebreak
 				{
 					$pdf->rollbackTransaction(true);
+				}
 					$pageposafter=$pageposbefore;
 					//print $pageposafter.'-'.$pageposbefore;exit;
 					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
@@ -869,23 +982,27 @@ 
 					$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
 						{
 							$pdf->AddPage('','',true);
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
-							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
+							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);
 						}
-					}
-					else
+					} else
 					{
 						// We found a page break
 						$showpricebeforepagebreak=0;
 					}
-				}
-				else	// No pagebreak
+				} else	// No pagebreak
 				{
 					$pdf->commitTransaction();
 				}
@@ -925,8 +1042,7 @@ 
 					if ($pagenb == 1)
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1, $object->multicurrency_code);
-					}
-					else
+					} else
 					{
 						self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
 					}
@@ -934,7 +1050,9 @@ 
 					$pagenb++;
 					$pdf->setPage($pagenb);
 					$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);
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
+					}
 				}
 			}
 		}
@@ -944,8 +1062,7 @@ 
 		{
 			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;
-		}
-		else
+		} 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;
@@ -959,7 +1076,9 @@ 
 		
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
 		
-		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) unlink($file);
+		if (empty($conf->global->SUBTOTAL_KEEP_RECAP_FILE)) {
+			unlink($file);
+		}
 	}
 	
 	private static function printLevel($objmarge, $pdf, $line, $curY, $posx_designation)
@@ -1002,8 +1121,7 @@ 
 			{
 			    $height=pdf_getHeightForLogo($logo);
 			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
-			}
-			else
+			} else
 			{
 				$pdf->SetTextColor(200,0,0);
 				$pdf->SetFont('','B',$default_font_size - 2);
@@ -1012,8 +1130,7 @@ 
 			}
 			
 			$posy+=35;
-		}
-		else
+		} else
 		{
 			$text=$mysoc->name;
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
@@ -1027,9 +1144,13 @@ 
 		$pdf->SetXY($objmarge->marge_gauche,$posy);
 		
 		$key = 'subtotalPropalTitle';
-		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
-		elseif ($object->element == 'facture') $key = 'subtotalInvoiceTitle';
-		elseif ($object->element == 'facturerec') $key = 'subtotalInvoiceTitle';
+		if ($object->element == 'commande') {
+			$key = 'subtotalCommandeTitle';
+		} elseif ($object->element == 'facture') {
+			$key = 'subtotalInvoiceTitle';
+		} elseif ($object->element == 'facturerec') {
+			$key = 'subtotalInvoiceTitle';
+		}
 		
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
 		
@@ -1064,7 +1185,9 @@ 
 		
 		// Force to disable hidetop and hidebottom
 		$hidebottom=0;
-		if ($hidetop) $hidetop=-1;
+		if ($hidetop) {
+			$hidetop=-1;
+		}
 
 		$currency = !empty($currency) ? $currency : $conf->currency;
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1079,7 +1202,9 @@ 
 			$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
@@ -1092,8 +1217,7 @@ 
 			$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
-		}
-		else
+		} 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
 		}
@@ -1114,10 +1238,12 @@ 
 
 		// Tableau total
 		$col1x = 120; $col2x = 170;
-		if ($objmarge->page_largeur < 210) // To work with US executive format
+		if ($objmarge->page_largeur < 210) {
+			// To work with US executive format
 		{
 			$col2x-=20;
 		}
+		}
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
 
 		$useborder=0;
@@ -1139,9 +1265,11 @@ 
 		$atleastoneratenotnull=0;
 		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
 		{
-			if ($tvakey != 0)    // On affiche pas taux 0
+			if ($tvakey != 0) {
+				// On affiche pas taux 0
 			{
 				$atleastoneratenotnull++;
+			}
 
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
@@ -1194,9 +1322,13 @@ 
 	 */
     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);
+	    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);
+	    if (empty($hidebottom)) {
+	    	$pdf->line($x+$l, $y+$h, $x, $y+$h);
+	    }
 	    $pdf->line($x, $y+$h, $x, $y);
     }
 	
@@ -1205,7 +1337,9 @@ 
 	{
 		global $conf;
 		
-		if (empty($fileoutput)) $fileoutput = $file[0];
+		if (empty($fileoutput)) {
+			$fileoutput = $file[0];
+		}
 		
 		$pdf=pdf_getInstance();
         if (class_exists('TCPDF'))
@@ -1215,7 +1349,9 @@ 
         }
         $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)
@@ -1231,7 +1367,9 @@ 
 		}
 		
 		$pdf->Output($fileoutput,'F');
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
+		if (! empty($conf->global->MAIN_UMASK)) {
+			@chmod($file, octdec($conf->global->MAIN_UMASK));
+		}
 
 		return $pagecount;
 	}
@@ -1244,7 +1382,9 @@ 
 	 */
 	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)
@@ -1269,7 +1409,9 @@ 
 	public static function getTitleLabel($line)
 	{
 		$title = $line->label;
-		if (empty($title)) $title = !empty($line->description) ? $line->description : $line->desc;
+		if (empty($title)) {
+			$title = !empty($line->description) ? $line->description : $line->desc;
+		}
 		return $title;
 	}
 }

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.1.10';
         // 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;
@@ -125,7 +125,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
@@ -190,20 +190,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:
@@ -478,7 +478,7 @@ 
 	
         $extra = new ExtraFields($db); // propaldet, commandedet, facturedet
         $TElementType = array('propaldet', 'commandedet', 'facturedet', 'supplier_proposaldet', 'commande_fournisseurdet', 'facture_fourn_det');
-        foreach($TElementType as $element_type) {
+        foreach ($TElementType as $element_type) {
             $extra->addExtraField('show_total_ht', 'Afficher le Total HT sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
             $extra->addExtraField('show_reduc', 'Afficher la réduction sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
         }

Indentation +401 added lines, -401 removed lines

@@ -31,185 +31,185 @@ 
 class modSubtotal extends DolibarrModules
 {
 
-    /**
-     * 	Constructor. Define names, constants, directories, boxes, permissions
-     *
-     * 	@param	DoliDB		$db	Database handler
-     */
+	/**
+	 * 	Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * 	@param	DoliDB		$db	Database handler
+	 */
      
-    public function __construct($db)
-    {
-        global $langs, $conf;
+	public function __construct($db)
+	{
+		global $langs, $conf;
 
-        $this->db = $db;
+		$this->db = $db;
 
 		$this->editor_name = 'ATM-Consulting';
-        // Id for module (must be unique).
-        // Use a free id here
-        // (See in Home -> System information -> Dolibarr for list of used modules id).
-        $this->numero = 104777; // 104000 to 104999 for ATM CONSULTING
-        // Key text used to identify module (for permissions, menus, etc...)
-        $this->rights_class = 'subtotal';
+		// Id for module (must be unique).
+		// Use a free id here
+		// (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 104777; // 104000 to 104999 for ATM CONSULTING
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'subtotal';
 
-        // Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
-        // It is used to group modules in module setup page
-        $this->family = "technic";
-        // Module label (no space allowed)
-        // used if translation string 'ModuleXXXName' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->name = preg_replace('/^mod/i', '', get_class($this));
-        // Module description
-        // used if translation string 'ModuleXXXDesc' not found
-        // (where XXX is value of numeric property 'numero' of module)
-        $this->description = "Module permettant l'ajout de sous-totaux et sous-totaux intermédiaires et le déplacement d'une ligne aisée de l'un dans l'autre";
-        // Possible values for version are: 'development', 'experimental' or version
-        $this->version = '3.1.10';
-        // 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);
-        // Where to store the module in setup page
-        // (0=common,1=interface,2=others,3=very specific)
-        $this->special = 2;
-        // Name of image file used for this module.
-        // If file is in theme/yourtheme/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue'
-        // If file is in module/img directory under name object_pictovalue.png
-        // use this->picto='pictovalue@module'
-        $this->picto = 'subtotal@subtotal'; // mypicto@titre
-        // Defined all module parts (triggers, login, substitutions, menus, css, etc...)
-        // for default path (eg: /titre/core/xxxxx) (0=disable, 1=enable)
-        // for specific path of parts (eg: /titre/core/modules/barcode)
-        // for specific css file (eg: /titre/css/titre.css.php)
-        $this->module_parts = array(
-            // Set this to 1 if module has its own trigger directory
-            'triggers' => 1,
-            // Set this to 1 if module has its own login method directory
-            //'login' => 0,
-            // Set this to 1 if module has its own substitution function file
-            //'substitutions' => 0,
-            // Set this to 1 if module has its own menus handler directory
-            //'menus' => 0,
-            // Set this to 1 if module has its own barcode directory
-            //'barcode' => 0,
-            // Set this to 1 if module has its own models directory
-            'models' => 1,
-            // 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'
-                ,'consumptionthirdparty'
-            	,'ordershipmentcard'
-            	,'expeditioncard'
+		// Family can be 'crm','financial','hr','projects','products','ecm','technic','other'
+		// It is used to group modules in module setup page
+		$this->family = "technic";
+		// Module label (no space allowed)
+		// used if translation string 'ModuleXXXName' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description
+		// used if translation string 'ModuleXXXDesc' not found
+		// (where XXX is value of numeric property 'numero' of module)
+		$this->description = "Module permettant l'ajout de sous-totaux et sous-totaux intermédiaires et le déplacement d'une ligne aisée de l'un dans l'autre";
+		// Possible values for version are: 'development', 'experimental' or version
+		$this->version = '3.1.10';
+		// 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);
+		// Where to store the module in setup page
+		// (0=common,1=interface,2=others,3=very specific)
+		$this->special = 2;
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png
+		// use this->picto='pictovalue@module'
+		$this->picto = 'subtotal@subtotal'; // mypicto@titre
+		// Defined all module parts (triggers, login, substitutions, menus, css, etc...)
+		// for default path (eg: /titre/core/xxxxx) (0=disable, 1=enable)
+		// for specific path of parts (eg: /titre/core/modules/barcode)
+		// for specific css file (eg: /titre/css/titre.css.php)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method directory
+			//'login' => 0,
+			// Set this to 1 if module has its own substitution function file
+			//'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory
+			//'menus' => 0,
+			// Set this to 1 if module has its own barcode directory
+			//'barcode' => 0,
+			// Set this to 1 if module has its own models directory
+			'models' => 1,
+			// 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'
+				,'consumptionthirdparty'
+				,'ordershipmentcard'
+				,'expeditioncard'
 				,'deliverycard'
-            )
-            // Set here all workflow context managed by module
-            //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
-        );
+			)
+			// Set here all workflow context managed by module
+			//'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
+		);
 
-        // Data directories to create when module is enabled.
-        // Example: this->dirs = array("/titre/temp");
-        $this->dirs = array();
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/titre/temp");
+		$this->dirs = array();
 
-        // Config pages. Put here list of php pages
-        // stored into titre/admin directory, used to setup module.
-        $this->config_page_url = array("subtotal_setup.php@subtotal");
+		// Config pages. Put here list of php pages
+		// stored into titre/admin directory, used to setup module.
+		$this->config_page_url = array("subtotal_setup.php@subtotal");
 
-        // Dependencies
-        // List of modules id that must be enabled if this module is enabled
-        $this->depends = array();
+		// Dependencies
+		// List of modules id that must be enabled if this module is enabled
+		$this->depends = array();
 
 		$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
-        $this->phpmin = array(5, 3);
-        // Minimum version of Dolibarr required by module
-        $this->need_dolibarr_version = array(3, 2);
-        $this->langfiles = array("subtotal@subtotal"); // langfiles@titre
-        // Constants
-        // List of particular constants to add when module is enabled
-        // (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
-        // Example:
-        $this->const = array(
-            	0=>array(
-            		'SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES',
-            		'chaine',
-            		'I',
-            		'Définit le style (B : gras, I : Italique, U : Souligné) des sous titres lorsque le détail des lignes et des ensembles est caché',
-            		1
-            	)
+		// List of modules id to disable if this one is disabled
+		$this->requiredby = array();
+		// Minimum version of PHP required by module
+		$this->phpmin = array(5, 3);
+		// Minimum version of Dolibarr required by module
+		$this->need_dolibarr_version = array(3, 2);
+		$this->langfiles = array("subtotal@subtotal"); // langfiles@titre
+		// Constants
+		// List of particular constants to add when module is enabled
+		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example:
+		$this->const = array(
+				0=>array(
+					'SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES',
+					'chaine',
+					'I',
+					'Définit le style (B : gras, I : Italique, U : Souligné) des sous titres lorsque le détail des lignes et des ensembles est caché',
+					1
+				)
 				,1=>array('SUBTOTAL_ALLOW_ADD_BLOCK', 'chaine', '1', 'Permet l\'ajout de titres et sous-totaux')
 				,2=>array('SUBTOTAL_ALLOW_EDIT_BLOCK', 'chaine', '1', 'Permet de modifier titres et sous-totaux')
 				,3=>array('SUBTOTAL_ALLOW_REMOVE_BLOCK', 'chaine', '1', 'Permet de supprimer les titres et sous-totaux')
 				,4=>array('SUBTOTAL_TITLE_STYLE', 'chaine', 'BU')
 				,5=>array('SUBTOTAL_SUBTOTAL_STYLE', 'chaine', 'B')
-            //	1=>array(
-            //		'MYMODULE_MYNEWCONST2',
-            //		'chaine',
-            //		'myvalue',
-            //		'This is another constant to add',
-            //		0
-            //	)
-        );
+			//	1=>array(
+			//		'MYMODULE_MYNEWCONST2',
+			//		'chaine',
+			//		'myvalue',
+			//		'This is another constant to add',
+			//		0
+			//	)
+		);
 		
 
 
 
-        // Array to add new pages in new tabs
-        // Example:
-        $this->tabs = array(
-            //	// To add a new tab identified by code tabname1
-            //	'objecttype:+tabname1:Title1:langfile@titre:$user->rights->titre->read:/titre/mynewtab1.php?id=__ID__',
-            //	// To add another new tab identified by code tabname2
-            //	'objecttype:+tabname2:Title2:langfile@titre:$user->rights->othermodule->read:/titre/mynewtab2.php?id=__ID__',
-            //	// To remove an existing tab identified by code tabname
-            //	'objecttype:-tabname'
-        );
-        // where objecttype can be
-        // 'thirdparty'			to add a tab in third party view
-        // 'intervention'		to add a tab in intervention view
-        // 'order_supplier'		to add a tab in supplier order view
-        // 'invoice_supplier'	to add a tab in supplier invoice view
-        // 'invoice'			to add a tab in customer invoice view
-        // 'order'				to add a tab in customer order view
-        // 'product'			to add a tab in product view
-        // 'stock'				to add a tab in stock view
-        // 'propal'				to add a tab in propal view
-        // 'member'				to add a tab in fundation member view
-        // 'contract'			to add a tab in contract view
-        // 'user'				to add a tab in user view
-        // 'group'				to add a tab in group view
-        // 'contact'			to add a tab in contact view
-        // '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();
-            $conf->subtotal->enabled = 0;
-        }
-        $this->dictionaries = array(
+		// Array to add new pages in new tabs
+		// Example:
+		$this->tabs = array(
+			//	// To add a new tab identified by code tabname1
+			//	'objecttype:+tabname1:Title1:langfile@titre:$user->rights->titre->read:/titre/mynewtab1.php?id=__ID__',
+			//	// To add another new tab identified by code tabname2
+			//	'objecttype:+tabname2:Title2:langfile@titre:$user->rights->othermodule->read:/titre/mynewtab2.php?id=__ID__',
+			//	// To remove an existing tab identified by code tabname
+			//	'objecttype:-tabname'
+		);
+		// where objecttype can be
+		// 'thirdparty'			to add a tab in third party view
+		// 'intervention'		to add a tab in intervention view
+		// 'order_supplier'		to add a tab in supplier order view
+		// 'invoice_supplier'	to add a tab in supplier invoice view
+		// 'invoice'			to add a tab in customer invoice view
+		// 'order'				to add a tab in customer order view
+		// 'product'			to add a tab in product view
+		// 'stock'				to add a tab in stock view
+		// 'propal'				to add a tab in propal view
+		// 'member'				to add a tab in fundation member view
+		// 'contract'			to add a tab in contract view
+		// 'user'				to add a tab in user view
+		// 'group'				to add a tab in group view
+		// 'contact'			to add a tab in contact view
+		// '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();
+			$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')
-            'tabcond'=>array($conf->subtotal->enabled)	
+			'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:
+		/* Example:
           // This is to avoid warnings
           if (! isset($conf->titre->enabled)) $conf->titre->enabled=0;
           $this->dictionnaries=array(
@@ -250,223 +250,223 @@ 
           );
          */
 
-        // Boxes
-        // Add here list of php file(s) stored in core/boxes that contains class to show a box.
-        $this->boxes = array(); // Boxes list
+		// Boxes
+		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
+		$this->boxes = array(); // Boxes list
        
-        /*
+		/*
           $this->boxes[$r][1] = "myboxb.php";
           $r++;
          */
 
-        // Permissions
-        $this->rights = array(); // Permission array used by this module
-        $r = 0;
+		// Permissions
+		$this->rights = array(); // Permission array used by this module
+		$r = 0;
 
-        // Add here list of permission defined by
-        // an id, a label, a boolean and two constant strings.
-        // Example:
-        //// Permission id (must not be already used)
-        //$this->rights[$r][0] = 2000;
-        //// Permission label
-        //$this->rights[$r][1] = 'Permision label';
-        //// Permission by default for new user (0/1)
-        //$this->rights[$r][3] = 1;
-        //// In php code, permission will be checked by test
-        //// if ($user->rights->permkey->level1->level2)
-        //$this->rights[$r][4] = 'level1';
-        //// In php code, permission will be checked by test
-        //// if ($user->rights->permkey->level1->level2)
-        //$this->rights[$r][5] = 'level2';
-        //$r++;
-        // Main menu entries
-        $this->menus = array(); // List of menus to add
-        $r = 0;
+		// Add here list of permission defined by
+		// an id, a label, a boolean and two constant strings.
+		// Example:
+		//// Permission id (must not be already used)
+		//$this->rights[$r][0] = 2000;
+		//// Permission label
+		//$this->rights[$r][1] = 'Permision label';
+		//// Permission by default for new user (0/1)
+		//$this->rights[$r][3] = 1;
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][4] = 'level1';
+		//// In php code, permission will be checked by test
+		//// if ($user->rights->permkey->level1->level2)
+		//$this->rights[$r][5] = 'level2';
+		//$r++;
+		// Main menu entries
+		$this->menus = array(); // List of menus to add
+		$r = 0;
 
-        // Add here entries to declare new menus
-        //
-        // Example to declare a new Top Menu entry and its Left menu entry:
-        //$this->menu[$r]=array(
-        //	// Put 0 if this is a top menu
-        //	'fk_menu'=>0,
-        //	// This is a Top menu entry
-        //	'type'=>'top',
-        //	'titre'=>'titre top menu',
-        //	'mainmenu'=>'titre',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagetop.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        //$this->menu[$r]=array(
-        //	// Use r=value where r is index key used for the parent menu entry
-        //	// (higher parent must be a top menu entry)
-        //	'fk_menu'=>'r=0',
-        //	// This is a Left menu entry
-        //	'type'=>'left',
-        //	'titre'=>'titre left menu',
-        //	'mainmenu'=>'titre',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagelevel1.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        //
-        // Example to declare a Left Menu entry into an existing Top menu entry:
-        //$this->menu[$r]=array(
-        //	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
-        //	'fk_menu'=>'fk_mainmenu=mainmenucode',
-        //	// This is a Left menu entry
-        //	'type'=>'left',
-        //	'titre'=>'titre left menu',
-        //	'mainmenu'=>'mainmenucode',
-        //	'leftmenu'=>'titre',
-        //	'url'=>'/titre/pagelevel2.php',
-        //	// Lang file to use (without .lang) by module.
-        //	// File must be in langs/code_CODE/ directory.
-        //	'langs'=>'mylangfile',
-        //	'position'=>100,
-        //	// Define condition to show or hide menu entry.
-        //	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
-        //	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-        //	'enabled'=>'$conf->titre->enabled',
-        //	// Use 'perms'=>'$user->rights->titre->level1->level2'
-        //	// if you want your menu with a permission rules
-        //	'perms'=>'1',
-        //	'target'=>'',
-        //	// 0=Menu for internal users, 1=external users, 2=both
-        //	'user'=>2
-        //);
-        //$r++;
-        // Exports
-        $r = 1;
+		// Add here entries to declare new menus
+		//
+		// Example to declare a new Top Menu entry and its Left menu entry:
+		//$this->menu[$r]=array(
+		//	// Put 0 if this is a top menu
+		//	'fk_menu'=>0,
+		//	// This is a Top menu entry
+		//	'type'=>'top',
+		//	'titre'=>'titre top menu',
+		//	'mainmenu'=>'titre',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagetop.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		//$this->menu[$r]=array(
+		//	// Use r=value where r is index key used for the parent menu entry
+		//	// (higher parent must be a top menu entry)
+		//	'fk_menu'=>'r=0',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		//	'titre'=>'titre left menu',
+		//	'mainmenu'=>'titre',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagelevel1.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		//
+		// Example to declare a Left Menu entry into an existing Top menu entry:
+		//$this->menu[$r]=array(
+		//	// Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy'
+		//	'fk_menu'=>'fk_mainmenu=mainmenucode',
+		//	// This is a Left menu entry
+		//	'type'=>'left',
+		//	'titre'=>'titre left menu',
+		//	'mainmenu'=>'mainmenucode',
+		//	'leftmenu'=>'titre',
+		//	'url'=>'/titre/pagelevel2.php',
+		//	// Lang file to use (without .lang) by module.
+		//	// File must be in langs/code_CODE/ directory.
+		//	'langs'=>'mylangfile',
+		//	'position'=>100,
+		//	// Define condition to show or hide menu entry.
+		//	// Use '$conf->titre->enabled' if entry must be visible if module is enabled.
+		//	// Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+		//	'enabled'=>'$conf->titre->enabled',
+		//	// Use 'perms'=>'$user->rights->titre->level1->level2'
+		//	// if you want your menu with a permission rules
+		//	'perms'=>'1',
+		//	'target'=>'',
+		//	// 0=Menu for internal users, 1=external users, 2=both
+		//	'user'=>2
+		//);
+		//$r++;
+		// Exports
+		$r = 1;
 
-        // Example:
-        //$this->export_code[$r]=$this->rights_class.'_'.$r;
-        //// Translation key (used only if key ExportDataset_xxx_z not found)
-        //$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
-        //// Condition to show export in list (ie: '$user->id==3').
-        //// Set to 1 to always show when module is enabled.
-        //$this->export_enabled[$r]='1';
-        //$this->export_permission[$r]=array(array("facture","facture","export"));
-        //$this->export_fields_array[$r]=array(
-        //	's.rowid'=>"IdCompany",
-        //	's.nom'=>'CompanyName',
-        //	's.address'=>'Address',
-        //	's.cp'=>'Zip',
-        //	's.ville'=>'Town',
-        //	's.fk_pays'=>'Country',
-        //	's.tel'=>'Phone',
-        //	's.siren'=>'ProfId1',
-        //	's.siret'=>'ProfId2',
-        //	's.ape'=>'ProfId3',
-        //	's.idprof4'=>'ProfId4',
-        //	's.code_compta'=>'CustomerAccountancyCode',
-        //	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
-        //	'f.rowid'=>"InvoiceId",
-        //	'f.facnumber'=>"InvoiceRef",
-        //	'f.datec'=>"InvoiceDateCreation",
-        //	'f.datef'=>"DateInvoice",
-        //	'f.total'=>"TotalHT",
-        //	'f.total_ttc'=>"TotalTTC",
-        //	'f.tva'=>"TotalVAT",
-        //	'f.paye'=>"InvoicePaid",
-        //	'f.fk_statut'=>'InvoiceStatus',
-        //	'f.note'=>"InvoiceNote",
-        //	'fd.rowid'=>'LineId',
-        //	'fd.description'=>"LineDescription",
-        //	'fd.price'=>"LineUnitPrice",
-        //	'fd.tva_tx'=>"LineVATRate",
-        //	'fd.qty'=>"LineQty",
-        //	'fd.total_ht'=>"LineTotalHT",
-        //	'fd.total_tva'=>"LineTotalTVA",
-        //	'fd.total_ttc'=>"LineTotalTTC",
-        //	'fd.date_start'=>"DateStart",
-        //	'fd.date_end'=>"DateEnd",
-        //	'fd.fk_product'=>'ProductId',
-        //	'p.ref'=>'ProductRef'
-        //);
-        //$this->export_entities_array[$r]=array('s.rowid'=>"company",
-        //	's.nom'=>'company',
-        //	's.address'=>'company',
-        //	's.cp'=>'company',
-        //	's.ville'=>'company',
-        //	's.fk_pays'=>'company',
-        //	's.tel'=>'company',
-        //	's.siren'=>'company',
-        //	's.siret'=>'company',
-        //	's.ape'=>'company',
-        //	's.idprof4'=>'company',
-        //	's.code_compta'=>'company',
-        //	's.code_compta_fournisseur'=>'company',
-        //	'f.rowid'=>"invoice",
-        //	'f.facnumber'=>"invoice",
-        //	'f.datec'=>"invoice",
-        //	'f.datef'=>"invoice",
-        //	'f.total'=>"invoice",
-        //	'f.total_ttc'=>"invoice",
-        //	'f.tva'=>"invoice",
-        //	'f.paye'=>"invoice",
-        //	'f.fk_statut'=>'invoice',
-        //	'f.note'=>"invoice",
-        //	'fd.rowid'=>'invoice_line',
-        //	'fd.description'=>"invoice_line",
-        //	'fd.price'=>"invoice_line",
-        //	'fd.total_ht'=>"invoice_line",
-        //	'fd.total_tva'=>"invoice_line",
-        //	'fd.total_ttc'=>"invoice_line",
-        //	'fd.tva_tx'=>"invoice_line",
-        //	'fd.qty'=>"invoice_line",
-        //	'fd.date_start'=>"invoice_line",
-        //	'fd.date_end'=>"invoice_line",
-        //	'fd.fk_product'=>'product',
-        //	'p.ref'=>'product'
-        //);
-        //$this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        //$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
-        //	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
-        //$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
-        //	. 'product as p on (fd.fk_product = p.rowid)';
-        //$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
-        //	. 'AND f.rowid = fd.fk_facture';
-        //$r++;
-    }
+		// Example:
+		//$this->export_code[$r]=$this->rights_class.'_'.$r;
+		//// Translation key (used only if key ExportDataset_xxx_z not found)
+		//$this->export_label[$r]='CustomersInvoicesAndInvoiceLines';
+		//// Condition to show export in list (ie: '$user->id==3').
+		//// Set to 1 to always show when module is enabled.
+		//$this->export_enabled[$r]='1';
+		//$this->export_permission[$r]=array(array("facture","facture","export"));
+		//$this->export_fields_array[$r]=array(
+		//	's.rowid'=>"IdCompany",
+		//	's.nom'=>'CompanyName',
+		//	's.address'=>'Address',
+		//	's.cp'=>'Zip',
+		//	's.ville'=>'Town',
+		//	's.fk_pays'=>'Country',
+		//	's.tel'=>'Phone',
+		//	's.siren'=>'ProfId1',
+		//	's.siret'=>'ProfId2',
+		//	's.ape'=>'ProfId3',
+		//	's.idprof4'=>'ProfId4',
+		//	's.code_compta'=>'CustomerAccountancyCode',
+		//	's.code_compta_fournisseur'=>'SupplierAccountancyCode',
+		//	'f.rowid'=>"InvoiceId",
+		//	'f.facnumber'=>"InvoiceRef",
+		//	'f.datec'=>"InvoiceDateCreation",
+		//	'f.datef'=>"DateInvoice",
+		//	'f.total'=>"TotalHT",
+		//	'f.total_ttc'=>"TotalTTC",
+		//	'f.tva'=>"TotalVAT",
+		//	'f.paye'=>"InvoicePaid",
+		//	'f.fk_statut'=>'InvoiceStatus',
+		//	'f.note'=>"InvoiceNote",
+		//	'fd.rowid'=>'LineId',
+		//	'fd.description'=>"LineDescription",
+		//	'fd.price'=>"LineUnitPrice",
+		//	'fd.tva_tx'=>"LineVATRate",
+		//	'fd.qty'=>"LineQty",
+		//	'fd.total_ht'=>"LineTotalHT",
+		//	'fd.total_tva'=>"LineTotalTVA",
+		//	'fd.total_ttc'=>"LineTotalTTC",
+		//	'fd.date_start'=>"DateStart",
+		//	'fd.date_end'=>"DateEnd",
+		//	'fd.fk_product'=>'ProductId',
+		//	'p.ref'=>'ProductRef'
+		//);
+		//$this->export_entities_array[$r]=array('s.rowid'=>"company",
+		//	's.nom'=>'company',
+		//	's.address'=>'company',
+		//	's.cp'=>'company',
+		//	's.ville'=>'company',
+		//	's.fk_pays'=>'company',
+		//	's.tel'=>'company',
+		//	's.siren'=>'company',
+		//	's.siret'=>'company',
+		//	's.ape'=>'company',
+		//	's.idprof4'=>'company',
+		//	's.code_compta'=>'company',
+		//	's.code_compta_fournisseur'=>'company',
+		//	'f.rowid'=>"invoice",
+		//	'f.facnumber'=>"invoice",
+		//	'f.datec'=>"invoice",
+		//	'f.datef'=>"invoice",
+		//	'f.total'=>"invoice",
+		//	'f.total_ttc'=>"invoice",
+		//	'f.tva'=>"invoice",
+		//	'f.paye'=>"invoice",
+		//	'f.fk_statut'=>'invoice',
+		//	'f.note'=>"invoice",
+		//	'fd.rowid'=>'invoice_line',
+		//	'fd.description'=>"invoice_line",
+		//	'fd.price'=>"invoice_line",
+		//	'fd.total_ht'=>"invoice_line",
+		//	'fd.total_tva'=>"invoice_line",
+		//	'fd.total_ttc'=>"invoice_line",
+		//	'fd.tva_tx'=>"invoice_line",
+		//	'fd.qty'=>"invoice_line",
+		//	'fd.date_start'=>"invoice_line",
+		//	'fd.date_end'=>"invoice_line",
+		//	'fd.fk_product'=>'product',
+		//	'p.ref'=>'product'
+		//);
+		//$this->export_sql_start[$r] = 'SELECT DISTINCT ';
+		//$this->export_sql_end[$r] = ' FROM (' . MAIN_DB_PREFIX . 'facture as f, '
+		//	. MAIN_DB_PREFIX . 'facturedet as fd, ' . MAIN_DB_PREFIX . 'societe as s)';
+		//$this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX
+		//	. 'product as p on (fd.fk_product = p.rowid)';
+		//$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid '
+		//	. 'AND f.rowid = fd.fk_facture';
+		//$r++;
+	}
 
-    /**
-     * Function called when module is enabled.
-     * The init function add constants, boxes, permissions and menus
-     * (defined in constructor) into Dolibarr database.
-     * It also creates data directories
-     *
-     * 	@param		string	$options	Options when enabling module ('', 'noboxes')
-     * 	@return		int					1 if OK, 0 if KO
-     */
-    public function init($options = '')
-    {
+	/**
+	 * Function called when module is enabled.
+	 * The init function add constants, boxes, permissions and menus
+	 * (defined in constructor) into Dolibarr database.
+	 * It also creates data directories
+	 *
+	 * 	@param		string	$options	Options when enabling module ('', 'noboxes')
+	 * 	@return		int					1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
 	  	global $conf, $db;
 		
 		
@@ -474,46 +474,46 @@ 
 			exit("Attention, ce module rentre ne conflit avec le module Jalon/Milestones. Merci de le désactiver auparavant.");
 		}
       */
-	    $sql = array();
+		$sql = array();
 
-        $result = $this->loadTables();
-        dol_include_once('/core/class/extrafields.class.php');
+		$result = $this->loadTables();
+		dol_include_once('/core/class/extrafields.class.php');
 	
-        $extra = new ExtraFields($db); // propaldet, commandedet, facturedet
-        $TElementType = array('propaldet', 'commandedet', 'facturedet', 'supplier_proposaldet', 'commande_fournisseurdet', 'facture_fourn_det');
-        foreach($TElementType as $element_type) {
-            $extra->addExtraField('show_total_ht', 'Afficher le Total HT sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
-            $extra->addExtraField('show_reduc', 'Afficher la réduction sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
-        }
+		$extra = new ExtraFields($db); // propaldet, commandedet, facturedet
+		$TElementType = array('propaldet', 'commandedet', 'facturedet', 'supplier_proposaldet', 'commande_fournisseurdet', 'facture_fourn_det');
+		foreach($TElementType as $element_type) {
+			$extra->addExtraField('show_total_ht', 'Afficher le Total HT sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
+			$extra->addExtraField('show_reduc', 'Afficher la réduction sur le sous-total', 'int', 0, 10, $element_type, 0, 0, '', unserialize('a:1:{s:7:"options";a:1:{s:0:"";N;}}'), 0, '', 0, 1);
+		}
 		
-        return $this->_init($sql, $options);
-    }
+		return $this->_init($sql, $options);
+	}
 
-    /**
-     * Function called when module is disabled.
-     * Remove from database constants, boxes and permissions from Dolibarr database.
-     * Data directories are not deleted
-     *
-     * 	@param		string	$options	Options when enabling module ('', 'noboxes')
-     * 	@return		int					1 if OK, 0 if KO
-     */
-    public function remove($options = '')
-    {
-        $sql = array();
+	/**
+	 * Function called when module is disabled.
+	 * Remove from database constants, boxes and permissions from Dolibarr database.
+	 * Data directories are not deleted
+	 *
+	 * 	@param		string	$options	Options when enabling module ('', 'noboxes')
+	 * 	@return		int					1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
 
-        return $this->_remove($sql, $options);
-    }
+		return $this->_remove($sql, $options);
+	}
 
-    /**
-     * Create tables, keys and data required by module
-     * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-     * and create data commands must be stored in directory /titre/sql/
-     * This function is called by this->init
-     *
-     * 	@return		int		<=0 if KO, >0 if OK
-     */
-    private function loadTables()
-    {
-        return $this->_load_tables('/subtotal/sql/');
-    }
+	/**
+	 * Create tables, keys and data required by module
+	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
+	 * and create data commands must be stored in directory /titre/sql/
+	 * This function is called by this->init
+	 *
+	 * 	@return		int		<=0 if KO, >0 if OK
+	 */
+	private function loadTables()
+	{
+		return $this->_load_tables('/subtotal/sql/');
+	}
 }

class/actions_subtotal.class.php

Indentation +291 added lines, -291 removed lines

@@ -101,11 +101,11 @@ 
 	 * @return     void
 	 */
     
-    var $module_number = 104777;
+	var $module_number = 104777;
     
-    function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
-    {
-      	global $langs,$db,$user, $conf;
+	function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
+	{
+	  	global $langs,$db,$user, $conf;
 		
 		$langs->load('subtotal@subtotal');
 		
@@ -120,10 +120,10 @@ 
 				$createRight = $user->rights->facture->creer;
 			} elseif($object->element == 'order_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->commande->creer;
+				$createRight = $user->rights->fournisseur->commande->creer;
 			} elseif($object->element == 'invoice_supplier' )
 			{
-			    $createRight = $user->rights->fournisseur->facture->creer;
+				$createRight = $user->rights->fournisseur->facture->creer;
 			}
 			elseif($object->element == 'shipping')
 			{
@@ -177,7 +177,7 @@ 
 					
 					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
 					
-	    			TSubtotal::addSubTotalLine($object, $title, $qty);
+					TSubtotal::addSubTotalLine($object, $title, $qty);
 				}
 				else if($action==='ask_deleteallline') {
 						$form=new Form($db);
@@ -399,36 +399,36 @@ 
 		$TContext = explode(':',$parameters['context']);
 		if (
 				in_array('invoicecard',$TContext)
-		        || in_array('invoicesuppliercard',$TContext)
+				|| in_array('invoicesuppliercard',$TContext)
 				|| in_array('propalcard',$TContext)
 				|| in_array('ordercard',$TContext)
-		        || in_array('ordersuppliercard',$TContext)
+				|| in_array('ordersuppliercard',$TContext)
 				|| in_array('invoicereccard',$TContext)
 			)
-	        {	
-	            $hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
-	            $hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
+			{	
+				$hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
+				$hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
 				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
 				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
 				
 				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
 		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 				
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
 		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
 		     			</td>
 		     			</tr>';
 		     	
-		     	$var=!$var;
-		     	$out.= '<tr '.$bc[$var].'>
+			 	$var=!$var;
+			 	$out.= '<tr '.$bc[$var].'>
 		     			<td colspan="4" align="right">
 		     				<label for="hideprices">'.$langs->trans('SubTotalhidePrice').'</label>
 		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
@@ -440,9 +440,9 @@ 
 				if ( 
 					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
 					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
+					|| (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
 					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
+					|| (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
 					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
 				)
 				{
@@ -461,19 +461,19 @@ 
 			}
 			
 		
-        return 1;
+		return 1;
 	} 
 	 
-    function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
-    {
+	function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
+	{
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
-        {
+		if (in_array('invoicecard',explode(':',$parameters['context'])))
+		{
         	
-        }
+		}
 		
-        return 0;
-    }
+		return 0;
+	}
 	
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
 		global $conf;
@@ -522,11 +522,11 @@ 
 	
 		if (
 				in_array('invoicecard',explode(':',$parameters['context']))
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
 				|| in_array('invoicereccard',explode(':',$parameters['context']))
 		) {
 			
@@ -605,20 +605,20 @@ 
 				in_array('invoicecard',explode(':',$parameters['context']))
 				|| in_array('propalcard',explode(':',$parameters['context']))
 				|| in_array('ordercard',explode(':',$parameters['context']))
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
+				|| in_array('ordersuppliercard',explode(':',$parameters['context']))
+				|| in_array('invoicesuppliercard',explode(':',$parameters['context']))
+				|| in_array('supplier_proposalcard',explode(':',$parameters['context']))
 			)
-	        {								
+			{								
 				if(in_array('invoicecard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_facture';	
 					$sessname2 = 'subtotal_hidedetails_facture';
 					$sessname3 = 'subtotal_hideprices_facture';
 				}
 				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_facture_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_facture_fournisseur';
+					$sessname3 = 'subtotal_hideprices_facture_fournisseur';
 				}
 				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_propal';
@@ -626,9 +626,9 @@ 
 					$sessname3 = 'subtotal_hideprices_propal';
 				}
 				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
-				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
-				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
+					$sessname = 'subtotal_hideInnerLines_supplier_proposal';
+					$sessname2 = 'subtotal_hidedetails_supplier_proposal';
+					$sessname3 = 'subtotal_hideprices_supplier_proposal';
 				}
 				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
 					$sessname = 'subtotal_hideInnerLines_commande';
@@ -636,9 +636,9 @@ 
 					$sessname3 = 'subtotal_hideprices_commande';
 				}
 				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
-				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
-				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
-				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
+					$sessname = 'subtotal_hideInnerLines_commande_fournisseur';
+					$sessname2 = 'subtotal_hidedetails_commande_fournisseur';
+					$sessname3 = 'subtotal_hideprices_commande_fournisseur';
 				}
 				else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
@@ -663,17 +663,17 @@ 
 				foreach($object->lines as &$line) {
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
 					    
-                        if($line->qty>=90) {
-                            $line->modsubtotal_total = 1;
-                        }
-                        else{
-                            $line->modsubtotal_title = 1;
-                        }
+						if($line->qty>=90) {
+							$line->modsubtotal_total = 1;
+						}
+						else{
+							$line->modsubtotal_title = 1;
+						}
                         
 						$line->total_ht = $this->getTotalLineFromObject($object, $line, '');
 					}
-	        	}
-	        }
+				}
+			}
 			
 		}
 		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
@@ -690,7 +690,7 @@ 
 				 */
 				else if($object->element=='invoice_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Propal
@@ -713,7 +713,7 @@ 
 				 */
 				else if($object->element=='order_supplier')
 				{
-				    $object->deleteline($idLine);
+					$object->deleteline($idLine);
 				}
 				/**
 				 * @var $object Facturerec
@@ -788,7 +788,7 @@ 
 		
 		foreach($object->lines as $l) {
 		
-		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
+			$lid = (!empty($l->rowid) ? $l->rowid : $l->id);
 			if($lid == $lineid) {
 
 				$found = true;
@@ -797,7 +797,7 @@ 
 			
 			if($found) {
 				
-			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
+				$Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
 				
 				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
 					break; // end of story
@@ -929,7 +929,7 @@ 
 		if(method_exists('Closure','bind')) {
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
 			$sweetsThief = function ($pdf) {
-		    		return $pdf->bMargin ;
+					return $pdf->bMargin ;
 			};
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
 	
@@ -997,7 +997,7 @@ 
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 					$total_to_print = price($total);
 					
-                    $line->total_ht = $total;
+					$line->total_ht = $total;
 					$line->total = $total;
 					$line->total_tva = $total_tva;
 					$line->total_ttc = $total_ttc;
@@ -1154,7 +1154,7 @@ 
 	}
 	
 	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf, $hideprices, $hookmanager;
+		global $conf, $hideprices, $hookmanager;
 		
 		if(is_array($parameters)) $i = & $parameters['i'];
 		else $i = (int)$parameters;
@@ -1193,7 +1193,7 @@ 
 			}
 		}
 		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
-		    $this->resprints = price($object->lines[$i]->total_ht);
+			$this->resprints = price($object->lines[$i]->total_ht);
 		}
 		
 		// Si la gestion C/NC est active et que je suis sur un ligne dont l'extrafield est coché
@@ -1322,7 +1322,7 @@ 
 	}
 	
 	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 
 		if(is_array($parameters)) $i = & $parameters['i'];
 		else $i = (int)$parameters;
@@ -1330,18 +1330,18 @@ 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
 
-            $line = $object->lines[$i];
+			$line = $object->lines[$i];
 
-            // On récupère les montants du bloc pour les afficher dans la ligne de sous-total
-            if(TSubtotal::isSubtotal($line)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			// On récupère les montants du bloc pour les afficher dans la ligne de sous-total
+			if(TSubtotal::isSubtotal($line)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->array_options['options_show_total_ht'])) {
-                    $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
-                    $this->resprints = price($TTotal['total_subprice']);
-                }
-            }
+				if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+				if(! empty($parentTitle->array_options['options_show_total_ht'])) {
+					$TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
+					$this->resprints = price($TTotal['total_subprice']);
+				}
+			}
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
@@ -1357,58 +1357,58 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
 		        
-		    }
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlineupexcltax', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
 	}
 	
 	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 
-        if(is_array($parameters)) $i = & $parameters['i'];
-        else $i = (int) $parameters;
+		if(is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
 
-            $line = $object->lines[$i];
+			$line = $object->lines[$i];
 
-            // Affichage de la remise 
-            if(TSubtotal::isSubtotal($line)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			// Affichage de la remise 
+			if(TSubtotal::isSubtotal($line)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->array_options['options_show_reduc'])) {
-                    $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
-                    $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
-                }
-            }
+				if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+				if(! empty($parentTitle->array_options['options_show_reduc'])) {
+					$TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
+					$this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
+				}
+			}
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
@@ -1418,15 +1418,15 @@ 
 			}
 		}
 		elseif (!empty($hideprices)
-		        || (!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)))
-		        {
-		            $this->resprints = ' ';
-		            return 1;
-		        }
-		    }
+				|| (!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)))
+				{
+					$this->resprints = ' ';
+					return 1;
+				}
+			}
 		
 		return 0;
 	}
@@ -1462,7 +1462,7 @@ 
 	}
 	
 	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+		global $conf,$hideprices,$hookmanager;
 	    
 		if($this->isModSubtotalLine($parameters,$object) ){
 			$this->resprints = ' ';
@@ -1487,31 +1487,31 @@ 
 		(!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))
 		)
 		{
-		    // alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
-		    if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
-		    {
-		        $this->resprints = ' ';
+			// alors je dois vérifier si la méthode fait partie de la conf qui l'exclue
+			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
+			{
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hide_nc', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		// Cache le prix pour les lignes standards dolibarr qui sont dans un ensemble
 		else if (!empty($hideprices))
 		{
 		    
-		    // Check if a title exist for this line && if the title have subtotal
-		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
-		    {
+			// Check if a title exist for this line && if the title have subtotal
+			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
+			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			{
 		        
-		        $this->resprints = ' ';
+				$this->resprints = ' ';
 		        
-		        // currentcontext à modifier celon l'appel
-		        $params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
-		        return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
-		    }
+				// currentcontext à modifier celon l'appel
+				$params = array('parameters' => $parameters, 'currentmethod' => 'pdf_getlinevatrate', 'currentcontext'=>'subtotal_hideprices', 'i' => $i);
+				return $this->callHook($object, $hookmanager, $action, $params); // return 1 (qui est la valeur par défaut) OU -1 si erreur OU overrideReturn (contient -1 ou 0 ou 1)
+			}
 		}
 		
 		return 0;
@@ -1635,33 +1635,33 @@ 
 		
 		$this->add_numerotation($object);	
 		
-        foreach($object->lines as $k => &$l) {
-            if(TSubtotal::isSubtotal($l)) {
-                $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
-                    $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
-                }
-            }
+		foreach($object->lines as $k => &$l) {
+			if(TSubtotal::isSubtotal($l)) {
+				$parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
+				if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+				if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
+					$l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
+				}
+			}
 
 
-            // Pas de hook sur les colonnes du PDF expédition, on unset les bonnes variables
-            if(($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
+			// Pas de hook sur les colonnes du PDF expédition, on unset les bonnes variables
+			if(($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
 			{
 				$l->qty = $l->qty_asked;
 				unset($l->qty_asked, $l->qty_shipped, $l->volume, $l->weight);
 			}
-        }
+		}
 
 		$hideInnerLines = (int)GETPOST('hideInnerLines');
 		$hidedetails = (int)GETPOST('hidedetails');
 
 		if ($hideInnerLines) { // si c une ligne de titre
-	    	$fk_parent_line=0;
+			$fk_parent_line=0;
 			$TLines =array();
 		
 			$original_count=count($object->lines);
-		    $TTvas = array(); // tableau de tva
+			$TTvas = array(); // tableau de tva
 		    
 			foreach($object->lines as $k=>&$line) 
 			{
@@ -1700,48 +1700,48 @@ 
 			
 				if ($hideInnerLines)
 				{
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
-				    {
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
+					if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
+					{
+						if($line->tva_tx != '0.000' && $line->product_type!=9){
 				            
-    				        // on remplit le tableau de tva pour substituer les lignes cachées
-    				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
-    				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
-    				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
-    				    }
-    					if($line->product_type==9 && $line->rowid>0)
-    					{
-    					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
-    					    // génère des lignes d'affichage des montants HT soumis à tva
-    					    $nbtva = count($TTvas);
-    					    if(!empty($nbtva)){
-    					        foreach ($TTvas as $tx =>$val){
-    					            $l = clone $line;
-    					            $l->product_type = 1;
-    					            $l->special_code = '';
-    					            $l->qty = 1;
-    					            $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-    					            $l->tva_tx = $tx;
-    					            $l->total_ht = $val['total_ht'];
-    					            $l->total_tva = $val['total_tva'];
-    					            $l->total = $line->total_ht;
-    					            $l->total_ttc = $val['total_ttc'];
-    					            $TLines[] = $l;
-    					            array_shift($TTvas);
-    					       }
-    					    }
+							// on remplit le tableau de tva pour substituer les lignes cachées
+							$TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
+							$TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
+							$TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
+						}
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							//Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
+							// génère des lignes d'affichage des montants HT soumis à tva
+							$nbtva = count($TTvas);
+							if(!empty($nbtva)){
+								foreach ($TTvas as $tx =>$val){
+									$l = clone $line;
+									$l->product_type = 1;
+									$l->special_code = '';
+									$l->qty = 1;
+									$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+									$l->tva_tx = $tx;
+									$l->total_ht = $val['total_ht'];
+									$l->total_tva = $val['total_tva'];
+									$l->total = $line->total_ht;
+									$l->total_ttc = $val['total_ttc'];
+									$TLines[] = $l;
+									array_shift($TTvas);
+							   }
+							}
     					    
-    					    // ajoute la ligne de sous-total
-    					    $TLines[] = $line; 
-    					}
-				    } else {
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					} else {
 				        
-				        if($line->product_type==9 && $line->rowid>0)
-				        {
-				            // ajoute la ligne de sous-total
-				            $TLines[] = $line; 
-				        }
-				    }
+						if($line->product_type==9 && $line->rowid>0)
+						{
+							// ajoute la ligne de sous-total
+							$TLines[] = $line; 
+						}
+					}
 				    
 					
 				}
@@ -1766,20 +1766,20 @@ 
 			$nbtva = count($TTvas);
 			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
 			{
-			    foreach ($TTvas as $tx =>$val){
-			        $l = clone $line;
-			        $l->product_type = 1;
-			        $l->special_code = '';
-			        $l->qty = 1;
-			        $l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
-			        $l->tva_tx = $tx;
-			        $l->total_ht = $val['total_ht'];
-			        $l->total_tva = $val['total_tva'];
-			        $l->total = $line->total_ht;
-			        $l->total_ttc = $val['total_ttc'];
-			        $TLines[] = $l;
-			        array_shift($TTvas);
-			    }
+				foreach ($TTvas as $tx =>$val){
+					$l = clone $line;
+					$l->product_type = 1;
+					$l->special_code = '';
+					$l->qty = 1;
+					$l->desc = $langs->trans('AmountBeforeTaxesSubjectToVATX%', $langs->transnoentitiesnoconv('VAT'), price($tx));
+					$l->tva_tx = $tx;
+					$l->total_ht = $val['total_ht'];
+					$l->total_tva = $val['total_tva'];
+					$l->total = $line->total_ht;
+					$l->total_ttc = $val['total_ttc'];
+					$TLines[] = $l;
+					array_shift($TTvas);
+				}
 			}
 			
 			global $nblignes;
@@ -1791,7 +1791,7 @@ 
 				$this->resprints = '';
 				return 0;
 			}
-	    }
+		}
 		
 		return 0;
 	}
@@ -1983,11 +1983,11 @@ 
 		}
 		elseif($object->element == 'order_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->commande->creer;
+			$createRight = $user->rights->fournisseur->commande->creer;
 		}
 		elseif($object->element == 'invoice_supplier' )
 		{
-		    $createRight = $user->rights->fournisseur->facture->creer;
+			$createRight = $user->rights->fournisseur->facture->creer;
 		}
 		elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
 		{
@@ -2020,7 +2020,7 @@ 
 			null;
 		}
 		else if (in_array('invoicecard',$contexts) || in_array('invoicesuppliercard',$contexts) || in_array('propalcard',$contexts) || in_array('supplier_proposalcard',$contexts) || in_array('ordercard',$contexts) || in_array('ordersuppliercard',$contexts) || in_array('invoicereccard',$contexts)) 
-        {
+		{
 			if($object->element=='facture')$idvar = 'facid';
 			else $idvar='id';
 
@@ -2069,7 +2069,7 @@ 
 			//var_dump($line);
             
 			// HTML 5 data for js
-            $data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
+			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
             
 			
 			?>
@@ -2131,8 +2131,8 @@ 
 						}
 						
 						if ($object->element == 'order_supplier' || $object->element == 'invoice_supplier') {
-						    $line->label = !empty($line->description) ? $line->description : $line->desc;
-						    $line->description = '';
+							$line->label = !empty($line->description) ? $line->description : $line->desc;
+							$line->description = '';
 						}
 						$newlabel = $line->label;
 						if($line->label=='' && !$isFreeText) {
@@ -2166,38 +2166,38 @@ 
 						
 
 						echo '<div class="subtotal_underline" style="margin-left:24px; line-height: 25px;">';
-                        echo '<div>';
-                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                        echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
-                        echo '</div>';
-
-                        if (TSubtotal::isTitle($line))
-                        {
-                            $form = new Form($db);
-                            echo '<div>';
-                            echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
-                            echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
-                            if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
-                            echo '</select>';
-                            echo '</div>';
-
-                            if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
-                            {
-                                echo '<div>';
-                                echo '<label for="subtotal_progress">'.$langs->trans('subtotal_apply_progress').'</label> <input id="subtotal_progress" name="subtotal_progress" value="" size="1" />%';
-                                echo '</div>';
-                            }
-                            echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                            echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
-                            echo '</div>';
-
-                            echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
-                            echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
-                            echo '</div>';
-                        }
-                        else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
+						echo '<div>';
+						echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+						echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
+						echo '</div>';
+
+						if (TSubtotal::isTitle($line))
+						{
+							$form = new Form($db);
+							echo '<div>';
+							echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
+							echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
+							if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+							echo '</select>';
+							echo '</div>';
+
+							if (!empty($conf->global->INVOICE_USE_SITUATION) && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
+							{
+								echo '<div>';
+								echo '<label for="subtotal_progress">'.$langs->trans('subtotal_apply_progress').'</label> <input id="subtotal_progress" name="subtotal_progress" value="" size="1" />%';
+								echo '</div>';
+							}
+							echo '<div>';
+							echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+							echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
+							echo '</div>';
+
+							echo '<div>';
+							echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+							echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
+							echo '</div>';
+						}
+						else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
 						if($line->qty<10) {
@@ -2714,17 +2714,17 @@ 
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
 		{
 		    
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
-		    {
-		        foreach ($object->lines as $line)
-		        {
-		            // fetch optionals attributes and labels
-		            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-		            $extrafields=new ExtraFields($this->db);
-		            $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-		            $line->fetch_optionals($line->id,$extralabels);
-		        }
-		    }
+			if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
+			{
+				foreach ($object->lines as $line)
+				{
+					// fetch optionals attributes and labels
+					require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
+					$extrafields=new ExtraFields($this->db);
+					$extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
+					$line->fetch_optionals($line->id,$extralabels);
+				}
+			}
 		    
 			$TSubNc = array();
 			foreach ($object->lines as &$l)
@@ -2815,80 +2815,80 @@ 
 	{
 		dol_include_once('/subtotal/class/subtotal.class.php');
 
-	    $line = &$parameters['line'];
+		$line = &$parameters['line'];
 	    
-	    $ThtmlData['data-id']           = $line->id;
-	    $ThtmlData['data-product_type'] = $line->product_type;
-	    $ThtmlData['data-qty']          = 0; //$line->qty;
-	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
+		$ThtmlData['data-id']           = $line->id;
+		$ThtmlData['data-product_type'] = $line->product_type;
+		$ThtmlData['data-qty']          = 0; //$line->qty;
+		$ThtmlData['data-level']        = TSubtotal::getNiveau($line);
 	    
-	    if(TSubtotal::isTitle($line)){
-	        $ThtmlData['data-issubtotal'] = 'title';
-	    }elseif(TSubtotal::isSubtotal($line)){
-	        $ThtmlData['data-issubtotal'] = 'subtotal';
-	    }
-	    else{
-	        $ThtmlData['data-issubtotal'] = 'freetext';
-	    }
+		if(TSubtotal::isTitle($line)){
+			$ThtmlData['data-issubtotal'] = 'title';
+		}elseif(TSubtotal::isSubtotal($line)){
+			$ThtmlData['data-issubtotal'] = 'subtotal';
+		}
+		else{
+			$ThtmlData['data-issubtotal'] = 'freetext';
+		}
 	    
 	    
-	    // Change or add data  from hooks
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
+		// Change or add data  from hooks
+		$parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
 	    
-	    // hook 
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
-	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-	    if ($reshook>0)
-	    {
-	        $ThtmlData = $hookmanager->resArray;
-	    }
-
-	    return $this->implodeHtmlData($ThtmlData);
+		// hook 
+		$reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		if ($reshook>0)
+		{
+			$ThtmlData = $hookmanager->resArray;
+		}
+
+		return $this->implodeHtmlData($ThtmlData);
 	
 	}
 	
 	
 	function implodeHtmlData($ThtmlData = array())
 	{
-	    $data = '';
-	    foreach($ThtmlData as $k => $h )
-	    {
-	        if(is_array($h))
-	        {
-	            $h = json_encode($h);
-	        }
+		$data = '';
+		foreach($ThtmlData as $k => $h )
+		{
+			if(is_array($h))
+			{
+				$h = json_encode($h);
+			}
 	        
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
-	    }
+			$data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
+		}
 	    
-	    return $data;
+		return $data;
 	}
 	
 	function _ajax_block_order_js($object)
 	{
-	    global $conf,$tagidfortablednd,$filepath,$langs;
+		global $conf,$tagidfortablednd,$filepath,$langs;
 	    
-	    /*
+		/*
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
 	     */
 	    
-	    $id=$object->id;
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
+		$id=$object->id;
+		$nboflines=(isset($object->lines)?count($object->lines):0);
+		$forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
 	    
-	    $id=$object->id;
-	    $fk_element=$object->fk_element;
-	    $table_element_line=$object->table_element_line;
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
-	    $filepath=(empty($filepath)?'':$filepath);
+		$id=$object->id;
+		$fk_element=$object->fk_element;
+		$table_element_line=$object->table_element_line;
+		$nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
+		$tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
+		$filepath=(empty($filepath)?'':$filepath);
 	    
 	    
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
-	    {
+		if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
+		{
 	        
-	        ?>
+			?>
 		
 		
 			<script type="text/javascript">

Spacing +489 added lines, -489 removed lines

@@ -16,17 +16,17 @@ 
 		
 		global $type_element, $where;
 		
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 		
-		if(in_array('consumptionthirdparty',$contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) {
+		if (in_array('consumptionthirdparty', $contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) {
 			$mod_num = TSubtotal::$module_number;
 			
 			// Not a title (can't use TSubtotal class methods in sql)
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)';
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)';
 			// Not a subtotal (can't use TSubtotal class methods in sql)
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)';
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)';
 			// Not a free line text (can't use TSubtotal class methods in sql)
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)';
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)';
 			
 		}
 		
@@ -105,47 +105,47 @@ 
     
     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) || in_array('expeditioncard',$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) || in_array('expeditioncard', $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;
 			}
-			elseif($object->element == 'shipping')
+			elseif ($object->element == 'shipping')
 			{
 				$createRight = true; // No rights management for shipments
 			}
 			
-			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)) {
@@ -157,21 +157,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');
 					
@@ -179,15 +179,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;
 				}
 
@@ -197,13 +197,13 @@ 
 				}
 
 				
-				if($object->element != 'shipping' && $action!='editline') {
+				if ($object->element != 'shipping' && $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">
@@ -228,7 +228,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>');
 
@@ -279,9 +279,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')
 						{
@@ -396,62 +396,62 @@ 
 		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']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
-	            $hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
-				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
-				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
+	            $hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
+	            $hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
+				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED) ? $conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED : 0;
+				$hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
 				
-				$var=false;
-		     	$out.= '<tr '.$bc[$var].'>
+				$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="hideprices">'.$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>';
 				}
@@ -467,7 +467,7 @@ 
     function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
     {
 		
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
+    	if (in_array('invoicecard', explode(':', $parameters['context'])))
         {
         	
         }
@@ -478,13 +478,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']
@@ -495,7 +495,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);
@@ -509,7 +509,7 @@ 
 				
 				
 			}	
-			else{
+			else {
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -521,29 +521,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."
 							");
 						
@@ -559,15 +559,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')
@@ -580,7 +580,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);
@@ -599,43 +599,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';
@@ -648,25 +648,25 @@ 
 					
 				global $hideprices;
 				
-				$hideInnerLines = (int)GETPOST('hideInnerLines');
-				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) $_SESSION[$sessname] = array(); // prevent old system
+				$hideInnerLines = (int) GETPOST('hideInnerLines');
+				if (!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id])) $_SESSION[$sessname] = array(); // prevent old system
 				$_SESSION[$sessname][$object->id] = $hideInnerLines;		
 				
-				$hidedetails= (int)GETPOST('hidedetails');
-				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) $_SESSION[$sessname2] = array(); // prevent old system
+				$hidedetails = (int) GETPOST('hidedetails');
+				if (!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id])) $_SESSION[$sessname2] = array(); // prevent old system
 				$_SESSION[$sessname2][$object->id] = $hidedetails;
 				
-				$hideprices= (int)GETPOST('hideprices');
-				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) $_SESSION[$sessname3] = array(); // prevent old system
+				$hideprices = (int) GETPOST('hideprices');
+				if (!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id])) $_SESSION[$sessname3] = array(); // prevent old system
 				$_SESSION[$sessname3][$object->id] = $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;
                         }
                         
@@ -676,34 +676,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);
@@ -711,18 +711,18 @@ 
 				/**
 				 * @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);
 				/**
 				 * @var $object Expedition
 				 */
-				else if($object->element=='shipping') $object->deleteline($user, $idLine);
+				else if ($object->element == 'shipping') $object->deleteline($user, $idLine);
 			}
 			
 			header('location:?id='.$object->id);
@@ -745,7 +745,7 @@ 
 		return 0;
 	}
 	
-	function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) {
+	function formAddObjectLine($parameters, &$object, &$action, $hookmanager) {
 		return 0;
 	}
 	
@@ -763,8 +763,8 @@ 
 			if (!empty($parameters['fk_element']))
 			{
 				
-				if($obj->fetch($parameters['fk_element'])){
-					$obj->id= $obj->rowid;
+				if ($obj->fetch($parameters['fk_element'])) {
+					$obj->id = $obj->rowid;
 					if (empty($obj->array_options))
 						$obj->fetch_optionals();
 					if (!empty($obj->array_options['options_subtotal_nc']))
@@ -784,22 +784,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
 				}
 			}
@@ -828,7 +828,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) {
 		global $conf;
 		
 		$rang = $line->rang;
@@ -839,31 +839,31 @@ 
 		$total_ttc = 0;
 		$TTotal_tva = array();
 		
-		$sign=1;
-		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+		$sign = 1;
+		if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
 		
 		if (GETPOST('action') == 'builddoc') $builddoc = true;
 		else $builddoc = false;
 		
 		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)) {
 				
 				// TODO retirer le test avec $builddoc quand Dolibarr affichera le total progression sur la card et pas seulement dans le PDF
-				if ($builddoc && $object->element == 'facture' && $object->type==Facture::TYPE_SITUATION)
+				if ($builddoc && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
 				{
 					if ($l->situation_percent > 0)
 					{
@@ -876,7 +876,7 @@ 
 						}
 						
 						$result = $sign * ($l->total_ht / ($l->situation_percent / 100)) * $progress;
-						$total+= $result;
+						$total += $result;
 						// TODO check si les 3 lignes du dessous sont corrects
 						$total_tva += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
 						$TTotal_tva[$l->tva_tx] += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
@@ -908,10 +908,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;
@@ -920,40 +920,40 @@ 
 		
 		$hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines');
 
-		if($object->element == 'shipping' || $object->element == 'delivery')
+		if ($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			$hidePriceOnSubtotalLines = 1;
 		}
 		
 		$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();
 		
@@ -981,7 +981,7 @@ 
 			
 			
 			
-			if($total_to_print !== '') {
+			if ($total_to_print !== '') {
 				
 				if (GETPOST('hideInnerLines'))
 				{
@@ -1005,11 +1005,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;
@@ -1029,22 +1029,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;
@@ -1053,44 +1053,44 @@ 
 		}
 		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;
 		}
 
 		$line = $object->lines[$i];
 
-		if($object->element == 'shipping' || $object->element == 'delivery')
+		if ($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			dol_include_once('/commande/class/commande.class.php');
 			$line = new OrderLine($object->db);
@@ -1098,7 +1098,7 @@ 
 		}
 		
 
-		if($line->special_code == $this->module_number && $line->product_type == 9) {
+		if ($line->special_code == $this->module_number && $line->product_type == 9) {
 			return true;
 		}
 		
@@ -1106,42 +1106,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)
 		
-		if(empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals();
+		if (empty($object->lines[$i]->array_options)) $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)))
 			{
@@ -1153,20 +1153,20 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
+	function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') {
 	    global $conf, $hideprices, $hookmanager;
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 			
-		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;
 			}
 			
@@ -1192,7 +1192,7 @@ 
 				}
 			}
 		}
-		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
+		if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) {
 		    $this->resprints = price($object->lines[$i]->total_ht);
 		}
 		
@@ -1217,7 +1217,7 @@ 
 		{
 			// Check if a title exist for this line && if the title have subtotal
 			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+			if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
 			{
 
 				$this->resprints = ' ';
@@ -1237,7 +1237,7 @@ 
 	 */
 	private function callHook(&$object, &$hookmanager, $action, $params, $defaultReturn = 1)
 	{
-		$reshook=$hookmanager->executeHooks('subtotalHidePrices',$params, $object, $action);
+		$reshook = $hookmanager->executeHooks('subtotalHidePrices', $params, $object, $action);
 		if ($reshook < 0)
 		{
 			$this->error = $hookmanager->error;
@@ -1253,7 +1253,7 @@ 
 			$this->resprints = $hookmanager->resprints;
 
 			// override return (use  $this->results['overrideReturn'] or $this->resArray['overrideReturn'] in other module action_xxxx.class.php )
-			if(isset($hookmanager->resArray['overrideReturn']))
+			if (isset($hookmanager->resArray['overrideReturn']))
 			{
 				return $hookmanager->resArray['overrideReturn'];
 			}
@@ -1262,25 +1262,25 @@ 
 		return $defaultReturn;
 	}
 	
-	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)))
 			{
@@ -1292,24 +1292,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)))
 			{
@@ -1321,32 +1321,32 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+	function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') {
+	    global $conf, $hideprices, $hookmanager;
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if (is_array($parameters)) $i = & $parameters['i'];
+		else $i = (int) $parameters;
 
-		if($this->isModSubtotalLine($parameters,$object) ) {
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 
             $line = $object->lines[$i];
 
             // On récupère les montants du bloc pour les afficher dans la ligne de sous-total
-            if(TSubtotal::isSubtotal($line)) {
+            if (TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->array_options['options_show_total_ht'])) {
+                if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if (!empty($parentTitle->array_options['options_show_total_ht'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
                     $this->resprints = price($TTotal['total_subprice']);
                 }
             }
 		
-			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;
 			}
 		}
@@ -1374,7 +1374,7 @@ 
 		    
 		    // Check if a title exist for this line && if the title have subtotal
 		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+		    if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
 		    {
 		        
 		        $this->resprints = ' ';
@@ -1388,37 +1388,37 @@ 
 		return 0;
 	}
 	
-	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+	function pdf_getlineremisepercent($parameters = array(), &$object, &$action = '') {
+	    global $conf, $hideprices, $hookmanager;
 
-        if(is_array($parameters)) $i = & $parameters['i'];
+        if (is_array($parameters)) $i = & $parameters['i'];
         else $i = (int) $parameters;
 
-		if($this->isModSubtotalLine($parameters,$object) ) {
+		if ($this->isModSubtotalLine($parameters, $object)) {
 			$this->resprints = ' ';
 
             $line = $object->lines[$i];
 
             // Affichage de la remise 
-            if(TSubtotal::isSubtotal($line)) {
+            if (TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->array_options['options_show_reduc'])) {
+                if (empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if (!empty($parentTitle->array_options['options_show_reduc'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
-                    $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
+                    $this->resprints = price((1 - $TTotal['total_ht'] / $TTotal['total_subprice']) * 100, 0, '', 1, 2, 2).'%';
                 }
             }
 		
-			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)
-		        || (!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)))
@@ -1431,24 +1431,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)))
@@ -1461,22 +1461,22 @@ 
 		return 0;
 	}
 	
-	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
-	    global $conf,$hideprices,$hookmanager;
+	function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') {
+	    global $conf, $hideprices, $hookmanager;
 	    
-		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)
 
@@ -1503,7 +1503,7 @@ 
 		    
 		    // Check if a title exist for this line && if the title have subtotal
 		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
+		    if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
 		    {
 		        
 		        $this->resprints = ' ';
@@ -1517,23 +1517,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)))
 			{
@@ -1548,12 +1548,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)
 				{
@@ -1567,12 +1567,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;
@@ -1582,7 +1582,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 = '';
@@ -1608,26 +1608,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;
 		}
 		
@@ -1635,43 +1635,43 @@ 
 		
 		$this->add_numerotation($object);	
 		
-        foreach($object->lines as $k => &$l) {
-            if(TSubtotal::isSubtotal($l)) {
+        foreach ($object->lines as $k => &$l) {
+            if (TSubtotal::isSubtotal($l)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
-                if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
-                    $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
+                if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if (!empty($parentTitle->id) && !empty($parentTitle->array_options['options_show_total_ht'])) {
+                    $l->remise_percent = 100; // Affichage de la réduction sur la ligne de sous-total
                 }
             }
 
 
             // Pas de hook sur les colonnes du PDF expédition, on unset les bonnes variables
-            if(($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
+            if (($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
 			{
 				$l->qty = $l->qty_asked;
 				unset($l->qty_asked, $l->qty_shipped, $l->volume, $l->weight);
 			}
         }
 
-		$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, '');
 						
@@ -1700,22 +1700,22 @@ 
 			
 				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 = '';
@@ -1736,7 +1736,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; 
@@ -1764,9 +1764,9 @@ 
 			
 			// 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 = '';
@@ -1783,11 +1783,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;
 			}
@@ -1796,55 +1796,55 @@ 
 		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($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
+				if ($object->element == 'delivery' && !empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
 
-				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);
@@ -1855,9 +1855,9 @@ 
 					}
 
 					// On delivery PDF, we don't want quantities to appear and there are no hooks => setting text color to background color;
-					if($object->element == 'delivery')
+					if ($object->element == 'delivery')
 					{
-						switch($line->qty)
+						switch ($line->qty)
 						{
 							case 99:
 								$grey = 220;
@@ -1880,7 +1880,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();	
 
 					
@@ -1896,9 +1896,9 @@ 
 					}
 				*/
 
-					if($object->element == 'delivery')
+					if ($object->element == 'delivery')
 					{
-						$pdf->SetTextColor(255,255,255);
+						$pdf->SetTextColor(255, 255, 255);
 					}
 
 					$posy = $pdf->GetY();
@@ -1961,9 +1961,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'];
@@ -1971,33 +1971,33 @@ 
 		
 		$var = &$parameters['var'];
 
-		$contexts = explode(':',$parameters['context']);
+		$contexts = explode(':', $parameters['context']);
 
 		$originline = null;
 
 		$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;
 		}
-		elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
+		elseif ($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
 		{
 			// H4cK 4n0nYm0u$-style : $line n'est pas un objet instancié mais provient d'un fetch_object d'une requête SQL
 			$line->id = $line->rowid;
 			$line->product_type = $line->type;
 		}
-		elseif($object->element == 'shipping' || $object->element == 'delivery')
+		elseif ($object->element == 'shipping' || $object->element == 'delivery')
 		{
-			if(empty($line->origin_line_id) && ! empty($line->fk_origin_line))
+			if (empty($line->origin_line_id) && !empty($line->fk_origin_line))
 			{
 				$line->origin_line_id = $line->fk_origin_line;
 			}
@@ -2005,9 +2005,9 @@ 
 			$originline = new OrderLine($db);
 			$originline->fetch($line->fk_origin_line);
 
-			foreach(get_object_vars($line) as $property => $value)
+			foreach (get_object_vars($line) as $property => $value)
 			{
-				if(empty($originline->{ $property }))
+				if (empty($originline->{ $property }))
 				{
 					$originline->{ $property } = $value;
 				}
@@ -2016,15 +2016,15 @@ 
 			$line = $originline;
 		}
 
-		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">
@@ -2048,22 +2048,22 @@ 
 				<?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') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
-			if($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
-			if($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
-			if(!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
+			if ($object->element == 'facturerec') $colspan = 3;
+			if ($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
+			if ($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4 : $colspan = 7;
+			if ($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
+			if (!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
 				$colspan++; // Colonne PU Devise
 			}
-			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 == '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);
@@ -2073,39 +2073,39 @@ 
             
 			
 			?>
-			<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;';
 					}
 
 			?>;">
 
-				<?php if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+				<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
 				<td class="linecolnum"><?php echo $i + 1; ?></td>
 				<?php } ?>
 
-				<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">';
@@ -2113,7 +2113,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;
@@ -2135,13 +2135,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 = '';
 							}
 						}
 
@@ -2150,10 +2150,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>';
@@ -2167,7 +2167,7 @@ 
 
 						echo '<div class="subtotal_underline" style="margin-left:24px; line-height: 25px;">';
                         echo '<div>';
-                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' />&nbsp;';
                         echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
                         echo '</div>';
 
@@ -2188,21 +2188,21 @@ 
                                 echo '</div>';
                             }
                             echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showTotalHT" id="subtotal-showTotalHT" value="9" '.(($line->array_options['options_show_total_ht'] > 0) ? 'checked="checked"' : '').' />&nbsp;';
                             echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
                             echo '</div>';
 
                             echo '<div>';
-                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
+                            echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '').' />&nbsp;';
                             echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
                             echo '</div>';
                         }
                         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)) {
@@ -2222,25 +2222,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);
@@ -2248,16 +2248,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');
 
 						 
 
@@ -2266,7 +2266,7 @@ 
 			?></td>
 					 
 			<?php
-				if($line->qty>90) {
+				if ($line->qty > 90) {
 					/* Total */
 					$total_line = $this->getTotalLineFromObject($object, $line, '');
 					echo '<td class="linecolht nowrap" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>';
@@ -2285,7 +2285,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 />
@@ -2301,13 +2301,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) && ( $line->fk_prev_id === null )) 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) && ($line->fk_prev_id === null)) 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>';
 						}								
@@ -2322,7 +2322,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 ($line->fk_prev_id === null)
@@ -2330,12 +2330,12 @@ 
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>';
 							}
 
-							if(TSubtotal::isTitle($line) && ($line->fk_prev_id === null) )
+							if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null))
 							{
 								if ((float) DOL_VERSION >= 8.0) {
 									$img_delete = img_delete($langs->trans('deleteWithAllLines'), ' class="pictodelete pictodeleteallline"');
 								} elseif ((float) DOL_VERSION >= 3.8) {
-									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal',' class="pictodelete" ');
+									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal', ' class="pictodelete" ');
 								} else {
 									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
 								}
@@ -2345,7 +2345,7 @@ 
 								/* Depuis la 8.0, les icônes "standard" utilisent FontAwesome et sont préconfigurées selon la clé de l'image
 								 * Impossible d'en customiser par exemple la couleur, même en utilisant img_picto() directement
 								 */
-								if((float) DOL_VERSION >= 8.0) {
+								if ((float) DOL_VERSION >= 8.0) {
 								?>
 								<script>
 									$(document).ready(function () {
@@ -2361,7 +2361,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"' : '').' />';
@@ -2372,12 +2372,12 @@ 
 			<td align="center" class="linecolmove 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>
@@ -2385,29 +2385,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(){
@@ -2415,7 +2415,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;';
@@ -2454,61 +2454,61 @@ 
 			return 1;	
 			
 		}
-		elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
+		elseif (($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
 		{
 			$colspan = 4;
 
 			// HTML 5 data for js
 			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
 ?>
-			<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 style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
+				<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
 
 
 						 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);
@@ -2516,22 +2516,22 @@ 
 						 }
 						 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->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
 
 			?>
 				</td>
 				 <td colspan="<?php echo $colspan; ?>">
 <?php
-						if(in_array('expeditioncard', $contexts) && $action == 'create')
+						if (in_array('expeditioncard', $contexts) && $action == 'create')
 						{
 							$fk_entrepot = GETPOST('entrepot_id', 'int');
 ?>
@@ -2558,100 +2558,100 @@ 
 			$shipment_static = new Expedition($db);
 			$warehousestatic = new Entrepot($db);
 			$extrafieldsline = new ExtraFields($db);
-			$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
+			$extralabelslines = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
 			$colspan = 4;
-			if($object->origin && $object->origin_id > 0) $colspan++;
-			if(! empty($conf->stock->enabled)) $colspan++;
-			if(! empty($conf->productbatch->enabled)) $colspan++;
-			if($object->statut == 0) $colspan++;
-			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
+			if ($object->origin && $object->origin_id > 0) $colspan++;
+			if (!empty($conf->stock->enabled)) $colspan++;
+			if (!empty($conf->productbatch->enabled)) $colspan++;
+			if ($object->statut == 0) $colspan++;
+			if ($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
 
-			if($object->element == 'delivery') $colspan = 2;
+			if ($object->element == 'delivery') $colspan = 2;
 
 			print '<!-- origin line id = '.$line->origin_line_id.' -->'; // id of order line
 
 			// HTML 5 data for js
 			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
 			?>
-			<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;';
 					}
 
 			?>;">
 
 			<?php
 			// #
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
 			{
-				print '<td align="center">'.($i+1).'</td>';
+				print '<td align="center">'.($i + 1).'</td>';
 			}
 			?>
 
-			<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
+			<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
 
 
 			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);
 				else print  $line->description;
 			}
 			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->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
 
 			?>
 				</td>
 				<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
 			<?php
 
-			if ($object->element == 'shipping' && $object->statut == 0 && ! empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
+			if ($object->element == 'shipping' && $object->statut == 0 && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
 			{
 				print '<td class="linecoldelete nowrap" width="10">';
 
@@ -2660,12 +2660,12 @@ 
 					echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">'.img_delete().'</a>';
 				}
 
-				if(TSubtotal::isTitle($line) && ($line->fk_prev_id === null) )
+				if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null))
 				{
 					if ((float) DOL_VERSION >= 8.0) {
 						$img_delete = img_delete($langs->trans('deleteWithAllLines'), ' class="pictodelete pictodeleteallline"');
 					} elseif ((float) DOL_VERSION >= 3.8) {
-						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal',' class="pictodelete" ');
+						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal', ' class="pictodelete" ');
 					} else {
 						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
 					}
@@ -2675,7 +2675,7 @@ 
 					/* Depuis la 8.0, les icônes "standard" utilisent FontAwesome et sont préconfigurées selon la clé de l'image
 					 * Impossible d'en customiser par exemple la couleur, même en utilisant img_picto() directement
 					 */
-					if((float) DOL_VERSION >= 8.0) {
+					if ((float) DOL_VERSION >= 8.0) {
 						?>
 							<script>
 								$(document).ready(function () {
@@ -2693,11 +2693,11 @@ 
 			print "</tr>";
 
 			// Display lines extrafields
-			if ($object->element == 'shipping' && ! empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE) && is_array($extralabelslines) && count($extralabelslines)>0) {
+			if ($object->element == 'shipping' && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE) && is_array($extralabelslines) && count($extralabelslines) > 0) {
 				$line = new ExpeditionLigne($db);
 				$line->fetch_optionals($line->id);
 				print '<tr class="oddeven">';
-				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$i);
+				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan), $i);
 			}
 
 			return 1;
@@ -2709,20 +2709,20 @@ 
 
 	
 	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')
 		{
 		    
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
+		    if ($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
 		    {
 		        foreach ($object->lines as $line)
 		        {
 		            // fetch optionals attributes and labels
 		            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
-		            $extrafields=new ExtraFields($this->db);
-		            $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
-		            $line->fetch_optionals($line->id,$extralabels);
+		            $extrafields = new ExtraFields($this->db);
+		            $extralabels = $extrafields->fetch_name_optionals_label($object->table_element_line, true);
+		            $line->fetch_optionals($line->id, $extralabels);
 		        }
 		    }
 		    
@@ -2822,23 +2822,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;
 	    }
@@ -2851,14 +2851,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;
@@ -2866,26 +2866,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)
 	    {
 	        
 	        ?>
@@ -2903,7 +2903,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");

Braces +521 added lines, -312 removed lines

@@ -45,7 +45,9 @@ 
 				$value = '';
 				$sql = 'SELECT content FROM '.MAIN_DB_PREFIX.'c_subtotal_free_text WHERE rowid = '.GETPOST('rowid');
 				$resql = $this->db->query($sql);
-				if ($resql && ($obj = $this->db->fetch_object($resql))) $value = $obj->content;
+				if ($resql && ($obj = $this->db->fetch_object($resql))) {
+					$value = $obj->content;
+				}
 			}
 			
 			?>
@@ -124,8 +126,7 @@ 
 			} elseif($object->element == 'invoice_supplier' )
 			{
 			    $createRight = $user->rights->fournisseur->facture->creer;
-			}
-			elseif($object->element == 'shipping')
+			} elseif($object->element == 'shipping')
 			{
 				$createRight = true; // No rights management for shipments
 			}
@@ -133,8 +134,11 @@ 
 			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')) )
 				{
@@ -142,10 +146,11 @@ 
 					
 					if($action=='add_title_line') {
 						$title = GETPOST('title');
-						if(empty($title)) $title = $langs->trans('title');
+						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)) {
@@ -157,29 +162,31 @@ 
 								}
 							}
 						}
-						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 {
+					} else {
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
 						$qty = $level ? 100-$level : 99;
 					}
 					dol_include_once('/subtotal/class/subtotal.class.php');
 					
-					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) TSubtotal::addSubtotalMissing($object, $qty);
+					if (!empty($conf->global->SUBTOTAL_AUTO_ADD_SUBTOTAL_ON_ADDING_NEW_TITLE) && $qty < 10) {
+						TSubtotal::addSubtotalMissing($object, $qty);
+					}
 					
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
-				}
-				else if($action==='ask_deleteallline') {
+				} else if($action==='ask_deleteallline') {
 						$form=new Form($db);
 
 						$lineid = GETPOST('lineid','integer');
@@ -202,8 +209,7 @@ 
 					$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">
@@ -221,8 +227,13 @@ 
      
 	function printNewFormat(&$object, &$conf, &$langs, $idvar)
 	{
-		if (empty($conf->global->SUBTOTAL_ALLOW_ADD_BLOCK)) return false;
-		if ($line->fk_prev_id != null && !empty($line->fk_prev_id)) return false; // Si facture de situation
+		if (empty($conf->global->SUBTOTAL_ALLOW_ADD_BLOCK)) {
+			return false;
+		}
+		if ($line->fk_prev_id != null && !empty($line->fk_prev_id)) {
+			return false;
+		}
+		// Si facture de situation
 		?>
 		 	<script type="text/javascript">
 				$(document).ready(function() {
@@ -508,8 +519,7 @@ 
 				}
 				
 				
-			}	
-			else{
+			} else{
 				$substitutionarray['line_not_modsubtotal'] = true;
 				$substitutionarray['line_modsubtotal'] = 0;
 			}
@@ -567,8 +577,11 @@ 
 		
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
 		
-		if($object->element=='facture') $idvar = 'facid';
-		else $idvar = 'id';
+		if($object->element=='facture') {
+			$idvar = 'facid';
+		} else {
+			$idvar = 'id';
+		}
 			
 		if ($action == 'updateligne' || $action == 'updateline')
 		{
@@ -598,8 +611,7 @@ 
 				header('Location: '.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id);
 				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']))
@@ -614,33 +626,27 @@ 
 					$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';
-				}
-				else {
+				} else {
 					$sessname = 'subtotal_hideInnerLines_unknown';
 					$sessname2 = 'subtotal_hidedetails_unknown';
 					$sessname3 = 'subtotal_hideprices_unknown';
@@ -649,15 +655,24 @@ 
 				global $hideprices;
 				
 				$hideInnerLines = (int)GETPOST('hideInnerLines');
-				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) $_SESSION[$sessname] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) {
+					$_SESSION[$sessname] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname][$object->id] = $hideInnerLines;		
 				
 				$hidedetails= (int)GETPOST('hidedetails');
-				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) $_SESSION[$sessname2] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) {
+					$_SESSION[$sessname2] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname2][$object->id] = $hidedetails;
 				
 				$hideprices= (int)GETPOST('hideprices');
-				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) $_SESSION[$sessname3] = array(); // prevent old system
+				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) {
+					$_SESSION[$sessname3] = array();
+				}
+				// prevent old system
 				$_SESSION[$sessname3][$object->id] = $hideprices;
 				
 				foreach($object->lines as &$line) {
@@ -665,8 +680,7 @@ 
 					    
                         if($line->qty>=90) {
                             $line->modsubtotal_total = 1;
-                        }
-                        else{
+                        } else{
                             $line->modsubtotal_title = 1;
                         }
                         
@@ -675,8 +689,7 @@ 
 	        	}
 	        }
 			
-		}
-		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'));
 			
@@ -684,7 +697,9 @@ 
 				/**
 				 * @var $object Facture
 				 */
-				if($object->element=='facture') $object->deleteline($idLine);
+				if($object->element=='facture') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Facture fournisseur
 				 */
@@ -695,18 +710,25 @@ 
 				/**
 				 * @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') 
 				{
-					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
-					else $object->deleteline($idLine);
+					if ((float) DOL_VERSION >= 5.0) {
+						$object->deleteline($user, $idLine);
+					} else {
+						$object->deleteline($idLine);
+					}
 				}
 				/**
 				 * @var $object Commande fournisseur
@@ -718,25 +740,32 @@ 
 				/**
 				 * @var $object Facturerec
 				 */
-				else if($object->element=='facturerec') $object->deleteline($idLine);
+				else if($object->element=='facturerec') {
+					$object->deleteline($idLine);
+				}
 				/**
 				 * @var $object Expedition
 				 */
-				else if($object->element=='shipping') $object->deleteline($user, $idLine);
+				else if($object->element=='shipping') {
+					$object->deleteline($user, $idLine);
+				}
 			}
 			
 			header('location:?id='.$object->id);
 			exit;
 			
-		}
-		else if ($action == 'duplicate')
+		} else if ($action == 'duplicate')
 		{
 			$lineid = GETPOST('lineid', 'int');
 			$nbDuplicate = TSubtotal::duplicateLines($object, $lineid, true);
 			
-			if ($nbDuplicate > 0) setEventMessage($langs->trans('subtotal_duplicate_success', $nbDuplicate));
-			elseif ($nbDuplicate == 0) setEventMessage($langs->trans('subtotal_duplicate_lineid_not_found'), 'warnings');
-			else setEventMessage($langs->trans('subtotal_duplicate_error'), 'errors');
+			if ($nbDuplicate > 0) {
+				setEventMessage($langs->trans('subtotal_duplicate_success', $nbDuplicate));
+			} elseif ($nbDuplicate == 0) {
+				setEventMessage($langs->trans('subtotal_duplicate_lineid_not_found'), 'warnings');
+			} else {
+				setEventMessage($langs->trans('subtotal_duplicate_error'), 'errors');
+			}
 			
 			header('Location: ?id='.$object->id);
 			exit;
@@ -754,21 +783,26 @@ 
 		global $conf;
 		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && !empty($object->table_element_line) && in_array($object->element, array('commande', 'facture', 'propal')))
 		{
-			if ($object->element == 'commande')
-				$obj = new OrderLine($object->db);
-			if ($object->element == 'propal')
-				$obj = new PropaleLigne($object->db);
-			if ($object->element == 'facture')
-				$obj = new FactureLigne($object->db);
+			if ($object->element == 'commande') {
+							$obj = new OrderLine($object->db);
+			}
+			if ($object->element == 'propal') {
+							$obj = new PropaleLigne($object->db);
+			}
+			if ($object->element == 'facture') {
+							$obj = new FactureLigne($object->db);
+			}
 			if (!empty($parameters['fk_element']))
 			{
 				
 				if($obj->fetch($parameters['fk_element'])){
 					$obj->id= $obj->rowid;
-					if (empty($obj->array_options))
-						$obj->fetch_optionals();
-					if (!empty($obj->array_options['options_subtotal_nc']))
-						return 1;
+					if (empty($obj->array_options)) {
+											$obj->fetch_optionals();
+					}
+					if (!empty($obj->array_options['options_subtotal_nc'])) {
+											return 1;
+					}
 				}
 			}
 		}
@@ -840,27 +874,33 @@ 
 		$TTotal_tva = array();
 		
 		$sign=1;
-		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
+		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) {
+			$sign=-1;
+		}
 		
-		if (GETPOST('action') == 'builddoc') $builddoc = true;
-		else $builddoc = false;
+		if (GETPOST('action') == 'builddoc') {
+			$builddoc = true;
+		} else {
+			$builddoc = false;
+		}
 		
 		dol_include_once('/subtotal/class/subtotal.class.php');
 		foreach($object->lines as $l) {
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
 			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)) 
+				if (!$return_all) {
+					return $total;
+				} else {
+					return array($total, $total_tva, $total_ttc, $TTotal_tva);
+				}
+			} 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)) {
 				
 				// TODO retirer le test avec $builddoc quand Dolibarr affichera le total progression sur la card et pas seulement dans le PDF
 				if ($builddoc && $object->element == 'facture' && $object->type==Facture::TYPE_SITUATION)
@@ -882,8 +922,7 @@ 
 						$TTotal_tva[$l->tva_tx] += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
 						$total_ttc += $sign * ($l->total_tva / ($l->total_ttc / 100)) * $progress;
 					}
-				}
-				else
+				} else
 				{
 					$total += $l->total_ht;
 					$total_tva += $l->total_tva;
@@ -893,8 +932,11 @@ 
 			}
 			
 		}
-		if (!$return_all) return $total;
-		else return array($total, $total_tva, $total_ttc, $TTotal_tva);
+		if (!$return_all) {
+			return $total;
+		} else {
+			return array($total, $total_tva, $total_ttc, $TTotal_tva);
+		}
 	}
 
 	/**
@@ -941,15 +983,18 @@ 
 		}
 		
 			
-		if($line->qty==99)
-			$pdf->SetFillColor(220,220,220);
-		elseif ($line->qty==98)
-			$pdf->SetFillColor(230,230,230);
-		else
-			$pdf->SetFillColor(240,240,240);
+		if($line->qty==99) {
+					$pdf->SetFillColor(220,220,220);
+		} elseif ($line->qty==98) {
+					$pdf->SetFillColor(230,230,230);
+		} else {
+					$pdf->SetFillColor(240,240,240);
+		}
 		
 		$style = 'B';
-		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
+		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) {
+			$style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
+		}
 		
 		$pdf->SetFont('', $style, 9);
 		
@@ -991,8 +1036,7 @@ 
 //					$line->total_tva
 //					$line->total
 //					$line->total_ttc
-				}
-				else
+				} else
 				{
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 					$total_to_print = price($total);
@@ -1005,11 +1049,14 @@ 
 			}
 
 			$pdf->SetXY($pdf->postotalht, $posy);
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
+			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;
@@ -1041,25 +1088,40 @@ 
 		
  
 		$style = ($line->qty==1) ? 'BU' : 'BUI';
-		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
+		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) {
+			$style = $conf->global->SUBTOTAL_TITLE_STYLE;
+		}
 		
 		if($hideInnerLines) {
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
-			else 
+			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;
+				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) {
+					$style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
+				}
 				$pdf->SetFont('', $style, 9);
 			}
-		}
-		else {
+		} else {
 
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
-			else $pdf->SetFont('', $style, 9);
+			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
+		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
 		
 		if($description && !$hidedesc) {
 			$posy = $pdf->GetY();
@@ -1083,8 +1145,7 @@ 
 		
 		if(is_array($parameters)) {
 			$i = & $parameters['i'];	
-		}
-		else {
+		} else {
 			$i = (int)$parameters;
 		}
 
@@ -1114,17 +1175,14 @@ 
 			
 			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))
+		} elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
 		{
 			$hideInnerLines = (int)GETPOST('hideInnerLines');
 			$hidedetails = (int)GETPOST('hidedetails');
@@ -1134,12 +1192,20 @@ 
 			}
 		}
 		
-		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)
+		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)
 		
-		if(empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals();
+		if(empty($object->lines[$i]->array_options)) {
+			$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])) )
 		{
@@ -1156,8 +1222,11 @@ 
 	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
 	    global $conf, $hideprices, $hookmanager;
 		
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 			
 		if($this->isModSubtotalLine($parameters,$object) ){
 			
@@ -1165,13 +1234,11 @@ 
 			
 			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))
+		} elseif (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS))
 		{
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
 			{
@@ -1243,12 +1310,10 @@ 
 			$this->error = $hookmanager->error;
 			$this->errors = $hookmanager->errors;
 			return -1;
-		}
-		elseif (empty($reshook))
+		} elseif (empty($reshook))
 		{
 			$this->resprints .= $hookmanager->resprints;
-		}
-		else
+		} else
 		{
 			$this->resprints = $hookmanager->resprints;
 
@@ -1271,14 +1336,16 @@ 
 		
 			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])) ) 
 		{
@@ -1300,14 +1367,16 @@ 
 		
 			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])) )
 		{
@@ -1324,8 +1393,11 @@ 
 	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
 	    global $conf,$hideprices,$hookmanager;
 
-		if(is_array($parameters)) $i = & $parameters['i'];
-		else $i = (int)$parameters;
+		if(is_array($parameters)) {
+			$i = & $parameters['i'];
+		} else {
+			$i = (int)$parameters;
+		}
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
@@ -1336,7 +1408,9 @@ 
             if(TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(is_object($parentTitle) && empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->array_options['options_show_total_ht'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
                     $this->resprints = price($TTotal['total_subprice']);
@@ -1345,8 +1419,7 @@ 
 		
 			if((float)DOL_VERSION<=3.6) {
 				return '';
-			}
-			else if((float)DOL_VERSION>=3.8) {
+			} else if((float)DOL_VERSION>=3.8) {
 				return 1;
 			}
 		}
@@ -1391,8 +1464,11 @@ 
 	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
 	    global $conf,$hideprices,$hookmanager;
 
-        if(is_array($parameters)) $i = & $parameters['i'];
-        else $i = (int) $parameters;
+        if(is_array($parameters)) {
+        	$i = & $parameters['i'];
+        } else {
+        	$i = (int) $parameters;
+        }
 
 		if($this->isModSubtotalLine($parameters,$object) ) {
 			$this->resprints = ' ';
@@ -1403,7 +1479,9 @@ 
             if(TSubtotal::isSubtotal($line)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
 
-                if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->array_options['options_show_reduc'])) {
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
                     $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
@@ -1412,12 +1490,10 @@ 
 		
 			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)
 		        || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
 		        )
 		    {
@@ -1438,14 +1514,16 @@ 
 			$this->resprints = ' ';
 			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])) )
@@ -1469,16 +1547,21 @@ 
 			
 			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)
+		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();
 		// Si la gestion C/NC est active et que je suis sur un ligne dont l'extrafield est coché
@@ -1524,14 +1607,16 @@ 
 			$this->resprints = ' ';
 			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])) )
 		{
@@ -1561,7 +1646,9 @@ 
 				}
 			}
 			
-			if (!empty($TLineTitle)) $TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			if (!empty($TLineTitle)) {
+				$TTitleNumeroted = $this->formatNumerotation($TLineTitle);
+			}
 		}
 		
 	}
@@ -1575,8 +1662,12 @@ 
 		$j=0;
 		foreach ($TLineTitle as $k => &$line)
 		{
-			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
-			if (!empty($line_reference) && $line->qty <= $line_reference->qty) break;
+			if (!empty($line_reference) && $line->rang <= $line_reference->rang) {
+				continue;
+			}
+			if (!empty($line_reference) && $line->qty <= $line_reference->qty) {
+				break;
+			}
 			
 			if ($line->qty == $level)
 			{
@@ -1610,7 +1701,9 @@ 
 		
 		$hidedetails = (int)GETPOST('hidedetails');
 		
-		if(empty($hidedetails)) return false;
+		if(empty($hidedetails)) {
+			return false;
+		}
 		
 		// TODO can't add VAT to document without lines... :-/
 		
@@ -1638,7 +1731,9 @@ 
         foreach($object->lines as $k => &$l) {
             if(TSubtotal::isSubtotal($l)) {
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
+                if(is_object($parentTitle) && empty($parentTitle->array_options)) {
+                	$parentTitle->fetch_optionals();
+                }
                 if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
                     $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
                 }
@@ -1680,7 +1775,9 @@ 
 						*/
 						list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
 						
-						if (TSubtotal::getNiveau($line) == 1) $line->TTotal_tva = $TTotal_tva;
+						if (TSubtotal::getNiveau($line) == 1) {
+							$line->TTotal_tva = $TTotal_tva;
+						}
 						$line->total_ht = $total;
 						$line->total_tva = $total_tva;
 						$line->total = $line->total_ht;
@@ -1744,8 +1841,7 @@ 
 				    }
 				    
 					
-				}
-				elseif ($hidedetails)
+				} elseif ($hidedetails)
 				{
 					$TLines[] = $line; //Cas où je cache uniquement les prix des produits	
 				}
@@ -1816,13 +1912,17 @@ 
 				
 				if(!empty($hideprices)) {
 					foreach($object->lines as &$line) {
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;	
+						if($line->fk_product_type!=9) {
+							$line->fk_parent_line = -1;
+						}
 					}
 				}
 			
 				$line = &$object->lines[$i];
 
-				if($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
+				if($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) {
+					unset($object->commande->expeditions[$line->fk_origin_line]);
+				}
 
 				if($line->info_bits>0) { // PAGE BREAK
 					$pdf->addPage();
@@ -1838,7 +1938,9 @@ 
 				}
 
 				if($line->qty>90) {
-					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)	$label .= ' '.$this->getTitle($object, $line);
+					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);
@@ -1876,8 +1978,7 @@ 
 				
 					$posy = $pdf->GetY();
 					return 1;
-				}	
-				else if ($line->qty < 10) {
+				} else if ($line->qty < 10) {
 					$pageBefore = $pdf->getPage();
 
 					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); 
@@ -1907,8 +2008,7 @@ 
 //	if($line->rowid==47) exit;
 			
 			return 0;
-		}
-		elseif (empty($object->lines[$parameters['i']]))
+		} elseif (empty($object->lines[$parameters['i']]))
 		{
 			$this->resprints = -1;
 		}
@@ -1941,7 +2041,9 @@ 
 		
 		foreach ($object->lines as $line)
 		{
-			if ($line->id == $currentLine->id) break;
+			if ($line->id == $currentLine->id) {
+				break;
+			}
 			
 			$qty_search = 100 - $currentLine->qty;
 			
@@ -1980,22 +2082,18 @@ 
 		{
 			$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;
-		}
-		elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
+		} elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
 		{
 			// H4cK 4n0nYm0u$-style : $line n'est pas un objet instancié mais provient d'un fetch_object d'une requête SQL
 			$line->id = $line->rowid;
 			$line->product_type = $line->type;
-		}
-		elseif($object->element == 'shipping' || $object->element == 'delivery')
+		} elseif($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			if(empty($line->origin_line_id) && ! empty($line->fk_origin_line))
 			{
@@ -2018,11 +2116,13 @@ 
 
 		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)
 			{
@@ -2048,22 +2148,44 @@ 
 				<?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') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
-			if($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
-			if($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
+			if($object->element == 'facturerec' ) {
+				$colspan = 3;
+			}
+			if($object->element == 'order_supplier') {
+				(float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
+			}
+			if($object->element == 'invoice_supplier') {
+				(float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
+			}
+			if($object->element == 'supplier_proposal') {
+				(float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
+			}
 			if(!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
 				$colspan++; // Colonne PU Devise
 			}
-			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 == '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);
@@ -2076,23 +2198,36 @@ 
 			<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 '';
-						else print 'background:#eeeeff;';
+						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 
+					} 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;' ;
+						}
 					}
 
 			?>;">
@@ -2119,13 +2254,11 @@ 
 							$qty_displayed = $line->qty;
 							print img_picto('', 'subsubtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;color:#0075DE;">'.$qty_displayed.'</span>&nbsp;&nbsp;';
 							
-						}
-						else if (TSubtotal::isSubtotal($line))
+						} else if (TSubtotal::isSubtotal($line))
 						{
 							$qty_displayed = 100 - $line->qty;
 							print img_picto('', 'subsubtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;color:#0075DE;">'.$qty_displayed.'</span>&nbsp;&nbsp;';
-						}
-						else
+						} else
 						{
 							$isFreeText = true;
 						}
@@ -2146,9 +2279,13 @@ 
 						}
 
 						$readonlyForSituation = '';
-						if (!empty($line->fk_prev_id) && $line->fk_prev_id != null) $readonlyForSituation = 'readonly';
+						if (!empty($line->fk_prev_id) && $line->fk_prev_id != null) {
+							$readonlyForSituation = 'readonly';
+						}
 						
-						if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
+						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)) )
 						{
@@ -2156,8 +2293,12 @@ 
 							for ($j=1; $j<10; $j++)
 							{
 								if (!empty($readonlyForSituation)) {
-									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
-								} else $select .= '<option '.($qty_displayed == $j ? 'selected="selected"' : '').' value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+									if ($qty_displayed == $j) {
+										$select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+									}
+								} else {
+									$select .= '<option '.($qty_displayed == $j ? 'selected="selected"' : '').' value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
+								}
 							}
 							$select .= '</select>&nbsp;';
 
@@ -2177,7 +2318,9 @@ 
                             echo '<div>';
                             echo '<label for="subtotal_tva_tx">'.$form->textwithpicto($langs->trans('subtotal_apply_default_tva'), $langs->trans('subtotal_apply_default_tva_help')).'</label>';
                             echo '<select id="subtotal_tva_tx" name="subtotal_tva_tx" class="flat"><option selected="selected" value="">-</option>';
-                            if (empty($readonlyForSituation)) echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+                            if (empty($readonlyForSituation)) {
+                            	echo str_replace('selected', '', $form->load_tva('subtotal_tva_tx', '', $parameters['seller'], $parameters['buyer'], 0, 0, '', true));
+                            }
                             echo '</select>';
                             echo '</div>';
 
@@ -2196,8 +2339,9 @@ 
                             echo '<input style="vertical-align:sub;"  type="checkbox" name="line-showReduc" id="subtotal-showReduc" value="1" '.(($line->array_options['options_show_reduc'] > 0) ? 'checked="checked"' : '') .' />&nbsp;';
                             echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
                             echo '</div>';
+                        } else if ($isFreeText) {
+                        	echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
                         }
-                        else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
 						echo '</div>';
 
 						if($line->qty<10) {
@@ -2217,8 +2361,7 @@ 
 							$doleditor->Create();
 						}
 						
-					}
-					else {
+					} else {
 
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
 						 {
@@ -2226,14 +2369,19 @@ 
 							{
 								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;';
+								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 
+						 } 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;';
+							}
 						 }
 						 
 						 
@@ -2243,21 +2391,26 @@ 
 						 $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);
-							else print  $line->description;
-						 } 
-						 else {
+							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+								print  $line->description.' '.$this->getTitle($object, $line);
+							} else {
+								print  $line->description;
+							}
+						 } else {
 
 							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');
+						}
 
 						 
 
@@ -2300,11 +2453,12 @@ 
 						</script>
 						<?php
 						
-					}
-					else{
+					} else{
 						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
 						{
-							if(TSubtotal::isTitle($line) && ( $line->fk_prev_id === null )) 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) && ( $line->fk_prev_id === null )) {
+								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)) 
@@ -2394,7 +2548,9 @@ 
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 				
 				$colspan+=3; $mode = 'view';
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
+				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
@@ -2453,8 +2609,7 @@ 
 			
 			return 1;	
 			
-		}
-		elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
+		} elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
 		{
 			$colspan = 4;
 
@@ -2464,23 +2619,36 @@ 
 			<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 '';
-						else print 'background:#eeeeff;';
+						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
+					} 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;' ;
+						}
 					}
 
 			?>;">
@@ -2494,14 +2662,19 @@ 
 							{
 								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;';
+								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
+						 } 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;';
+							}
 						 }
 
 
@@ -2511,21 +2684,24 @@ 
 						 $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);
-							else print  $line->description;
-						 }
-						 else {
+							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+								print  $line->description.' '.$this->getTitle($object, $line);
+							} else {
+								print  $line->description;
+							}
+						 } else {
 
 							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->info_bits > 0) {
+							echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+						}
 
 			?>
 				</td>
@@ -2548,8 +2724,7 @@ 
 			</tr>
 <?php
 			return 1;
-		}
-		elseif ($object->element == 'shipping' || $object->element == 'delivery')
+		} elseif ($object->element == 'shipping' || $object->element == 'delivery')
 		{
 			global $form;
 
@@ -2561,13 +2736,25 @@ 
 			$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
 
 			$colspan = 4;
-			if($object->origin && $object->origin_id > 0) $colspan++;
-			if(! empty($conf->stock->enabled)) $colspan++;
-			if(! empty($conf->productbatch->enabled)) $colspan++;
-			if($object->statut == 0) $colspan++;
-			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
+			if($object->origin && $object->origin_id > 0) {
+				$colspan++;
+			}
+			if(! empty($conf->stock->enabled)) {
+				$colspan++;
+			}
+			if(! empty($conf->productbatch->enabled)) {
+				$colspan++;
+			}
+			if($object->statut == 0) {
+				$colspan++;
+			}
+			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) {
+				$colspan++;
+			}
 
-			if($object->element == 'delivery') $colspan = 2;
+			if($object->element == 'delivery') {
+				$colspan = 2;
+			}
 
 			print '<!-- origin line id = '.$line->origin_line_id.' -->'; // id of order line
 
@@ -2577,23 +2764,36 @@ 
 			<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 '';
-						else print 'background:#eeeeff;';
+						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 
+					} 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;' ;
+						}
 					}
 
 			?>;">
@@ -2615,14 +2815,19 @@ 
 				{
 					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;';
+					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
+			} 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;';
+				}
 			}
 
 
@@ -2632,19 +2837,22 @@ 
 			$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);
-				else print  $line->description;
-			}
-			else {
+				if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) {
+					print  $line->description.' '.$this->getTitle($object, $line);
+				} else {
+					print  $line->description;
+				}
+			} else {
 				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->info_bits > 0) {
+				echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
+			}
 
 			?>
 				</td>
@@ -2824,10 +3032,9 @@ 
 	    
 	    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';
 	    }
 	    
@@ -2837,7 +3044,9 @@ 
 	    
 	    // 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) {
+	    	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	    }
 	    if ($reshook>0)
 	    {
 	        $ThtmlData = $hookmanager->resArray;