Passed
Pull Request — master (#134)
by
unknown
03:00
created
class/actions_subtotal.class.php 1 patch
Spacing   +489 added lines, -489 removed lines patch added patch discarded remove patch
@@ -16,17 +16,17 @@  discard block
 block discarded – undo
16 16
 		
17 17
 		global $type_element, $where;
18 18
 		
19
-		$contexts = explode(':',$parameters['context']);
19
+		$contexts = explode(':', $parameters['context']);
20 20
 		
21
-		if(in_array('consumptionthirdparty',$contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) {
21
+		if (in_array('consumptionthirdparty', $contexts) && in_array($type_element, array('propal', 'order', 'invoice', 'supplier_order', 'supplier_invoice', 'supplier_proposal'))) {
22 22
 			$mod_num = TSubtotal::$module_number;
23 23
 			
24 24
 			// Not a title (can't use TSubtotal class methods in sql)
25
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)';
25
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty > 9)';
26 26
 			// Not a subtotal (can't use TSubtotal class methods in sql)
27
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)';
27
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty < 90)';
28 28
 			// Not a free line text (can't use TSubtotal class methods in sql)
29
-			$where.= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)';
29
+			$where .= ' AND (d.special_code != '.$mod_num.' OR d.product_type != 9 OR d.qty != 50)';
30 30
 			
31 31
 		}
32 32
 		
@@ -105,47 +105,47 @@  discard block
 block discarded – undo
105 105
     
106 106
     function formObjectOptions($parameters, &$object, &$action, $hookmanager) 
107 107
     {
108
-      	global $langs,$db,$user, $conf;
108
+      	global $langs, $db, $user, $conf;
109 109
 		
110 110
 		$langs->load('subtotal@subtotal');
111 111
 		
112
-		$contexts = explode(':',$parameters['context']);
112
+		$contexts = explode(':', $parameters['context']);
113 113
 		
114
-		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)) {
114
+		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)) {
115 115
 			
116 116
 			$createRight = $user->rights->{$object->element}->creer;
117
-			if($object->element == 'facturerec' )
117
+			if ($object->element == 'facturerec')
118 118
 			{
119 119
 				$object->statut = 0; // hack for facture rec
120 120
 				$createRight = $user->rights->facture->creer;
121
-			} elseif($object->element == 'order_supplier' )
121
+			} elseif ($object->element == 'order_supplier')
122 122
 			{
123 123
 			    $createRight = $user->rights->fournisseur->commande->creer;
124
-			} elseif($object->element == 'invoice_supplier' )
124
+			} elseif ($object->element == 'invoice_supplier')
125 125
 			{
126 126
 			    $createRight = $user->rights->fournisseur->facture->creer;
127 127
 			}
128
-			elseif($object->element == 'shipping')
128
+			elseif ($object->element == 'shipping')
129 129
 			{
130 130
 				$createRight = true; // No rights management for shipments
131 131
 			}
132 132
 			
133
-			if ($object->statut == 0  && $createRight) {
133
+			if ($object->statut == 0 && $createRight) {
134 134
 			
135 135
 
136
-				if($object->element=='facture')$idvar = 'facid';
137
-				else $idvar='id';
136
+				if ($object->element == 'facture')$idvar = 'facid';
137
+				else $idvar = 'id';
138 138
 				
139
-				if(in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')) )
139
+				if (in_array($action, array('add_title_line', 'add_total_line', 'add_subtitle_line', 'add_subtotal_line', 'add_free_text')))
140 140
 				{
141 141
 					$level = GETPOST('level', 'int'); //New avec SUBTOTAL_USE_NEW_FORMAT
142 142
 					
143
-					if($action=='add_title_line') {
143
+					if ($action == 'add_title_line') {
144 144
 						$title = GETPOST('title');
145
-						if(empty($title)) $title = $langs->trans('title');
146
-						$qty = $level<1 ? 1 : $level ;
145
+						if (empty($title)) $title = $langs->trans('title');
146
+						$qty = $level < 1 ? 1 : $level;
147 147
 					}
148
-					else if($action=='add_free_text') {
148
+					else if ($action == 'add_free_text') {
149 149
 						$title = GETPOST('title');
150 150
 
151 151
 						if (empty($title)) {
@@ -157,21 +157,21 @@  discard block
 block discarded – undo
157 157
 								}
158 158
 							}
159 159
 						}
160
-						if(empty($title)) $title = $langs->trans('subtotalAddLineDescription');
160
+						if (empty($title)) $title = $langs->trans('subtotalAddLineDescription');
161 161
 						$qty = 50;
162 162
 					}
163
-					else if($action=='add_subtitle_line') {
163
+					else if ($action == 'add_subtitle_line') {
164 164
 						$title = GETPOST('title');
165
-						if(empty($title)) $title = $langs->trans('subtitle');
165
+						if (empty($title)) $title = $langs->trans('subtitle');
166 166
 						$qty = 2;
167 167
 					}
168
-					else if($action=='add_subtotal_line') {
168
+					else if ($action == 'add_subtotal_line') {
169 169
 						$title = $langs->trans('SubSubTotal');
170 170
 						$qty = 98;
171 171
 					}
172 172
 					else {
173 173
 						$title = GETPOST('title') ? GETPOST('title') : $langs->trans('SubTotal');
174
-						$qty = $level ? 100-$level : 99;
174
+						$qty = $level ? 100 - $level : 99;
175 175
 					}
176 176
 					dol_include_once('/subtotal/class/subtotal.class.php');
177 177
 					
@@ -179,15 +179,15 @@  discard block
 block discarded – undo
179 179
 					
180 180
 	    			TSubtotal::addSubTotalLine($object, $title, $qty);
181 181
 				}
182
-				else if($action==='ask_deleteallline') {
183
-						$form=new Form($db);
182
+				else if ($action === 'ask_deleteallline') {
183
+						$form = new Form($db);
184 184
 
185
-						$lineid = GETPOST('lineid','integer');
185
+						$lineid = GETPOST('lineid', 'integer');
186 186
 						$TIdForGroup = $this->getArrayOfLineForAGroup($object, $lineid);
187 187
 					
188 188
 						$nbLines = count($TIdForGroup);
189 189
 					
190
-						$formconfirm=$form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines',$nbLines), 'confirm_delete_all_lines','',0,1);
190
+						$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('deleteWithAllLines'), $langs->trans('ConfirmDeleteAllThisLines', $nbLines), 'confirm_delete_all_lines', '', 0, 1);
191 191
 						print $formconfirm;
192 192
 				}
193 193
 
@@ -197,13 +197,13 @@  discard block
 block discarded – undo
197 197
 				}
198 198
 
199 199
 				
200
-				if($object->element != 'shipping' && $action!='editline') {
200
+				if ($object->element != 'shipping' && $action != 'editline') {
201 201
 					// New format is for 3.8
202 202
 					$this->printNewFormat($object, $conf, $langs, $idvar);
203 203
 				}
204 204
 			}
205 205
 		}
206
-		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice',$contexts))
206
+		elseif ((!empty($parameters['currentcontext']) && $parameters['currentcontext'] == 'orderstoinvoice') || in_array('orderstoinvoice', $contexts))
207 207
 		{
208 208
 			?>
209 209
 			<script type="text/javascript">
@@ -228,7 +228,7 @@  discard block
 block discarded – undo
228 228
 				$(document).ready(function() {
229 229
 					$('div.fiche div.tabsAction').append('<br />');
230 230
 					
231
-					$('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>');
231
+					$('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>');
232 232
 					$('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>');
233 233
 					$('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>');
234 234
 
@@ -279,9 +279,9 @@  discard block
 block discarded – undo
279 279
 						$('body').append(dialog_html);
280 280
 
281 281
 						<?php 
282
-						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME)?'ckeditor':$conf->global->FCKEDITOR_EDITORNAME;
283
-						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS)?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
284
-						if($editorConf && in_array($editorTool,array('textarea','ckeditor'))){ 
282
+						$editorTool = empty($conf->global->FCKEDITOR_EDITORNAME) ? 'ckeditor' : $conf->global->FCKEDITOR_EDITORNAME;
283
+						$editorConf = empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ?false:$conf->global->FCKEDITOR_ENABLE_DETAILS;
284
+						if ($editorConf && in_array($editorTool, array('textarea', 'ckeditor'))) { 
285 285
 						?>
286 286
 						if (action == 'addTitle' || action == 'addFreeTxt')
287 287
 						{
@@ -396,62 +396,62 @@  discard block
 block discarded – undo
396 396
 		global $conf, $langs, $bc;
397 397
 			
398 398
 		$action = GETPOST('action');	
399
-		$TContext = explode(':',$parameters['context']);
399
+		$TContext = explode(':', $parameters['context']);
400 400
 		if (
401
-				in_array('invoicecard',$TContext)
402
-		        || in_array('invoicesuppliercard',$TContext)
403
-				|| in_array('propalcard',$TContext)
404
-				|| in_array('ordercard',$TContext)
405
-		        || in_array('ordersuppliercard',$TContext)
406
-				|| in_array('invoicereccard',$TContext)
401
+				in_array('invoicecard', $TContext)
402
+		        || in_array('invoicesuppliercard', $TContext)
403
+				|| in_array('propalcard', $TContext)
404
+				|| in_array('ordercard', $TContext)
405
+		        || in_array('ordersuppliercard', $TContext)
406
+				|| in_array('invoicereccard', $TContext)
407 407
 			)
408 408
 	        {	
409
-	            $hideInnerLines	= isset( $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
410
-	            $hidedetails	= isset( $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
411
-				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED)?$conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED:0;
412
-				$hideprices= isset( $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] ) ?  $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
409
+	            $hideInnerLines = isset($_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideInnerLines_'.$parameters['modulepart']][$object->id] : 0;
410
+	            $hidedetails = isset($_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hidedetails_'.$parameters['modulepart']][$object->id] : 0;
411
+				$hidepricesDefaultConf = !empty($conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED) ? $conf->global->SUBTOTAL_HIDE_PRICE_DEFAULT_CHECKED : 0;
412
+				$hideprices = isset($_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id]) ? $_SESSION['subtotal_hideprices_'.$parameters['modulepart']][$object->id] : $hidepricesDefaultConf;
413 413
 				
414
-				$var=false;
415
-		     	$out.= '<tr '.$bc[$var].'>
414
+				$var = false;
415
+		     	$out .= '<tr '.$bc[$var].'>
416 416
 		     			<td colspan="4" align="right">
417 417
 		     				<label for="hideInnerLines">'.$langs->trans('HideInnerLines').'</label>
418
-		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(( $hideInnerLines ) ? 'checked="checked"' : '' ).' />
418
+		     				<input type="checkbox" onclick="if($(this).is(\':checked\')) { $(\'#hidedetails\').prop(\'checked\', \'checked\')  }" id="hideInnerLines" name="hideInnerLines" value="1" '.(($hideInnerLines) ? 'checked="checked"' : '').' />
419 419
 		     			</td>
420 420
 		     			</tr>';
421 421
 				
422
-		     	$var=!$var;
423
-		     	$out.= '<tr '.$bc[$var].'>
422
+		     	$var = !$var;
423
+		     	$out .= '<tr '.$bc[$var].'>
424 424
 		     			<td colspan="4" align="right">
425 425
 		     				<label for="hidedetails">'.$langs->trans('SubTotalhidedetails').'</label>
426
-		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(( $hidedetails ) ? 'checked="checked"' : '' ).' />
426
+		     				<input type="checkbox" id="hidedetails" name="hidedetails" value="1" '.(($hidedetails) ? 'checked="checked"' : '').' />
427 427
 		     			</td>
428 428
 		     			</tr>';
429 429
 		     	
430
-		     	$var=!$var;
431
-		     	$out.= '<tr '.$bc[$var].'>
430
+		     	$var = !$var;
431
+		     	$out .= '<tr '.$bc[$var].'>
432 432
 		     			<td colspan="4" align="right">
433 433
 		     				<label for="hideprices">'.$langs->trans('SubTotalhidePrice').'</label>
434
-		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(( $hideprices ) ? 'checked="checked"' : '' ).' />
434
+		     				<input type="checkbox" id="hideprices" name="hideprices" value="1" '.(($hideprices) ? 'checked="checked"' : '').' />
435 435
 		     			</td>
436 436
 		     			</tr>';
437 437
 		     	
438 438
 		     	
439 439
 				 
440 440
 				if ( 
441
-					(in_array('propalcard',$TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
442
-					|| (in_array('ordercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
443
-				    || (in_array('ordersuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
444
-					|| (in_array('invoicecard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
445
-				    || (in_array('invoicesuppliercard',$TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
446
-					|| (in_array('invoicereccard',$TContext)  && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP ))
441
+					(in_array('propalcard', $TContext) && !empty($conf->global->SUBTOTAL_PROPAL_ADD_RECAP))
442
+					|| (in_array('ordercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
443
+				    || (in_array('ordersuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_COMMANDE_ADD_RECAP))
444
+					|| (in_array('invoicecard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
445
+				    || (in_array('invoicesuppliercard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
446
+					|| (in_array('invoicereccard', $TContext) && !empty($conf->global->SUBTOTAL_INVOICE_ADD_RECAP))
447 447
 				)
448 448
 				{
449
-					$var=!$var;
450
-					$out.= '
449
+					$var = !$var;
450
+					$out .= '
451 451
 						<tr '.$bc[$var].'>
452 452
 							<td colspan="4" align="right">
453 453
 								<label for="subtotal_add_recap">'.$langs->trans('subtotal_add_recap').'</label>
454
-								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.( GETPOST('subtotal_add_recap') ? 'checked="checked"' : '' ).' />
454
+								<input type="checkbox" id="subtotal_add_recap" name="subtotal_add_recap" value="1" '.(GETPOST('subtotal_add_recap') ? 'checked="checked"' : '').' />
455 455
 							</td>
456 456
 						</tr>';
457 457
 				}
@@ -467,7 +467,7 @@  discard block
 block discarded – undo
467 467
     function formEditProductOptions($parameters, &$object, &$action, $hookmanager) 
468 468
     {
469 469
 		
470
-    	if (in_array('invoicecard',explode(':',$parameters['context'])))
470
+    	if (in_array('invoicecard', explode(':', $parameters['context'])))
471 471
         {
472 472
         	
473 473
         }
@@ -478,13 +478,13 @@  discard block
 block discarded – undo
478 478
 	function ODTSubstitutionLine(&$parameters, &$object, $action, $hookmanager) {
479 479
 		global $conf;
480 480
 		
481
-		if($action === 'builddoc') {
481
+		if ($action === 'builddoc') {
482 482
 			
483 483
 			$line = &$parameters['line'];
484 484
 			$object = &$parameters['object'];
485 485
 			$substitutionarray = &$parameters['substitutionarray'];
486 486
 			
487
-			if($line->product_type == 9 && $line->special_code == $this->module_number) {
487
+			if ($line->product_type == 9 && $line->special_code == $this->module_number) {
488 488
 				$substitutionarray['line_modsubtotal'] = 1;	
489 489
 				
490 490
 				$substitutionarray['line_price_ht']
@@ -495,7 +495,7 @@  discard block
 block discarded – undo
495 495
 					 = $substitutionarray['line_up'] 
496 496
 					 = '';
497 497
 				
498
-				if($line->qty>90) {
498
+				if ($line->qty > 90) {
499 499
 					$substitutionarray['line_modsubtotal_total'] = true;
500 500
 					
501 501
 					list($total, $total_tva, $total_ttc, $TTotal_tva) = $this->getTotalLineFromObject($object, $line, '', 1);
@@ -509,7 +509,7 @@  discard block
 block discarded – undo
509 509
 				
510 510
 				
511 511
 			}	
512
-			else{
512
+			else {
513 513
 				$substitutionarray['line_not_modsubtotal'] = true;
514 514
 				$substitutionarray['line_modsubtotal'] = 0;
515 515
 			}
@@ -521,29 +521,29 @@  discard block
 block discarded – undo
521 521
 	function createFrom($parameters, &$object, $action, $hookmanager) {
522 522
 	
523 523
 		if (
524
-				in_array('invoicecard',explode(':',$parameters['context']))
525
-		        || in_array('invoicesuppliercard',explode(':',$parameters['context']))
526
-				|| in_array('propalcard',explode(':',$parameters['context']))
527
-		        || in_array('supplier_proposalcard',explode(':',$parameters['context']))
528
-				|| in_array('ordercard',explode(':',$parameters['context']))
529
-		        || in_array('ordersuppliercard',explode(':',$parameters['context']))
530
-				|| in_array('invoicereccard',explode(':',$parameters['context']))
524
+				in_array('invoicecard', explode(':', $parameters['context']))
525
+		        || in_array('invoicesuppliercard', explode(':', $parameters['context']))
526
+				|| in_array('propalcard', explode(':', $parameters['context']))
527
+		        || in_array('supplier_proposalcard', explode(':', $parameters['context']))
528
+				|| in_array('ordercard', explode(':', $parameters['context']))
529
+		        || in_array('ordersuppliercard', explode(':', $parameters['context']))
530
+				|| in_array('invoicereccard', explode(':', $parameters['context']))
531 531
 		) {
532 532
 			
533 533
 			global $db;
534 534
 			
535 535
 			$objFrom = $parameters['objFrom'];
536 536
 			
537
-			foreach($objFrom->lines as $k=> &$lineOld) {
537
+			foreach ($objFrom->lines as $k=> &$lineOld) {
538 538
 				
539
-					if($lineOld->product_type == 9 && $lineOld->info_bits > 0 ) {
539
+					if ($lineOld->product_type == 9 && $lineOld->info_bits > 0) {
540 540
 							
541 541
 							$line = & $object->lines[$k];
542 542
 				
543 543
 							$idLine = (int) ($line->id ? $line->id : $line->rowid); 
544 544
 				
545 545
 							$db->query("UPDATE ".MAIN_DB_PREFIX.$line->table_element."
546
-							SET info_bits=".(int)$lineOld->info_bits."
546
+							SET info_bits=".(int) $lineOld->info_bits."
547 547
 							WHERE rowid = ".$idLine."
548 548
 							");
549 549
 						
@@ -559,15 +559,15 @@  discard block
 block discarded – undo
559 559
 	
560 560
 	function doActions($parameters, &$object, $action, $hookmanager)
561 561
 	{
562
-		global $db, $conf, $langs,$user;
562
+		global $db, $conf, $langs, $user;
563 563
 		
564 564
 		dol_include_once('/subtotal/class/subtotal.class.php');
565 565
 		dol_include_once('/subtotal/lib/subtotal.lib.php');
566
-		require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
566
+		require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
567 567
 		
568 568
 		$showBlockExtrafields = GETPOST('showBlockExtrafields');
569 569
 		
570
-		if($object->element=='facture') $idvar = 'facid';
570
+		if ($object->element == 'facture') $idvar = 'facid';
571 571
 		else $idvar = 'id';
572 572
 			
573 573
 		if ($action == 'updateligne' || $action == 'updateline')
@@ -580,7 +580,7 @@  discard block
 block discarded – undo
580 580
 				if ($line->id == $lineid && TSubtotal::isModSubtotalLine($line))
581 581
 				{
582 582
 					$found = true;
583
-					if(TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
583
+					if (TSubtotal::isTitle($line) && !empty($showBlockExtrafields)) {
584 584
 						$extrafieldsline = new ExtraFields($db);
585 585
 						$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
586 586
 						$extrafieldsline->setOptionalsFromPost($extralabelsline, $line);
@@ -599,43 +599,43 @@  discard block
 block discarded – undo
599 599
 				exit; // Surtout ne pas laisser Dolibarr faire du traitement sur le updateligne sinon ça plante les données de la ligne
600 600
 			}
601 601
 		}
602
-		else if($action === 'builddoc') {
602
+		else if ($action === 'builddoc') {
603 603
 			
604 604
 			if (
605
-				in_array('invoicecard',explode(':',$parameters['context']))
606
-				|| in_array('propalcard',explode(':',$parameters['context']))
607
-				|| in_array('ordercard',explode(':',$parameters['context']))
608
-			    || in_array('ordersuppliercard',explode(':',$parameters['context']))
609
-			    || in_array('invoicesuppliercard',explode(':',$parameters['context']))
610
-			    || in_array('supplier_proposalcard',explode(':',$parameters['context']))
605
+				in_array('invoicecard', explode(':', $parameters['context']))
606
+				|| in_array('propalcard', explode(':', $parameters['context']))
607
+				|| in_array('ordercard', explode(':', $parameters['context']))
608
+			    || in_array('ordersuppliercard', explode(':', $parameters['context']))
609
+			    || in_array('invoicesuppliercard', explode(':', $parameters['context']))
610
+			    || in_array('supplier_proposalcard', explode(':', $parameters['context']))
611 611
 			)
612 612
 	        {								
613
-				if(in_array('invoicecard',explode(':',$parameters['context']))) {
613
+				if (in_array('invoicecard', explode(':', $parameters['context']))) {
614 614
 					$sessname = 'subtotal_hideInnerLines_facture';	
615 615
 					$sessname2 = 'subtotal_hidedetails_facture';
616 616
 					$sessname3 = 'subtotal_hideprices_facture';
617 617
 				}
618
-				elseif(in_array('invoicesuppliercard',explode(':',$parameters['context']))) {
618
+				elseif (in_array('invoicesuppliercard', explode(':', $parameters['context']))) {
619 619
 				    $sessname = 'subtotal_hideInnerLines_facture_fournisseur';
620 620
 				    $sessname2 = 'subtotal_hidedetails_facture_fournisseur';
621 621
 				    $sessname3 = 'subtotal_hideprices_facture_fournisseur';
622 622
 				}
623
-				elseif(in_array('propalcard',explode(':',$parameters['context']))) {
623
+				elseif (in_array('propalcard', explode(':', $parameters['context']))) {
624 624
 					$sessname = 'subtotal_hideInnerLines_propal';
625 625
 					$sessname2 = 'subtotal_hidedetails_propal';	
626 626
 					$sessname3 = 'subtotal_hideprices_propal';
627 627
 				}
628
-				elseif(in_array('supplier_proposalcard',explode(':',$parameters['context']))) {
628
+				elseif (in_array('supplier_proposalcard', explode(':', $parameters['context']))) {
629 629
 				    $sessname = 'subtotal_hideInnerLines_supplier_proposal';
630 630
 				    $sessname2 = 'subtotal_hidedetails_supplier_proposal';
631 631
 				    $sessname3 = 'subtotal_hideprices_supplier_proposal';
632 632
 				}
633
-				elseif(in_array('ordercard',explode(':',$parameters['context']))) {
633
+				elseif (in_array('ordercard', explode(':', $parameters['context']))) {
634 634
 					$sessname = 'subtotal_hideInnerLines_commande';
635 635
 					$sessname2 = 'subtotal_hidedetails_commande';	
636 636
 					$sessname3 = 'subtotal_hideprices_commande';
637 637
 				}
638
-				elseif(in_array('ordersuppliercard',explode(':',$parameters['context']))) {
638
+				elseif (in_array('ordersuppliercard', explode(':', $parameters['context']))) {
639 639
 				    $sessname = 'subtotal_hideInnerLines_commande_fournisseur';
640 640
 				    $sessname2 = 'subtotal_hidedetails_commande_fournisseur';
641 641
 				    $sessname3 = 'subtotal_hideprices_commande_fournisseur';
@@ -648,25 +648,25 @@  discard block
 block discarded – undo
648 648
 					
649 649
 				global $hideprices;
650 650
 				
651
-				$hideInnerLines = (int)GETPOST('hideInnerLines');
652
-				if(!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id]) ) $_SESSION[$sessname] = array(); // prevent old system
651
+				$hideInnerLines = (int) GETPOST('hideInnerLines');
652
+				if (!empty($_SESSION[$sessname]) && !is_array($_SESSION[$sessname][$object->id])) $_SESSION[$sessname] = array(); // prevent old system
653 653
 				$_SESSION[$sessname][$object->id] = $hideInnerLines;		
654 654
 				
655
-				$hidedetails= (int)GETPOST('hidedetails');
656
-				if(!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id]) ) $_SESSION[$sessname2] = array(); // prevent old system
655
+				$hidedetails = (int) GETPOST('hidedetails');
656
+				if (!empty($_SESSION[$sessname2]) && !is_array($_SESSION[$sessname2][$object->id])) $_SESSION[$sessname2] = array(); // prevent old system
657 657
 				$_SESSION[$sessname2][$object->id] = $hidedetails;
658 658
 				
659
-				$hideprices= (int)GETPOST('hideprices');
660
-				if(!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id]) ) $_SESSION[$sessname3] = array(); // prevent old system
659
+				$hideprices = (int) GETPOST('hideprices');
660
+				if (!empty($_SESSION[$sessname3]) && !is_array($_SESSION[$sessname3][$object->id])) $_SESSION[$sessname3] = array(); // prevent old system
661 661
 				$_SESSION[$sessname3][$object->id] = $hideprices;
662 662
 				
663
-				foreach($object->lines as &$line) {
663
+				foreach ($object->lines as &$line) {
664 664
 					if ($line->product_type == 9 && $line->special_code == $this->module_number) {
665 665
 					    
666
-                        if($line->qty>=90) {
666
+                        if ($line->qty >= 90) {
667 667
                             $line->modsubtotal_total = 1;
668 668
                         }
669
-                        else{
669
+                        else {
670 670
                             $line->modsubtotal_title = 1;
671 671
                         }
672 672
                         
@@ -676,34 +676,34 @@  discard block
 block discarded – undo
676 676
 	        }
677 677
 			
678 678
 		}
679
-		else if($action === 'confirm_delete_all_lines' && GETPOST('confirm')=='yes') {
679
+		else if ($action === 'confirm_delete_all_lines' && GETPOST('confirm') == 'yes') {
680 680
 			
681 681
 			$Tab = $this->getArrayOfLineForAGroup($object, GETPOST('lineid'));
682 682
 			
683
-			foreach($Tab as $idLine) {
683
+			foreach ($Tab as $idLine) {
684 684
 				/**
685 685
 				 * @var $object Facture
686 686
 				 */
687
-				if($object->element=='facture') $object->deleteline($idLine);
687
+				if ($object->element == 'facture') $object->deleteline($idLine);
688 688
 				/**
689 689
 				 * @var $object Facture fournisseur
690 690
 				 */
691
-				else if($object->element=='invoice_supplier')
691
+				else if ($object->element == 'invoice_supplier')
692 692
 				{
693 693
 				    $object->deleteline($idLine);
694 694
 				}
695 695
 				/**
696 696
 				 * @var $object Propal
697 697
 				 */
698
-				else if($object->element=='propal') $object->deleteline($idLine);
698
+				else if ($object->element == 'propal') $object->deleteline($idLine);
699 699
 				/**
700 700
 				 * @var $object Propal Fournisseur
701 701
 				 */
702
-				else if($object->element=='supplier_proposal') $object->deleteline($idLine);
702
+				else if ($object->element == 'supplier_proposal') $object->deleteline($idLine);
703 703
 				/**
704 704
 				 * @var $object Commande
705 705
 				 */
706
-				else if($object->element=='commande') 
706
+				else if ($object->element == 'commande') 
707 707
 				{
708 708
 					if ((float) DOL_VERSION >= 5.0) $object->deleteline($user, $idLine);
709 709
 					else $object->deleteline($idLine);
@@ -711,18 +711,18 @@  discard block
 block discarded – undo
711 711
 				/**
712 712
 				 * @var $object Commande fournisseur
713 713
 				 */
714
-				else if($object->element=='order_supplier')
714
+				else if ($object->element == 'order_supplier')
715 715
 				{
716 716
 				    $object->deleteline($idLine);
717 717
 				}
718 718
 				/**
719 719
 				 * @var $object Facturerec
720 720
 				 */
721
-				else if($object->element=='facturerec') $object->deleteline($idLine);
721
+				else if ($object->element == 'facturerec') $object->deleteline($idLine);
722 722
 				/**
723 723
 				 * @var $object Expedition
724 724
 				 */
725
-				else if($object->element=='shipping') $object->deleteline($user, $idLine);
725
+				else if ($object->element == 'shipping') $object->deleteline($user, $idLine);
726 726
 			}
727 727
 			
728 728
 			header('location:?id='.$object->id);
@@ -745,7 +745,7 @@  discard block
 block discarded – undo
745 745
 		return 0;
746 746
 	}
747 747
 	
748
-	function formAddObjectLine ($parameters, &$object, &$action, $hookmanager) {
748
+	function formAddObjectLine($parameters, &$object, &$action, $hookmanager) {
749 749
 		return 0;
750 750
 	}
751 751
 	
@@ -763,8 +763,8 @@  discard block
 block discarded – undo
763 763
 			if (!empty($parameters['fk_element']))
764 764
 			{
765 765
 				
766
-				if($obj->fetch($parameters['fk_element'])){
767
-					$obj->id= $obj->rowid;
766
+				if ($obj->fetch($parameters['fk_element'])) {
767
+					$obj->id = $obj->rowid;
768 768
 					if (empty($obj->array_options))
769 769
 						$obj->fetch_optionals();
770 770
 					if (!empty($obj->array_options['options_subtotal_nc']))
@@ -784,22 +784,22 @@  discard block
 block discarded – undo
784 784
 		
785 785
 		$found = false;
786 786
 
787
-		$Tab= array();
787
+		$Tab = array();
788 788
 		
789
-		foreach($object->lines as $l) {
789
+		foreach ($object->lines as $l) {
790 790
 		
791 791
 		    $lid = (!empty($l->rowid) ? $l->rowid : $l->id);
792
-			if($lid == $lineid) {
792
+			if ($lid == $lineid) {
793 793
 
794 794
 				$found = true;
795 795
 				$qty_line = $l->qty;
796 796
 			}
797 797
 			
798
-			if($found) {
798
+			if ($found) {
799 799
 				
800 800
 			    $Tab[] = (!empty($l->rowid) ? $l->rowid : $l->id);
801 801
 				
802
-				if($l->special_code==$this->module_number && (($l->qty==99 && $qty_line==1) || ($l->qty==98 && $qty_line==2))   ) {
802
+				if ($l->special_code == $this->module_number && (($l->qty == 99 && $qty_line == 1) || ($l->qty == 98 && $qty_line == 2))) {
803 803
 					break; // end of story
804 804
 				}
805 805
 			}
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
828 828
 	 * 
829 829
 	 * @param	$use_level		isn't used anymore
830 830
 	 */
831
-	function getTotalLineFromObject(&$object, &$line, $use_level=false, $return_all=0) {
831
+	function getTotalLineFromObject(&$object, &$line, $use_level = false, $return_all = 0) {
832 832
 		global $conf;
833 833
 		
834 834
 		$rang = $line->rang;
@@ -839,31 +839,31 @@  discard block
 block discarded – undo
839 839
 		$total_ttc = 0;
840 840
 		$TTotal_tva = array();
841 841
 		
842
-		$sign=1;
843
-		if (isset($object->type) && $object->type == 2 && ! empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign=-1;
842
+		$sign = 1;
843
+		if (isset($object->type) && $object->type == 2 && !empty($conf->global->INVOICE_POSITIVE_CREDIT_NOTE)) $sign = -1;
844 844
 		
845 845
 		if (GETPOST('action') == 'builddoc') $builddoc = true;
846 846
 		else $builddoc = false;
847 847
 		
848 848
 		dol_include_once('/subtotal/class/subtotal.class.php');
849
-		foreach($object->lines as $l) {
849
+		foreach ($object->lines as $l) {
850 850
 			//print $l->rang.'>='.$rang.' '.$total.'<br/>';
851
-			if($l->rang>=$rang) {
851
+			if ($l->rang >= $rang) {
852 852
 				//echo 'return!<br>';
853 853
 				if (!$return_all) return $total;
854 854
 				else return array($total, $total_tva, $total_ttc, $TTotal_tva);
855 855
 			}
856
-			else if(TSubtotal::isTitle($l, 100 - $qty_line)) 
856
+			else if (TSubtotal::isTitle($l, 100 - $qty_line)) 
857 857
 		  	{
858 858
 				$total = 0;
859 859
 				$total_tva = 0;
860 860
 				$total_ttc = 0;
861 861
 				$TTotal_tva = array();
862 862
 			}
863
-			elseif(!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
863
+			elseif (!TSubtotal::isTitle($l) && !TSubtotal::isSubtotal($l)) {
864 864
 				
865 865
 				// TODO retirer le test avec $builddoc quand Dolibarr affichera le total progression sur la card et pas seulement dans le PDF
866
-				if ($builddoc && $object->element == 'facture' && $object->type==Facture::TYPE_SITUATION)
866
+				if ($builddoc && $object->element == 'facture' && $object->type == Facture::TYPE_SITUATION)
867 867
 				{
868 868
 					if ($l->situation_percent > 0)
869 869
 					{
@@ -876,7 +876,7 @@  discard block
 block discarded – undo
876 876
 						}
877 877
 						
878 878
 						$result = $sign * ($l->total_ht / ($l->situation_percent / 100)) * $progress;
879
-						$total+= $result;
879
+						$total += $result;
880 880
 						// TODO check si les 3 lignes du dessous sont corrects
881 881
 						$total_tva += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
882 882
 						$TTotal_tva[$l->tva_tx] += $sign * ($l->total_tva / ($l->situation_percent / 100)) * $progress;
@@ -908,10 +908,10 @@  discard block
 block discarded – undo
908 908
 	 * @param $w            float               width
909 909
 	 * @param $h            float               height
910 910
 	 */
911
-	function pdf_add_total(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
912
-		global $conf,$subtotal_last_title_posy;
911
+	function pdf_add_total(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
912
+		global $conf, $subtotal_last_title_posy;
913 913
 
914
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
914
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
915 915
 		if (!empty($conf->global->SUBTOTAL_ONE_LINE_IF_HIDE_INNERLINES) && $hideInnerLines && !empty($subtotal_last_title_posy))
916 916
 		{
917 917
 			$posy = $subtotal_last_title_posy;
@@ -920,40 +920,40 @@  discard block
 block discarded – undo
920 920
 		
921 921
 		$hidePriceOnSubtotalLines = (int) GETPOST('hide_price_on_subtotal_lines');
922 922
 
923
-		if($object->element == 'shipping' || $object->element == 'delivery')
923
+		if ($object->element == 'shipping' || $object->element == 'delivery')
924 924
 		{
925 925
 			$hidePriceOnSubtotalLines = 1;
926 926
 		}
927 927
 		
928 928
 		$set_pagebreak_margin = false;
929
-		if(method_exists('Closure','bind')) {
929
+		if (method_exists('Closure', 'bind')) {
930 930
 			$pageBreakOriginalValue = $pdf->AcceptPageBreak();
931
-			$sweetsThief = function ($pdf) {
932
-		    		return $pdf->bMargin ;
931
+			$sweetsThief = function($pdf) {
932
+		    		return $pdf->bMargin;
933 933
 			};
934 934
 			$sweetsThief = Closure::bind($sweetsThief, null, $pdf);
935 935
 	
936
-			$bMargin  = $sweetsThief($pdf);
936
+			$bMargin = $sweetsThief($pdf);
937 937
 	
938
-			$pdf->SetAutoPageBreak( false );
938
+			$pdf->SetAutoPageBreak(false);
939 939
 
940 940
 			$set_pagebreak_margin = true;			
941 941
 		}
942 942
 		
943 943
 			
944
-		if($line->qty==99)
945
-			$pdf->SetFillColor(220,220,220);
946
-		elseif ($line->qty==98)
947
-			$pdf->SetFillColor(230,230,230);
944
+		if ($line->qty == 99)
945
+			$pdf->SetFillColor(220, 220, 220);
946
+		elseif ($line->qty == 98)
947
+			$pdf->SetFillColor(230, 230, 230);
948 948
 		else
949
-			$pdf->SetFillColor(240,240,240);
949
+			$pdf->SetFillColor(240, 240, 240);
950 950
 		
951 951
 		$style = 'B';
952 952
 		if (!empty($conf->global->SUBTOTAL_SUBTOTAL_STYLE)) $style = $conf->global->SUBTOTAL_SUBTOTAL_STYLE;
953 953
 		
954 954
 		$pdf->SetFont('', $style, 9);
955 955
 		
956
-		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R',true);
956
+		$pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'R', true);
957 957
 //		var_dump($bMargin);
958 958
 		$pageAfter = $pdf->getPage();
959 959
 		
@@ -981,7 +981,7 @@  discard block
 block discarded – undo
981 981
 			
982 982
 			
983 983
 			
984
-			if($total_to_print !== '') {
984
+			if ($total_to_print !== '') {
985 985
 				
986 986
 				if (GETPOST('hideInnerLines'))
987 987
 				{
@@ -1005,11 +1005,11 @@  discard block
 block discarded – undo
1005 1005
 			}
1006 1006
 
1007 1007
 			$pdf->SetXY($pdf->postotalht, $posy);
1008
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
1009
-			$pdf->MultiCell($pdf->page_largeur-$pdf->marge_droite-$pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
1008
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
1009
+			$pdf->MultiCell($pdf->page_largeur - $pdf->marge_droite - $pdf->postotalht, 3, $total_to_print, 0, 'R', 0);
1010 1010
 		}
1011
-		else{
1012
-			if($set_pagebreak_margin) $pdf->SetAutoPageBreak( $pageBreakOriginalValue , $bMargin);
1011
+		else {
1012
+			if ($set_pagebreak_margin) $pdf->SetAutoPageBreak($pageBreakOriginalValue, $bMargin);
1013 1013
 		}
1014 1014
 		
1015 1015
 		$posy = $posy + $cell_height;
@@ -1029,22 +1029,22 @@  discard block
 block discarded – undo
1029 1029
 	 * @param $w            float               width
1030 1030
 	 * @param $h            float               height
1031 1031
 	 */
1032
-	function pdf_add_title(&$pdf,&$object, &$line, $label, $description,$posx, $posy, $w, $h) {
1032
+	function pdf_add_title(&$pdf, &$object, &$line, $label, $description, $posx, $posy, $w, $h) {
1033 1033
 		
1034
-		global $db,$conf,$subtotal_last_title_posy;
1034
+		global $db, $conf, $subtotal_last_title_posy;
1035 1035
 		
1036 1036
 		$subtotal_last_title_posy = $posy;
1037
-		$pdf->SetXY ($posx, $posy);
1037
+		$pdf->SetXY($posx, $posy);
1038 1038
 		
1039
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
1039
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
1040 1040
 		
1041 1041
 		
1042 1042
  
1043
-		$style = ($line->qty==1) ? 'BU' : 'BUI';
1043
+		$style = ($line->qty == 1) ? 'BU' : 'BUI';
1044 1044
 		if (!empty($conf->global->SUBTOTAL_TITLE_STYLE)) $style = $conf->global->SUBTOTAL_TITLE_STYLE;
1045 1045
 		
1046
-		if($hideInnerLines) {
1047
-			if($line->qty==1)$pdf->SetFont('', $style, 9);
1046
+		if ($hideInnerLines) {
1047
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9);
1048 1048
 			else 
1049 1049
 			{
1050 1050
 				if (!empty($conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES)) $style = $conf->global->SUBTOTAL_STYLE_TITRES_SI_LIGNES_CACHEES;
@@ -1053,44 +1053,44 @@  discard block
 block discarded – undo
1053 1053
 		}
1054 1054
 		else {
1055 1055
 
1056
-			if($line->qty==1)$pdf->SetFont('', $style, 9); //TODO if super utile
1056
+			if ($line->qty == 1)$pdf->SetFont('', $style, 9); //TODO if super utile
1057 1057
 			else $pdf->SetFont('', $style, 9);
1058 1058
 			
1059 1059
 		}
1060 1060
 		
1061 1061
 		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
1062
-		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J',true); // et maintenant avec du HTML
1062
+		else $pdf->writeHTMLCell($w, $h, $posx, $posy, $label, 0, 1, false, true, 'J', true); // et maintenant avec du HTML
1063 1063
 		
1064
-		if($description && !$hidedesc) {
1064
+		if ($description && !$hidedesc) {
1065 1065
 			$posy = $pdf->GetY();
1066 1066
 			
1067 1067
 			$pdf->SetFont('', '', 8);
1068 1068
 			
1069
-			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J',true);
1069
+			$pdf->writeHTMLCell($w, $h, $posx, $posy, $description, 0, 1, false, true, 'J', true);
1070 1070
 
1071 1071
 		}
1072 1072
 		
1073 1073
 	}
1074 1074
 
1075
-	function pdf_writelinedesc_ref($parameters=array(), &$object, &$action='') {
1075
+	function pdf_writelinedesc_ref($parameters = array(), &$object, &$action = '') {
1076 1076
 	// ultimate PDF hook O_o
1077 1077
 		
1078
-		return $this->pdf_writelinedesc($parameters,$object,$action);
1078
+		return $this->pdf_writelinedesc($parameters, $object, $action);
1079 1079
 		
1080 1080
 	}
1081 1081
 
1082 1082
 	function isModSubtotalLine(&$parameters, &$object) {
1083 1083
 		
1084
-		if(is_array($parameters)) {
1084
+		if (is_array($parameters)) {
1085 1085
 			$i = & $parameters['i'];	
1086 1086
 		}
1087 1087
 		else {
1088
-			$i = (int)$parameters;
1088
+			$i = (int) $parameters;
1089 1089
 		}
1090 1090
 
1091 1091
 		$line = $object->lines[$i];
1092 1092
 
1093
-		if($object->element == 'shipping' || $object->element == 'delivery')
1093
+		if ($object->element == 'shipping' || $object->element == 'delivery')
1094 1094
 		{
1095 1095
 			dol_include_once('/commande/class/commande.class.php');
1096 1096
 			$line = new OrderLine($object->db);
@@ -1098,7 +1098,7 @@  discard block
 block discarded – undo
1098 1098
 		}
1099 1099
 		
1100 1100
 
1101
-		if($line->special_code == $this->module_number && $line->product_type == 9) {
1101
+		if ($line->special_code == $this->module_number && $line->product_type == 9) {
1102 1102
 			return true;
1103 1103
 		}
1104 1104
 		
@@ -1106,42 +1106,42 @@  discard block
 block discarded – undo
1106 1106
 		
1107 1107
 	}
1108 1108
 
1109
-	function pdf_getlineqty($parameters=array(), &$object, &$action='') {
1110
-		global $conf,$hideprices;
1109
+	function pdf_getlineqty($parameters = array(), &$object, &$action = '') {
1110
+		global $conf, $hideprices;
1111 1111
 
1112
-		if($this->isModSubtotalLine($parameters,$object) ){
1112
+		if ($this->isModSubtotalLine($parameters, $object)) {
1113 1113
 			$this->resprints = ' ';
1114 1114
 			
1115
-			if((float)DOL_VERSION<=3.6) {
1115
+			if ((float) DOL_VERSION <= 3.6) {
1116 1116
 				return '';
1117 1117
 			}
1118
-			else if((float)DOL_VERSION>=3.8) {
1118
+			else if ((float) DOL_VERSION >= 3.8) {
1119 1119
 				return 1;
1120 1120
 			}
1121 1121
 			
1122 1122
 		}
1123
-		elseif(!empty($hideprices)) {
1123
+		elseif (!empty($hideprices)) {
1124 1124
 			$this->resprints = $object->lines[$parameters['i']]->qty;
1125 1125
 			return 1;
1126 1126
 		}
1127 1127
 		elseif (!empty($conf->global->SUBTOTAL_IF_HIDE_PRICES_SHOW_QTY))
1128 1128
 		{
1129
-			$hideInnerLines = (int)GETPOST('hideInnerLines');
1130
-			$hidedetails = (int)GETPOST('hidedetails');
1129
+			$hideInnerLines = (int) GETPOST('hideInnerLines');
1130
+			$hidedetails = (int) GETPOST('hidedetails');
1131 1131
 			if (empty($hideInnerLines) && !empty($hidedetails))
1132 1132
 			{
1133 1133
 				$this->resprints = $object->lines[$parameters['i']]->qty;
1134 1134
 			}
1135 1135
 		}
1136 1136
 		
1137
-		if(is_array($parameters)) $i = & $parameters['i'];
1138
-		else $i = (int)$parameters;
1137
+		if (is_array($parameters)) $i = & $parameters['i'];
1138
+		else $i = (int) $parameters;
1139 1139
 
1140 1140
 		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)
1141 1141
 		
1142
-		if(empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals();
1142
+		if (empty($object->lines[$i]->array_options)) $object->lines[$i]->fetch_optionals();
1143 1143
 
1144
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
1144
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
1145 1145
 		{
1146 1146
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
1147 1147
 			{
@@ -1153,20 +1153,20 @@  discard block
 block discarded – undo
1153 1153
 		return 0;
1154 1154
 	}
1155 1155
 	
1156
-	function pdf_getlinetotalexcltax($parameters=array(), &$object, &$action='') {
1156
+	function pdf_getlinetotalexcltax($parameters = array(), &$object, &$action = '') {
1157 1157
 	    global $conf, $hideprices, $hookmanager;
1158 1158
 		
1159
-		if(is_array($parameters)) $i = & $parameters['i'];
1160
-		else $i = (int)$parameters;
1159
+		if (is_array($parameters)) $i = & $parameters['i'];
1160
+		else $i = (int) $parameters;
1161 1161
 			
1162
-		if($this->isModSubtotalLine($parameters,$object) ){
1162
+		if ($this->isModSubtotalLine($parameters, $object)) {
1163 1163
 			
1164 1164
 			$this->resprints = ' ';
1165 1165
 			
1166
-			if((float)DOL_VERSION<=3.6) {
1166
+			if ((float) DOL_VERSION <= 3.6) {
1167 1167
 				return '';
1168 1168
 			}
1169
-			else if((float)DOL_VERSION>=3.8) {
1169
+			else if ((float) DOL_VERSION >= 3.8) {
1170 1170
 				return 1;
1171 1171
 			}
1172 1172
 			
@@ -1192,7 +1192,7 @@  discard block
 block discarded – undo
1192 1192
 				}
1193 1193
 			}
1194 1194
 		}
1195
-		if ((int)GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)){
1195
+		if ((int) GETPOST('hideInnerLines') && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES)) {
1196 1196
 		    $this->resprints = price($object->lines[$i]->total_ht);
1197 1197
 		}
1198 1198
 		
@@ -1217,7 +1217,7 @@  discard block
 block discarded – undo
1217 1217
 		{
1218 1218
 			// Check if a title exist for this line && if the title have subtotal
1219 1219
 			$lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
1220
-			if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1220
+			if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1221 1221
 			{
1222 1222
 
1223 1223
 				$this->resprints = ' ';
@@ -1237,7 +1237,7 @@  discard block
 block discarded – undo
1237 1237
 	 */
1238 1238
 	private function callHook(&$object, &$hookmanager, $action, $params, $defaultReturn = 1)
1239 1239
 	{
1240
-		$reshook=$hookmanager->executeHooks('subtotalHidePrices',$params, $object, $action);
1240
+		$reshook = $hookmanager->executeHooks('subtotalHidePrices', $params, $object, $action);
1241 1241
 		if ($reshook < 0)
1242 1242
 		{
1243 1243
 			$this->error = $hookmanager->error;
@@ -1253,7 +1253,7 @@  discard block
 block discarded – undo
1253 1253
 			$this->resprints = $hookmanager->resprints;
1254 1254
 
1255 1255
 			// override return (use  $this->results['overrideReturn'] or $this->resArray['overrideReturn'] in other module action_xxxx.class.php )
1256
-			if(isset($hookmanager->resArray['overrideReturn']))
1256
+			if (isset($hookmanager->resArray['overrideReturn']))
1257 1257
 			{
1258 1258
 				return $hookmanager->resArray['overrideReturn'];
1259 1259
 			}
@@ -1262,25 +1262,25 @@  discard block
 block discarded – undo
1262 1262
 		return $defaultReturn;
1263 1263
 	}
1264 1264
 	
1265
-	function pdf_getlinetotalwithtax($parameters=array(), &$object, &$action='') {
1265
+	function pdf_getlinetotalwithtax($parameters = array(), &$object, &$action = '') {
1266 1266
 		global $conf;
1267 1267
 		
1268
-		if($this->isModSubtotalLine($parameters,$object) ){
1268
+		if ($this->isModSubtotalLine($parameters, $object)) {
1269 1269
 			
1270 1270
 			$this->resprints = ' ';
1271 1271
 		
1272
-			if((float)DOL_VERSION<=3.6) {
1272
+			if ((float) DOL_VERSION <= 3.6) {
1273 1273
 				return '';
1274 1274
 			}
1275
-			else if((float)DOL_VERSION>=3.8) {
1275
+			else if ((float) DOL_VERSION >= 3.8) {
1276 1276
 				return 1;
1277 1277
 			}
1278 1278
 		}
1279 1279
 		
1280
-		if(is_array($parameters)) $i = & $parameters['i'];
1281
-		else $i = (int)$parameters;
1280
+		if (is_array($parameters)) $i = & $parameters['i'];
1281
+		else $i = (int) $parameters;
1282 1282
 		
1283
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) ) 
1283
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i]))) 
1284 1284
 		{
1285 1285
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
1286 1286
 			{
@@ -1292,24 +1292,24 @@  discard block
 block discarded – undo
1292 1292
 		return 0;
1293 1293
 	}
1294 1294
 	
1295
-	function pdf_getlineunit($parameters=array(), &$object, &$action='') {
1295
+	function pdf_getlineunit($parameters = array(), &$object, &$action = '') {
1296 1296
 		global $conf;
1297 1297
 		
1298
-		if($this->isModSubtotalLine($parameters,$object) ){
1298
+		if ($this->isModSubtotalLine($parameters, $object)) {
1299 1299
 			$this->resprints = ' ';
1300 1300
 		
1301
-			if((float)DOL_VERSION<=3.6) {
1301
+			if ((float) DOL_VERSION <= 3.6) {
1302 1302
 				return '';
1303 1303
 			}
1304
-			else if((float)DOL_VERSION>=3.8) {
1304
+			else if ((float) DOL_VERSION >= 3.8) {
1305 1305
 				return 1;
1306 1306
 			}
1307 1307
 		}
1308 1308
 		
1309
-		if(is_array($parameters)) $i = & $parameters['i'];
1310
-		else $i = (int)$parameters;
1309
+		if (is_array($parameters)) $i = & $parameters['i'];
1310
+		else $i = (int) $parameters;
1311 1311
 			
1312
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
1312
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
1313 1313
 		{
1314 1314
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
1315 1315
 			{
@@ -1321,32 +1321,32 @@  discard block
 block discarded – undo
1321 1321
 		return 0;
1322 1322
 	}
1323 1323
 	
1324
-	function pdf_getlineupexcltax($parameters=array(), &$object, &$action='') {
1325
-	    global $conf,$hideprices,$hookmanager;
1324
+	function pdf_getlineupexcltax($parameters = array(), &$object, &$action = '') {
1325
+	    global $conf, $hideprices, $hookmanager;
1326 1326
 
1327
-		if(is_array($parameters)) $i = & $parameters['i'];
1328
-		else $i = (int)$parameters;
1327
+		if (is_array($parameters)) $i = & $parameters['i'];
1328
+		else $i = (int) $parameters;
1329 1329
 
1330
-		if($this->isModSubtotalLine($parameters,$object) ) {
1330
+		if ($this->isModSubtotalLine($parameters, $object)) {
1331 1331
 			$this->resprints = ' ';
1332 1332
 
1333 1333
             $line = $object->lines[$i];
1334 1334
 
1335 1335
             // On récupère les montants du bloc pour les afficher dans la ligne de sous-total
1336
-            if(TSubtotal::isSubtotal($line)) {
1336
+            if (TSubtotal::isSubtotal($line)) {
1337 1337
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
1338 1338
 
1339
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1340
-                if(! empty($parentTitle->array_options['options_show_total_ht'])) {
1339
+                if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1340
+                if (!empty($parentTitle->array_options['options_show_total_ht'])) {
1341 1341
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
1342 1342
                     $this->resprints = price($TTotal['total_subprice']);
1343 1343
                 }
1344 1344
             }
1345 1345
 		
1346
-			if((float)DOL_VERSION<=3.6) {
1346
+			if ((float) DOL_VERSION <= 3.6) {
1347 1347
 				return '';
1348 1348
 			}
1349
-			else if((float)DOL_VERSION>=3.8) {
1349
+			else if ((float) DOL_VERSION >= 3.8) {
1350 1350
 				return 1;
1351 1351
 			}
1352 1352
 		}
@@ -1374,7 +1374,7 @@  discard block
 block discarded – undo
1374 1374
 		    
1375 1375
 		    // Check if a title exist for this line && if the title have subtotal
1376 1376
 		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
1377
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1377
+		    if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1378 1378
 		    {
1379 1379
 		        
1380 1380
 		        $this->resprints = ' ';
@@ -1388,37 +1388,37 @@  discard block
 block discarded – undo
1388 1388
 		return 0;
1389 1389
 	}
1390 1390
 	
1391
-	function pdf_getlineremisepercent($parameters=array(), &$object, &$action='') {
1392
-	    global $conf,$hideprices,$hookmanager;
1391
+	function pdf_getlineremisepercent($parameters = array(), &$object, &$action = '') {
1392
+	    global $conf, $hideprices, $hookmanager;
1393 1393
 
1394
-        if(is_array($parameters)) $i = & $parameters['i'];
1394
+        if (is_array($parameters)) $i = & $parameters['i'];
1395 1395
         else $i = (int) $parameters;
1396 1396
 
1397
-		if($this->isModSubtotalLine($parameters,$object) ) {
1397
+		if ($this->isModSubtotalLine($parameters, $object)) {
1398 1398
 			$this->resprints = ' ';
1399 1399
 
1400 1400
             $line = $object->lines[$i];
1401 1401
 
1402 1402
             // Affichage de la remise 
1403
-            if(TSubtotal::isSubtotal($line)) {
1403
+            if (TSubtotal::isSubtotal($line)) {
1404 1404
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $i);
1405 1405
 
1406
-                if(empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1407
-                if(! empty($parentTitle->array_options['options_show_reduc'])) {
1406
+                if (empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1407
+                if (!empty($parentTitle->array_options['options_show_reduc'])) {
1408 1408
                     $TTotal = TSubtotal::getTotalBlockFromTitle($object, $parentTitle);
1409
-                    $this->resprints = price((1-$TTotal['total_ht'] / $TTotal['total_subprice'])*100, 0, '', 1, 2, 2).'%';
1409
+                    $this->resprints = price((1 - $TTotal['total_ht'] / $TTotal['total_subprice']) * 100, 0, '', 1, 2, 2).'%';
1410 1410
                 }
1411 1411
             }
1412 1412
 		
1413
-			if((float)DOL_VERSION<=3.6) {
1413
+			if ((float) DOL_VERSION <= 3.6) {
1414 1414
 				return '';
1415 1415
 			}
1416
-			else if((float)DOL_VERSION>=3.8) {
1416
+			else if ((float) DOL_VERSION >= 3.8) {
1417 1417
 				return 1;
1418 1418
 			}
1419 1419
 		}
1420 1420
 		elseif (!empty($hideprices)
1421
-		        || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
1421
+		        || (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
1422 1422
 		        )
1423 1423
 		    {
1424 1424
 		        if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1431,24 +1431,24 @@  discard block
 block discarded – undo
1431 1431
 		return 0;
1432 1432
 	}
1433 1433
 	
1434
-	function pdf_getlineupwithtax($parameters=array(), &$object, &$action='') {
1435
-		global $conf,$hideprices;
1434
+	function pdf_getlineupwithtax($parameters = array(), &$object, &$action = '') {
1435
+		global $conf, $hideprices;
1436 1436
 		
1437
-		if($this->isModSubtotalLine($parameters,$object) ){
1437
+		if ($this->isModSubtotalLine($parameters, $object)) {
1438 1438
 			$this->resprints = ' ';
1439
-			if((float)DOL_VERSION<=3.6) {
1439
+			if ((float) DOL_VERSION <= 3.6) {
1440 1440
 				return '';
1441 1441
 			}
1442
-			else if((float)DOL_VERSION>=3.8) {
1442
+			else if ((float) DOL_VERSION >= 3.8) {
1443 1443
 				return 1;
1444 1444
 			}
1445 1445
 		}
1446 1446
 		
1447
-		if(is_array($parameters)) $i = & $parameters['i'];
1448
-		else $i = (int)$parameters;
1447
+		if (is_array($parameters)) $i = & $parameters['i'];
1448
+		else $i = (int) $parameters;
1449 1449
 			
1450 1450
 		if (!empty($hideprices)
1451
-				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
1451
+				|| (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
1452 1452
 		)
1453 1453
 		{
1454 1454
 			if (!empty($hideprices) || !in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
@@ -1461,22 +1461,22 @@  discard block
 block discarded – undo
1461 1461
 		return 0;
1462 1462
 	}
1463 1463
 	
1464
-	function pdf_getlinevatrate($parameters=array(), &$object, &$action='') {
1465
-	    global $conf,$hideprices,$hookmanager;
1464
+	function pdf_getlinevatrate($parameters = array(), &$object, &$action = '') {
1465
+	    global $conf, $hideprices, $hookmanager;
1466 1466
 	    
1467
-		if($this->isModSubtotalLine($parameters,$object) ){
1467
+		if ($this->isModSubtotalLine($parameters, $object)) {
1468 1468
 			$this->resprints = ' ';
1469 1469
 			
1470
-			if((float)DOL_VERSION<=3.6) {
1470
+			if ((float) DOL_VERSION <= 3.6) {
1471 1471
 				return '';
1472 1472
 			}
1473
-			else if((float)DOL_VERSION>=3.8) {
1473
+			else if ((float) DOL_VERSION >= 3.8) {
1474 1474
 				return 1;
1475 1475
 			}
1476 1476
 		}
1477 1477
 		
1478
-		if(is_array($parameters)) $i = & $parameters['i'];
1479
-		else $i = (int)$parameters;
1478
+		if (is_array($parameters)) $i = & $parameters['i'];
1479
+		else $i = (int) $parameters;
1480 1480
 		
1481 1481
 		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)
1482 1482
 
@@ -1503,7 +1503,7 @@  discard block
 block discarded – undo
1503 1503
 		    
1504 1504
 		    // Check if a title exist for this line && if the title have subtotal
1505 1505
 		    $lineTitle = TSubtotal::getParentTitleOfLine($object, $i);
1506
-		    if(TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1506
+		    if (TSubtotal::getParentTitleOfLine($object, $i) && TSubtotal::titleHasTotalLine($object, $lineTitle, true))
1507 1507
 		    {
1508 1508
 		        
1509 1509
 		        $this->resprints = ' ';
@@ -1517,23 +1517,23 @@  discard block
 block discarded – undo
1517 1517
 		return 0;
1518 1518
 	}
1519 1519
 		
1520
-	function pdf_getlineprogress($parameters=array(), &$object, &$action) {
1520
+	function pdf_getlineprogress($parameters = array(), &$object, &$action) {
1521 1521
 		global $conf;
1522 1522
 		
1523
-		if($this->isModSubtotalLine($parameters,$object) ){
1523
+		if ($this->isModSubtotalLine($parameters, $object)) {
1524 1524
 			$this->resprints = ' ';
1525
-			if((float)DOL_VERSION<=3.6) {
1525
+			if ((float) DOL_VERSION <= 3.6) {
1526 1526
 				return '';
1527 1527
 			}
1528
-			else if((float)DOL_VERSION>=3.8) {
1528
+			else if ((float) DOL_VERSION >= 3.8) {
1529 1529
 				return 1;
1530 1530
 			}
1531 1531
 		}
1532 1532
 		
1533
-		if(is_array($parameters)) $i = & $parameters['i'];
1534
-		else $i = (int)$parameters;
1533
+		if (is_array($parameters)) $i = & $parameters['i'];
1534
+		else $i = (int) $parameters;
1535 1535
 			
1536
-		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])) )
1536
+		if (!empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && (!empty($object->lines[$i]->array_options['options_subtotal_nc']) || TSubtotal::hasNcTitle($object->lines[$i])))
1537 1537
 		{
1538 1538
 			if (!in_array(__FUNCTION__, explode(',', $conf->global->SUBTOTAL_TFIELD_TO_KEEP_WITH_NC)))
1539 1539
 			{
@@ -1548,12 +1548,12 @@  discard block
 block discarded – undo
1548 1548
 	function add_numerotation(&$object) {
1549 1549
 		global $conf;
1550 1550
 		
1551
-		if(!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
1551
+		if (!empty($conf->global->SUBTOTAL_USE_NUMEROTATION)) {
1552 1552
 		
1553 1553
 			$TLevelTitre = array();
1554 1554
 			$prevlevel = 0;
1555 1555
 		
1556
-			foreach($object->lines as $k=>&$line) 
1556
+			foreach ($object->lines as $k=>&$line) 
1557 1557
 			{
1558 1558
 				if ($line->id > 0 && $this->isModSubtotalLine($k, $object) && $line->qty <= 10)
1559 1559
 				{
@@ -1567,12 +1567,12 @@  discard block
 block discarded – undo
1567 1567
 	}
1568 1568
 
1569 1569
 	// TODO ne gère pas encore la numération des lignes "Totaux"
1570
-	private function formatNumerotation(&$TLineTitle, $line_reference='', $level=1, $prefix_num=0)
1570
+	private function formatNumerotation(&$TLineTitle, $line_reference = '', $level = 1, $prefix_num = 0)
1571 1571
 	{
1572 1572
 		$TTitle = array();
1573 1573
 		
1574
-		$i=1;
1575
-		$j=0;
1574
+		$i = 1;
1575
+		$j = 0;
1576 1576
 		foreach ($TLineTitle as $k => &$line)
1577 1577
 		{
1578 1578
 			if (!empty($line_reference) && $line->rang <= $line_reference->rang) continue;
@@ -1582,7 +1582,7 @@  discard block
 block discarded – undo
1582 1582
 			{
1583 1583
 				$TTitle[$j]['numerotation'] = ($prefix_num == 0) ? $i : $prefix_num.'.'.$i;
1584 1584
 				//var_dump('Prefix == '.$prefix_num.' // '.$line->desc.' ==> numerotation == '.$TTitle[$j]['numerotation'].'   ###    '.$line->qty .'=='. $level);
1585
-				if (empty($line->label) && (float)DOL_VERSION < 6)
1585
+				if (empty($line->label) && (float) DOL_VERSION < 6)
1586 1586
 				{
1587 1587
 					$line->label = !empty($line->desc) ? $line->desc : $line->description;
1588 1588
 					$line->desc = $line->description = '';
@@ -1608,26 +1608,26 @@  discard block
 block discarded – undo
1608 1608
 	
1609 1609
 	function setDocTVA(&$pdf, &$object) {
1610 1610
 		
1611
-		$hidedetails = (int)GETPOST('hidedetails');
1611
+		$hidedetails = (int) GETPOST('hidedetails');
1612 1612
 		
1613
-		if(empty($hidedetails)) return false;
1613
+		if (empty($hidedetails)) return false;
1614 1614
 		
1615 1615
 		// TODO can't add VAT to document without lines... :-/
1616 1616
 		
1617 1617
 		return true;
1618 1618
 	}
1619 1619
 	
1620
-	function beforePDFCreation($parameters=array(), &$object, &$action)
1620
+	function beforePDFCreation($parameters = array(), &$object, &$action)
1621 1621
 	{
1622 1622
 		/**
1623 1623
 		 * @var $pdf    TCPDF
1624 1624
 		 */
1625
-		global $pdf,$conf, $langs;
1625
+		global $pdf, $conf, $langs;
1626 1626
 
1627 1627
 		// var_dump($object->lines);
1628 1628
 		dol_include_once('/subtotal/class/subtotal.class.php');
1629 1629
 
1630
-		foreach($parameters as $key=>$value) {
1630
+		foreach ($parameters as $key=>$value) {
1631 1631
 			${$key} = $value;
1632 1632
 		}
1633 1633
 		
@@ -1635,43 +1635,43 @@  discard block
 block discarded – undo
1635 1635
 		
1636 1636
 		$this->add_numerotation($object);	
1637 1637
 		
1638
-        foreach($object->lines as $k => &$l) {
1639
-            if(TSubtotal::isSubtotal($l)) {
1638
+        foreach ($object->lines as $k => &$l) {
1639
+            if (TSubtotal::isSubtotal($l)) {
1640 1640
                 $parentTitle = TSubtotal::getParentTitleOfLine($object, $k);
1641
-                if(is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1642
-                if(! empty($parentTitle->id) && ! empty($parentTitle->array_options['options_show_total_ht'])) {
1643
-                    $l->remise_percent = 100;    // Affichage de la réduction sur la ligne de sous-total
1641
+                if (is_object($parentTitle) && empty($parentTitle->array_options)) $parentTitle->fetch_optionals();
1642
+                if (!empty($parentTitle->id) && !empty($parentTitle->array_options['options_show_total_ht'])) {
1643
+                    $l->remise_percent = 100; // Affichage de la réduction sur la ligne de sous-total
1644 1644
                 }
1645 1645
             }
1646 1646
 
1647 1647
 
1648 1648
             // Pas de hook sur les colonnes du PDF expédition, on unset les bonnes variables
1649
-            if(($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
1649
+            if (($object->element == 'shipping' || $object->element == 'delivery') && $this->isModSubtotalLine($k, $object))
1650 1650
 			{
1651 1651
 				$l->qty = $l->qty_asked;
1652 1652
 				unset($l->qty_asked, $l->qty_shipped, $l->volume, $l->weight);
1653 1653
 			}
1654 1654
         }
1655 1655
 
1656
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
1657
-		$hidedetails = (int)GETPOST('hidedetails');
1656
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
1657
+		$hidedetails = (int) GETPOST('hidedetails');
1658 1658
 
1659 1659
 		if ($hideInnerLines) { // si c une ligne de titre
1660
-	    	$fk_parent_line=0;
1661
-			$TLines =array();
1660
+	    	$fk_parent_line = 0;
1661
+			$TLines = array();
1662 1662
 		
1663
-			$original_count=count($object->lines);
1663
+			$original_count = count($object->lines);
1664 1664
 		    $TTvas = array(); // tableau de tva
1665 1665
 		    
1666
-			foreach($object->lines as $k=>&$line) 
1666
+			foreach ($object->lines as $k=>&$line) 
1667 1667
 			{
1668 1668
 			    
1669
-				if($line->product_type==9 && $line->rowid>0) 
1669
+				if ($line->product_type == 9 && $line->rowid > 0) 
1670 1670
 				{
1671 1671
 					$fk_parent_line = $line->rowid;
1672 1672
 					
1673 1673
 					// 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
1674
-					if(TSubtotal::isSubtotal($line)) 
1674
+					if (TSubtotal::isSubtotal($line)) 
1675 1675
 					{
1676 1676
 						/*$total = $this->getTotalLineFromObject($object, $line, '');
1677 1677
 						
@@ -1700,22 +1700,22 @@  discard block
 block discarded – undo
1700 1700
 			
1701 1701
 				if ($hideInnerLines)
1702 1702
 				{
1703
-				    if(!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
1703
+				    if (!empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
1704 1704
 				    {
1705
-				        if($line->tva_tx != '0.000' && $line->product_type!=9){
1705
+				        if ($line->tva_tx != '0.000' && $line->product_type != 9) {
1706 1706
 				            
1707 1707
     				        // on remplit le tableau de tva pour substituer les lignes cachées
1708 1708
     				        $TTvas[$line->tva_tx]['total_tva'] += $line->total_tva;
1709 1709
     				        $TTvas[$line->tva_tx]['total_ht'] += $line->total_ht;
1710 1710
     				        $TTvas[$line->tva_tx]['total_ttc'] += $line->total_ttc; 
1711 1711
     				    }
1712
-    					if($line->product_type==9 && $line->rowid>0)
1712
+    					if ($line->product_type == 9 && $line->rowid > 0)
1713 1713
     					{
1714 1714
     					    //Cas où je doit cacher les produits et afficher uniquement les sous-totaux avec les titres
1715 1715
     					    // génère des lignes d'affichage des montants HT soumis à tva
1716 1716
     					    $nbtva = count($TTvas);
1717
-    					    if(!empty($nbtva)){
1718
-    					        foreach ($TTvas as $tx =>$val){
1717
+    					    if (!empty($nbtva)) {
1718
+    					        foreach ($TTvas as $tx =>$val) {
1719 1719
     					            $l = clone $line;
1720 1720
     					            $l->product_type = 1;
1721 1721
     					            $l->special_code = '';
@@ -1736,7 +1736,7 @@  discard block
 block discarded – undo
1736 1736
     					}
1737 1737
 				    } else {
1738 1738
 				        
1739
-				        if($line->product_type==9 && $line->rowid>0)
1739
+				        if ($line->product_type == 9 && $line->rowid > 0)
1740 1740
 				        {
1741 1741
 				            // ajoute la ligne de sous-total
1742 1742
 				            $TLines[] = $line; 
@@ -1764,9 +1764,9 @@  discard block
 block discarded – undo
1764 1764
 			
1765 1765
 			// cas incongru où il y aurait des produits en dessous du dernier sous-total
1766 1766
 			$nbtva = count($TTvas);
1767
-			if(!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
1767
+			if (!empty($nbtva) && $hideInnerLines && !empty($conf->global->SUBTOTAL_REPLACE_WITH_VAT_IF_HIDE_INNERLINES))
1768 1768
 			{
1769
-			    foreach ($TTvas as $tx =>$val){
1769
+			    foreach ($TTvas as $tx =>$val) {
1770 1770
 			        $l = clone $line;
1771 1771
 			        $l->product_type = 1;
1772 1772
 			        $l->special_code = '';
@@ -1783,11 +1783,11 @@  discard block
 block discarded – undo
1783 1783
 			}
1784 1784
 			
1785 1785
 			global $nblignes;
1786
-			$nblignes=count($TLines);
1786
+			$nblignes = count($TLines);
1787 1787
 
1788 1788
 			$object->lines = $TLines;
1789 1789
 			
1790
-			if($i>count($object->lines)) {
1790
+			if ($i > count($object->lines)) {
1791 1791
 				$this->resprints = '';
1792 1792
 				return 0;
1793 1793
 			}
@@ -1796,55 +1796,55 @@  discard block
 block discarded – undo
1796 1796
 		return 0;
1797 1797
 	}
1798 1798
 
1799
-	function pdf_writelinedesc($parameters=array(), &$object, &$action)
1799
+	function pdf_writelinedesc($parameters = array(), &$object, &$action)
1800 1800
 	{
1801 1801
 		/**
1802 1802
 		 * @var $pdf    TCPDF
1803 1803
 		 */
1804
-		global $pdf,$conf;
1804
+		global $pdf, $conf;
1805 1805
 
1806
-		foreach($parameters as $key=>$value) {
1806
+		foreach ($parameters as $key=>$value) {
1807 1807
 			${$key} = $value;
1808 1808
 		}
1809 1809
 		
1810
-		$hideInnerLines = (int)GETPOST('hideInnerLines');
1811
-		$hidedetails = (int)GETPOST('hidedetails');
1810
+		$hideInnerLines = (int) GETPOST('hideInnerLines');
1811
+		$hidedetails = (int) GETPOST('hidedetails');
1812 1812
 		
1813
-		if($this->isModSubtotalLine($parameters,$object) ){			
1813
+		if ($this->isModSubtotalLine($parameters, $object)) {			
1814 1814
 		
1815 1815
 				global $hideprices;
1816 1816
 				
1817
-				if(!empty($hideprices)) {
1818
-					foreach($object->lines as &$line) {
1819
-						if($line->fk_product_type!=9) $line->fk_parent_line = -1;	
1817
+				if (!empty($hideprices)) {
1818
+					foreach ($object->lines as &$line) {
1819
+						if ($line->fk_product_type != 9) $line->fk_parent_line = -1;	
1820 1820
 					}
1821 1821
 				}
1822 1822
 			
1823 1823
 				$line = &$object->lines[$i];
1824 1824
 
1825
-				if($object->element == 'delivery' && ! empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
1825
+				if ($object->element == 'delivery' && !empty($object->commande->expeditions[$line->fk_origin_line])) unset($object->commande->expeditions[$line->fk_origin_line]);
1826 1826
 
1827
-				if($line->info_bits>0) { // PAGE BREAK
1827
+				if ($line->info_bits > 0) { // PAGE BREAK
1828 1828
 					$pdf->addPage();
1829 1829
 					$posy = $pdf->GetY();
1830 1830
 				}
1831 1831
 				
1832 1832
 				$label = $line->label;
1833
-				$description= !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
1833
+				$description = !empty($line->desc) ? $outputlangs->convToOutputCharset($line->desc) : $outputlangs->convToOutputCharset($line->description);
1834 1834
 				
1835
-				if(empty($label)) {
1835
+				if (empty($label)) {
1836 1836
 					$label = $description;
1837
-					$description='';
1837
+					$description = '';
1838 1838
 				}
1839 1839
 
1840
-				if($line->qty>90) {
1840
+				if ($line->qty > 90) {
1841 1841
 					if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)	$label .= ' '.$this->getTitle($object, $line);
1842 1842
 					
1843 1843
 					$pageBefore = $pdf->getPage();
1844
-					$this->pdf_add_total($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h);
1844
+					$this->pdf_add_total($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h);
1845 1845
 					$pageAfter = $pdf->getPage();	
1846 1846
 
1847
-					if($pageAfter>$pageBefore) {
1847
+					if ($pageAfter > $pageBefore) {
1848 1848
 						//print "ST $pageAfter>$pageBefore<br>";
1849 1849
 						$pdf->rollbackTransaction(true);
1850 1850
 						$pdf->addPage('', '', true);
@@ -1855,9 +1855,9 @@  discard block
 block discarded – undo
1855 1855
 					}
1856 1856
 
1857 1857
 					// On delivery PDF, we don't want quantities to appear and there are no hooks => setting text color to background color;
1858
-					if($object->element == 'delivery')
1858
+					if ($object->element == 'delivery')
1859 1859
 					{
1860
-						switch($line->qty)
1860
+						switch ($line->qty)
1861 1861
 						{
1862 1862
 							case 99:
1863 1863
 								$grey = 220;
@@ -1880,7 +1880,7 @@  discard block
 block discarded – undo
1880 1880
 				else if ($line->qty < 10) {
1881 1881
 					$pageBefore = $pdf->getPage();
1882 1882
 
1883
-					$this->pdf_add_title($pdf,$object, $line, $label, $description,$posx, $posy, $w, $h); 
1883
+					$this->pdf_add_title($pdf, $object, $line, $label, $description, $posx, $posy, $w, $h); 
1884 1884
 					$pageAfter = $pdf->getPage();	
1885 1885
 
1886 1886
 					
@@ -1896,9 +1896,9 @@  discard block
 block discarded – undo
1896 1896
 					}
1897 1897
 				*/
1898 1898
 
1899
-					if($object->element == 'delivery')
1899
+					if ($object->element == 'delivery')
1900 1900
 					{
1901
-						$pdf->SetTextColor(255,255,255);
1901
+						$pdf->SetTextColor(255, 255, 255);
1902 1902
 					}
1903 1903
 
1904 1904
 					$posy = $pdf->GetY();
@@ -1961,9 +1961,9 @@  discard block
 block discarded – undo
1961 1961
 	 * @param $hookmanager  HookManager
1962 1962
 	 * @return int
1963 1963
 	 */
1964
-	function printObjectLine ($parameters, &$object, &$action, $hookmanager){
1964
+	function printObjectLine($parameters, &$object, &$action, $hookmanager) {
1965 1965
 		
1966
-		global $conf,$langs,$user,$db,$bc;
1966
+		global $conf, $langs, $user, $db, $bc;
1967 1967
 		
1968 1968
 		$num = &$parameters['num'];
1969 1969
 		$line = &$parameters['line'];
@@ -1971,33 +1971,33 @@  discard block
 block discarded – undo
1971 1971
 		
1972 1972
 		$var = &$parameters['var'];
1973 1973
 
1974
-		$contexts = explode(':',$parameters['context']);
1974
+		$contexts = explode(':', $parameters['context']);
1975 1975
 
1976 1976
 		$originline = null;
1977 1977
 
1978 1978
 		$createRight = $user->rights->{$object->element}->creer;
1979
-		if($object->element == 'facturerec' )
1979
+		if ($object->element == 'facturerec')
1980 1980
 		{
1981 1981
 			$object->statut = 0; // hack for facture rec
1982 1982
 			$createRight = $user->rights->facture->creer;
1983 1983
 		}
1984
-		elseif($object->element == 'order_supplier' )
1984
+		elseif ($object->element == 'order_supplier')
1985 1985
 		{
1986 1986
 		    $createRight = $user->rights->fournisseur->commande->creer;
1987 1987
 		}
1988
-		elseif($object->element == 'invoice_supplier' )
1988
+		elseif ($object->element == 'invoice_supplier')
1989 1989
 		{
1990 1990
 		    $createRight = $user->rights->fournisseur->facture->creer;
1991 1991
 		}
1992
-		elseif($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
1992
+		elseif ($object->element == 'commande' && in_array('ordershipmentcard', $contexts))
1993 1993
 		{
1994 1994
 			// H4cK 4n0nYm0u$-style : $line n'est pas un objet instancié mais provient d'un fetch_object d'une requête SQL
1995 1995
 			$line->id = $line->rowid;
1996 1996
 			$line->product_type = $line->type;
1997 1997
 		}
1998
-		elseif($object->element == 'shipping' || $object->element == 'delivery')
1998
+		elseif ($object->element == 'shipping' || $object->element == 'delivery')
1999 1999
 		{
2000
-			if(empty($line->origin_line_id) && ! empty($line->fk_origin_line))
2000
+			if (empty($line->origin_line_id) && !empty($line->fk_origin_line))
2001 2001
 			{
2002 2002
 				$line->origin_line_id = $line->fk_origin_line;
2003 2003
 			}
@@ -2005,9 +2005,9 @@  discard block
 block discarded – undo
2005 2005
 			$originline = new OrderLine($db);
2006 2006
 			$originline->fetch($line->fk_origin_line);
2007 2007
 
2008
-			foreach(get_object_vars($line) as $property => $value)
2008
+			foreach (get_object_vars($line) as $property => $value)
2009 2009
 			{
2010
-				if(empty($originline->{ $property }))
2010
+				if (empty($originline->{ $property }))
2011 2011
 				{
2012 2012
 					$originline->{ $property } = $value;
2013 2013
 				}
@@ -2016,15 +2016,15 @@  discard block
 block discarded – undo
2016 2016
 			$line = $originline;
2017 2017
 		}
2018 2018
 
2019
-		if($line->special_code!=$this->module_number || $line->product_type!=9) {
2019
+		if ($line->special_code != $this->module_number || $line->product_type != 9) {
2020 2020
 			null;
2021 2021
 		}
2022
-		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)) 
2022
+		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)) 
2023 2023
         {
2024
-			if($object->element=='facture')$idvar = 'facid';
2025
-			else $idvar='id';
2024
+			if ($object->element == 'facture')$idvar = 'facid';
2025
+			else $idvar = 'id';
2026 2026
 
2027
-			if((float)DOL_VERSION <= 3.4)
2027
+			if ((float) DOL_VERSION <= 3.4)
2028 2028
 			{
2029 2029
 				?>
2030 2030
 				<script type="text/javascript">
@@ -2048,22 +2048,22 @@  discard block
 block discarded – undo
2048 2048
 				<?php
2049 2049
 			}
2050 2050
 			
2051
-			if(empty($line->description)) $line->description = $line->desc;
2051
+			if (empty($line->description)) $line->description = $line->desc;
2052 2052
 			
2053 2053
 			$colspan = 5;
2054
-			if($object->element == 'facturerec' ) $colspan = 3;
2055
-			if($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
2056
-			if($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4: $colspan = 7;
2057
-			if($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
2058
-			if(!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
2054
+			if ($object->element == 'facturerec') $colspan = 3;
2055
+			if ($object->element == 'order_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 3 : $colspan = 6;
2056
+			if ($object->element == 'invoice_supplier') (float) DOL_VERSION < 7.0 ? $colspan = 4 : $colspan = 7;
2057
+			if ($object->element == 'supplier_proposal') (float) DOL_VERSION < 6.0 ? $colspan = 4 : $colspan = 3;
2058
+			if (!empty($conf->multicurrency->enabled) && ((float) DOL_VERSION < 8.0 || $object->multicurrency_code != $conf->currency)) {
2059 2059
 				$colspan++; // Colonne PU Devise
2060 2060
 			}
2061
-			if($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
2062
-			if(!empty($conf->margin->enabled)) $colspan++;
2063
-			if(!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
2064
-			if(!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
2065
-			if($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
2066
-			if(!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
2061
+			if ($object->element == 'commande' && $object->statut < 3 && !empty($conf->shippableorder->enabled)) $colspan++;
2062
+			if (!empty($conf->margin->enabled)) $colspan++;
2063
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES)) $colspan++;
2064
+			if (!empty($conf->global->DISPLAY_MARK_RATES)) $colspan++;
2065
+			if ($object->element == 'facture' && !empty($conf->global->INVOICE_USE_SITUATION) && $object->type == Facture::TYPE_SITUATION) $colspan++;
2066
+			if (!empty($conf->global->PRODUCT_USE_UNITS)) $colspan++;
2067 2067
 					
2068 2068
 			/* Titre */
2069 2069
 			//var_dump($line);
@@ -2073,39 +2073,39 @@  discard block
 block discarded – undo
2073 2073
             
2074 2074
 			
2075 2075
 			?>
2076
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2076
+			<tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2077 2077
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
2078 2078
 					{
2079
-						if($line->qty==99) print 'background:#adadcf';
2080
-						else if($line->qty==98) print 'background:#ddddff;';
2081
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
2082
-						else if($line->qty==1) print 'background:#adadcf;';
2083
-						else if($line->qty==2) print 'background:#ddddff;';
2084
-						else if($line->qty==50) print '';
2079
+						if ($line->qty == 99) print 'background:#adadcf';
2080
+						else if ($line->qty == 98) print 'background:#ddddff;';
2081
+						else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;';
2082
+						else if ($line->qty == 1) print 'background:#adadcf;';
2083
+						else if ($line->qty == 2) print 'background:#ddddff;';
2084
+						else if ($line->qty == 50) print '';
2085 2085
 						else print 'background:#eeeeff;';
2086 2086
 
2087 2087
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
2088 2088
 					}
2089 2089
 					else 
2090 2090
 					{
2091
-						if($line->qty==99) print 'background:#ddffdd';
2092
-						else if($line->qty==98) print 'background:#ddddff;';
2093
-						else if($line->qty==2) print 'background:#eeeeff; ';
2094
-						else if($line->qty==50) print '';
2095
-						else print 'background:#eeffee;' ;
2091
+						if ($line->qty == 99) print 'background:#ddffdd';
2092
+						else if ($line->qty == 98) print 'background:#ddddff;';
2093
+						else if ($line->qty == 2) print 'background:#eeeeff; ';
2094
+						else if ($line->qty == 50) print '';
2095
+						else print 'background:#eeffee;';
2096 2096
 					}
2097 2097
 
2098 2098
 			?>;">
2099 2099
 
2100
-				<?php if(! empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
2100
+				<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
2101 2101
 				<td class="linecolnum"><?php echo $i + 1; ?></td>
2102 2102
 				<?php } ?>
2103 2103
 
2104
-				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
2105
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
2104
+				<td colspan="<?php echo $colspan; ?>" style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
2105
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
2106 2106
 
2107
-						$params=array('line'=>$line);
2108
-						$reshook=$hookmanager->executeHooks('formEditProductOptions',$params,$object,$action);
2107
+						$params = array('line'=>$line);
2108
+						$reshook = $hookmanager->executeHooks('formEditProductOptions', $params, $object, $action);
2109 2109
 						
2110 2110
 						echo '<div id="line_'.$line->id.'"></div>'; // Imitation Dolibarr
2111 2111
 						echo '<input type="hidden" value="'.$line->id.'" name="lineid">';
@@ -2113,7 +2113,7 @@  discard block
 block discarded – undo
2113 2113
 						echo '<input id="product_id" type="hidden" value="'.$line->fk_product.'" name="type">';
2114 2114
 						echo '<input id="special_code" type="hidden" value="'.$line->special_code.'" name="type">';
2115 2115
 
2116
-						$isFreeText=false;
2116
+						$isFreeText = false;
2117 2117
 						if (TSubtotal::isTitle($line))
2118 2118
 						{
2119 2119
 							$qty_displayed = $line->qty;
@@ -2135,13 +2135,13 @@  discard block
 block discarded – undo
2135 2135
 						    $line->description = '';
2136 2136
 						}
2137 2137
 						$newlabel = $line->label;
2138
-						if($line->label=='' && !$isFreeText) {
2139
-							if(TSubtotal::isSubtotal($line)) {
2138
+						if ($line->label == '' && !$isFreeText) {
2139
+							if (TSubtotal::isSubtotal($line)) {
2140 2140
 								$newlabel = $line->description.' '.$this->getTitle($object, $line);
2141
-								$line->description='';
2142
-							} elseif( (float)DOL_VERSION < 6 ) {
2143
-								$newlabel= $line->description;
2144
-								$line->description='';
2141
+								$line->description = '';
2142
+							} elseif ((float) DOL_VERSION < 6) {
2143
+								$newlabel = $line->description;
2144
+								$line->description = '';
2145 2145
 							}
2146 2146
 						}
2147 2147
 
@@ -2150,10 +2150,10 @@  discard block
 block discarded – undo
2150 2150
 						
2151 2151
 						if (!$isFreeText) echo '<input type="text" name="line-title" id-line="'.$line->id.'" value="'.$newlabel.'" size="80" '.$readonlyForSituation.'/>&nbsp;';
2152 2152
 						
2153
-						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) )
2153
+						if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT) && (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)))
2154 2154
 						{
2155 2155
 							$select = '<select name="subtotal_level">';
2156
-							for ($j=1; $j<10; $j++)
2156
+							for ($j = 1; $j < 10; $j++)
2157 2157
 							{
2158 2158
 								if (!empty($readonlyForSituation)) {
2159 2159
 									if ($qty_displayed == $j) $select .= '<option selected="selected" value="'.$j.'">'.$langs->trans('Level').' '.$j.'</option>';
@@ -2167,7 +2167,7 @@  discard block
 block discarded – undo
2167 2167
 
2168 2168
 						echo '<div class="subtotal_underline" style="margin-left:24px; line-height: 25px;">';
2169 2169
                         echo '<div>';
2170
-                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '') .' />&nbsp;';
2170
+                        echo '<input style="vertical-align:sub;"  type="checkbox" name="line-pagebreak" id="subtotal-pagebreak" value="8" '.(($line->info_bits > 0) ? 'checked="checked"' : '').' />&nbsp;';
2171 2171
                         echo '<label for="subtotal-pagebreak">'.$langs->trans('AddBreakPageBefore').'</label>';
2172 2172
                         echo '</div>';
2173 2173
 
@@ -2188,21 +2188,21 @@  discard block
 block discarded – undo
2188 2188
                                 echo '</div>';
2189 2189
                             }
2190 2190
                             echo '<div>';
2191
-                            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;';
2191
+                            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;';
2192 2192
                             echo '<label for="subtotal-showTotalHT">'.$langs->trans('ShowTotalHTOnSubtotalBlock').'</label>';
2193 2193
                             echo '</div>';
2194 2194
 
2195 2195
                             echo '<div>';
2196
-                            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;';
2196
+                            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;';
2197 2197
                             echo '<label for="subtotal-showReduc">'.$langs->trans('ShowReducOnSubtotalBlock').'</label>';
2198 2198
                             echo '</div>';
2199 2199
                         }
2200 2200
                         else if ($isFreeText) echo TSubtotal::getFreeTextHtml($line, (bool) $readonlyForSituation);
2201 2201
 						echo '</div>';
2202 2202
 
2203
-						if($line->qty<10) {
2203
+						if ($line->qty < 10) {
2204 2204
 							// WYSIWYG editor
2205
-							require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
2205
+							require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
2206 2206
 							$nbrows = ROWS_2;
2207 2207
 							$cked_enabled = (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
2208 2208
 							if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) {
@@ -2222,25 +2222,25 @@  discard block
 block discarded – undo
2222 2222
 
2223 2223
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
2224 2224
 						 {
2225
-							if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
2225
+							if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line)) 
2226 2226
 							{
2227
-								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
2227
+								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty - 1);
2228 2228
 								
2229 2229
 								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
2230
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
2230
+								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
2231 2231
 							}
2232 2232
 						 }
2233 2233
 						 else 
2234 2234
 						 {
2235
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
2236
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
2235
+							if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal');
2236
+							else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'; 
2237 2237
 						 }
2238 2238
 						 
2239 2239
 						 
2240 2240
 						 // Get display styles and apply them
2241 2241
 						 $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
2242
-						 $titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2243
-						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2242
+						 $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2243
+						 $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2244 2244
 						 
2245 2245
 						 if (empty($line->label)) {
2246 2246
 							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
@@ -2248,16 +2248,16 @@  discard block
 block discarded – undo
2248 2248
 						 } 
2249 2249
 						 else {
2250 2250
 
2251
-							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2251
+							if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2252 2252
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
2253 2253
 							}
2254
-							else{
2254
+							else {
2255 2255
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';    
2256 2256
 							}
2257 2257
 
2258 2258
 						 } 
2259
-						if($line->qty>90) print ' : ';
2260
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2259
+						if ($line->qty > 90) print ' : ';
2260
+						if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2261 2261
 
2262 2262
 						 
2263 2263
 
@@ -2266,7 +2266,7 @@  discard block
 block discarded – undo
2266 2266
 			?></td>
2267 2267
 					 
2268 2268
 			<?php
2269
-				if($line->qty>90) {
2269
+				if ($line->qty > 90) {
2270 2270
 					/* Total */
2271 2271
 					$total_line = $this->getTotalLineFromObject($object, $line, '');
2272 2272
 					echo '<td class="linecolht nowrap" align="right" style="font-weight:bold;" rel="subtotal_total">'.price($total_line).'</td>';
@@ -2285,7 +2285,7 @@  discard block
 block discarded – undo
2285 2285
 				<?php
2286 2286
 				if ($action != 'selectlines') {
2287 2287
 				
2288
-					if($action=='editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line) ) {
2288
+					if ($action == 'editline' && GETPOST('lineid') == $line->id && TSubtotal::isModSubtotalLine($line)) {
2289 2289
 						?>
2290 2290
 						<input id="savelinebutton" class="button" type="submit" name="save" value="<?php echo $langs->trans('Save') ?>" />
2291 2291
 						<br />
@@ -2301,13 +2301,13 @@  discard block
 block discarded – undo
2301 2301
 						<?php
2302 2302
 						
2303 2303
 					}
2304
-					else{
2305
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
2304
+					else {
2305
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK) && $object->element !== 'invoice_supplier')
2306 2306
 						{
2307
-							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>';
2307
+							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>';
2308 2308
 						}
2309 2309
 
2310
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
2310
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_EDIT_BLOCK)) 
2311 2311
 						{
2312 2312
 							echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=editline&lineid='.$line->id.'">'.img_edit().'</a>';
2313 2313
 						}								
@@ -2322,7 +2322,7 @@  discard block
 block discarded – undo
2322 2322
 				<?php
2323 2323
 
2324 2324
 				if ($action != 'editline' && $action != 'selectlines') {
2325
-						if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
2325
+						if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
2326 2326
 						{
2327 2327
 
2328 2328
 							if ($line->fk_prev_id === null)
@@ -2330,12 +2330,12 @@  discard block
 block discarded – undo
2330 2330
 								echo '<a href="'.$_SERVER['PHP_SELF'].'?'.$idvar.'='.$object->id.'&action=ask_deleteline&lineid='.$line->id.'">'.img_delete().'</a>';
2331 2331
 							}
2332 2332
 
2333
-							if(TSubtotal::isTitle($line) && ($line->fk_prev_id === null) )
2333
+							if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null))
2334 2334
 							{
2335 2335
 								if ((float) DOL_VERSION >= 8.0) {
2336 2336
 									$img_delete = img_delete($langs->trans('deleteWithAllLines'), ' class="pictodelete pictodeleteallline"');
2337 2337
 								} elseif ((float) DOL_VERSION >= 3.8) {
2338
-									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal',' class="pictodelete" ');
2338
+									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal', ' class="pictodelete" ');
2339 2339
 								} else {
2340 2340
 									$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
2341 2341
 								}
@@ -2345,7 +2345,7 @@  discard block
 block discarded – undo
2345 2345
 								/* Depuis la 8.0, les icônes "standard" utilisent FontAwesome et sont préconfigurées selon la clé de l'image
2346 2346
 								 * Impossible d'en customiser par exemple la couleur, même en utilisant img_picto() directement
2347 2347
 								 */
2348
-								if((float) DOL_VERSION >= 8.0) {
2348
+								if ((float) DOL_VERSION >= 8.0) {
2349 2349
 								?>
2350 2350
 								<script>
2351 2351
 									$(document).ready(function () {
@@ -2361,7 +2361,7 @@  discard block
 block discarded – undo
2361 2361
 			</td>
2362 2362
 			
2363 2363
 			<?php 
2364
-			if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
2364
+			if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && TSubtotal::isTitle($line) && $action != 'editline')
2365 2365
 			{
2366 2366
 				echo '<td class="subtotal_nc">';
2367 2367
 				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 @@  discard block
 block discarded – undo
2372 2372
 			<td align="center" class="linecolmove tdlineupdown">
2373 2373
 			</td>
2374 2374
 			<?php } else { ?>
2375
-			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0  && $createRight ))?' class="tdlineupdown"':''); ?>></td>
2375
+			<td align="center"<?php echo ((empty($conf->browser->phone) && ($object->statut == 0 && $createRight)) ? ' class="tdlineupdown"' : ''); ?>></td>
2376 2376
 			<?php } ?>
2377 2377
 
2378 2378
 
2379
-			<?php  if($action == 'selectlines'){ // dolibarr 8 ?>
2380
-			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i+1; ?>]" value="<?php echo $line->id; ?>" ></td>
2379
+			<?php  if ($action == 'selectlines') { // dolibarr 8 ?>
2380
+			<td class="linecolcheck" align="center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php echo $i + 1; ?>]" value="<?php echo $line->id; ?>" ></td>
2381 2381
 			<?php } ?>
2382 2382
 
2383 2383
 			</tr>
@@ -2385,29 +2385,29 @@  discard block
 block discarded – undo
2385 2385
 			
2386 2386
 			
2387 2387
 			// Affichage des extrafields à la Dolibarr (car sinon non affiché sur les titres)
2388
-			if(TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
2388
+			if (TSubtotal::isTitle($line) && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE)) {
2389 2389
 				
2390
-				require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
2390
+				require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
2391 2391
 				
2392 2392
 				// Extrafields
2393 2393
 				$extrafieldsline = new ExtraFields($db);
2394 2394
 				$extralabelsline = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
2395 2395
 				
2396
-				$colspan+=3; $mode = 'view';
2397
-				if($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
2396
+				$colspan += 3; $mode = 'view';
2397
+				if ($action === 'editline' && $line->rowid == GETPOST('lineid')) $mode = 'edit';
2398 2398
 				
2399 2399
 				$ex_element = $line->element;
2400 2400
 				$line->element = 'tr_extrafield_title '.$line->element; // Pour pouvoir manipuler ces tr
2401
-				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ','colspan'=>$colspan));
2401
+				print $line->showOptionals($extrafieldsline, $mode, array('style'=>' style="background:#eeffee;" ', 'colspan'=>$colspan));
2402 2402
 				$isExtraSelected = false;
2403
-				foreach($line->array_options as $option) {
2404
-					if(!empty($option) && $option != "-1") {
2403
+				foreach ($line->array_options as $option) {
2404
+					if (!empty($option) && $option != "-1") {
2405 2405
 						$isExtraSelected = true;
2406 2406
 						break;
2407 2407
 					}
2408 2408
 				}
2409 2409
 				
2410
-				if($mode === 'edit') {
2410
+				if ($mode === 'edit') {
2411 2411
 					?>
2412 2412
 					<script>
2413 2413
 						$(document).ready(function(){
@@ -2415,7 +2415,7 @@  discard block
 block discarded – undo
2415 2415
 							var all_tr_extrafields = $("tr.tr_extrafield_title");
2416 2416
 							<?php 
2417 2417
 							// Si un extrafield est rempli alors on affiche directement les extrafields
2418
-							if(!$isExtraSelected) {
2418
+							if (!$isExtraSelected) {
2419 2419
 								echo 'all_tr_extrafields.hide();';
2420 2420
 								echo 'var trad = "'.$langs->trans('showExtrafields').'";';
2421 2421
 								echo 'var extra = 0;';
@@ -2454,61 +2454,61 @@  discard block
 block discarded – undo
2454 2454
 			return 1;	
2455 2455
 			
2456 2456
 		}
2457
-		elseif(($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
2457
+		elseif (($object->element == 'commande' && in_array('ordershipmentcard', $contexts)) || (in_array('expeditioncard', $contexts) && $action == 'create'))
2458 2458
 		{
2459 2459
 			$colspan = 4;
2460 2460
 
2461 2461
 			// HTML 5 data for js
2462 2462
 			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
2463 2463
 ?>
2464
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2464
+			<tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2465 2465
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
2466 2466
 					{
2467
-						if($line->qty==99) print 'background:#adadcf';
2468
-						else if($line->qty==98) print 'background:#ddddff;';
2469
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
2470
-						else if($line->qty==1) print 'background:#adadcf;';
2471
-						else if($line->qty==2) print 'background:#ddddff;';
2472
-						else if($line->qty==50) print '';
2467
+						if ($line->qty == 99) print 'background:#adadcf';
2468
+						else if ($line->qty == 98) print 'background:#ddddff;';
2469
+						else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;';
2470
+						else if ($line->qty == 1) print 'background:#adadcf;';
2471
+						else if ($line->qty == 2) print 'background:#ddddff;';
2472
+						else if ($line->qty == 50) print '';
2473 2473
 						else print 'background:#eeeeff;';
2474 2474
 
2475 2475
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
2476 2476
 					}
2477 2477
 					else
2478 2478
 					{
2479
-						if($line->qty==99) print 'background:#ddffdd';
2480
-						else if($line->qty==98) print 'background:#ddddff;';
2481
-						else if($line->qty==2) print 'background:#eeeeff; ';
2482
-						else if($line->qty==50) print '';
2483
-						else print 'background:#eeffee;' ;
2479
+						if ($line->qty == 99) print 'background:#ddffdd';
2480
+						else if ($line->qty == 98) print 'background:#ddddff;';
2481
+						else if ($line->qty == 2) print 'background:#eeeeff; ';
2482
+						else if ($line->qty == 50) print '';
2483
+						else print 'background:#eeffee;';
2484 2484
 					}
2485 2485
 
2486 2486
 			?>;">
2487 2487
 
2488
-				<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
2488
+				<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
2489 2489
 
2490 2490
 
2491 2491
 						 if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
2492 2492
 						 {
2493
-							if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
2493
+							if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
2494 2494
 							{
2495
-								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
2495
+								echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty - 1);
2496 2496
 
2497 2497
 								if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
2498
-								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
2498
+								else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
2499 2499
 							}
2500 2500
 						 }
2501 2501
 						 else
2502 2502
 						 {
2503
-							if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
2504
-							else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
2503
+							if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal');
2504
+							else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
2505 2505
 						 }
2506 2506
 
2507 2507
 
2508 2508
 						 // Get display styles and apply them
2509 2509
 						 $titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
2510
-						 $titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2511
-						 $titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2510
+						 $titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2511
+						 $titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2512 2512
 
2513 2513
 						 if (empty($line->label)) {
2514 2514
 							if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
@@ -2516,22 +2516,22 @@  discard block
 block discarded – undo
2516 2516
 						 }
2517 2517
 						 else {
2518 2518
 
2519
-							if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2519
+							if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2520 2520
 								print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
2521 2521
 							}
2522
-							else{
2522
+							else {
2523 2523
 								print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';
2524 2524
 							}
2525 2525
 
2526 2526
 						 }
2527 2527
 						//if($line->qty>90) print ' : ';
2528
-						if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2528
+						if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2529 2529
 
2530 2530
 			?>
2531 2531
 				</td>
2532 2532
 				 <td colspan="<?php echo $colspan; ?>">
2533 2533
 <?php
2534
-						if(in_array('expeditioncard', $contexts) && $action == 'create')
2534
+						if (in_array('expeditioncard', $contexts) && $action == 'create')
2535 2535
 						{
2536 2536
 							$fk_entrepot = GETPOST('entrepot_id', 'int');
2537 2537
 ?>
@@ -2558,100 +2558,100 @@  discard block
 block discarded – undo
2558 2558
 			$shipment_static = new Expedition($db);
2559 2559
 			$warehousestatic = new Entrepot($db);
2560 2560
 			$extrafieldsline = new ExtraFields($db);
2561
-			$extralabelslines=$extrafieldsline->fetch_name_optionals_label($object->table_element_line);
2561
+			$extralabelslines = $extrafieldsline->fetch_name_optionals_label($object->table_element_line);
2562 2562
 
2563 2563
 			$colspan = 4;
2564
-			if($object->origin && $object->origin_id > 0) $colspan++;
2565
-			if(! empty($conf->stock->enabled)) $colspan++;
2566
-			if(! empty($conf->productbatch->enabled)) $colspan++;
2567
-			if($object->statut == 0) $colspan++;
2568
-			if($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
2564
+			if ($object->origin && $object->origin_id > 0) $colspan++;
2565
+			if (!empty($conf->stock->enabled)) $colspan++;
2566
+			if (!empty($conf->productbatch->enabled)) $colspan++;
2567
+			if ($object->statut == 0) $colspan++;
2568
+			if ($object->statut == 0 && empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK)) $colspan++;
2569 2569
 
2570
-			if($object->element == 'delivery') $colspan = 2;
2570
+			if ($object->element == 'delivery') $colspan = 2;
2571 2571
 
2572 2572
 			print '<!-- origin line id = '.$line->origin_line_id.' -->'; // id of order line
2573 2573
 
2574 2574
 			// HTML 5 data for js
2575 2575
 			$data = $this->_getHtmlData($parameters, $object, $action, $hookmanager);
2576 2576
 			?>
2577
-			<tr <?php echo $bc[$var]; $var=!$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2577
+			<tr <?php echo $bc[$var]; $var = !$var; echo $data; ?> rel="subtotal" id="row-<?php echo $line->id ?>" style="<?php
2578 2578
 					if (!empty($conf->global->SUBTOTAL_USE_NEW_FORMAT))
2579 2579
 					{
2580
-						if($line->qty==99) print 'background:#adadcf';
2581
-						else if($line->qty==98) print 'background:#ddddff;';
2582
-						else if($line->qty<=97 && $line->qty>=91) print 'background:#eeeeff;';
2583
-						else if($line->qty==1) print 'background:#adadcf;';
2584
-						else if($line->qty==2) print 'background:#ddddff;';
2585
-						else if($line->qty==50) print '';
2580
+						if ($line->qty == 99) print 'background:#adadcf';
2581
+						else if ($line->qty == 98) print 'background:#ddddff;';
2582
+						else if ($line->qty <= 97 && $line->qty >= 91) print 'background:#eeeeff;';
2583
+						else if ($line->qty == 1) print 'background:#adadcf;';
2584
+						else if ($line->qty == 2) print 'background:#ddddff;';
2585
+						else if ($line->qty == 50) print '';
2586 2586
 						else print 'background:#eeeeff;';
2587 2587
 
2588 2588
 						//A compléter si on veux plus de nuances de couleurs avec les niveau 4,5,6,7,8 et 9
2589 2589
 					}
2590 2590
 					else 
2591 2591
 					{
2592
-						if($line->qty==99) print 'background:#ddffdd';
2593
-						else if($line->qty==98) print 'background:#ddddff;';
2594
-						else if($line->qty==2) print 'background:#eeeeff; ';
2595
-						else if($line->qty==50) print '';
2596
-						else print 'background:#eeffee;' ;
2592
+						if ($line->qty == 99) print 'background:#ddffdd';
2593
+						else if ($line->qty == 98) print 'background:#ddddff;';
2594
+						else if ($line->qty == 2) print 'background:#eeeeff; ';
2595
+						else if ($line->qty == 50) print '';
2596
+						else print 'background:#eeffee;';
2597 2597
 					}
2598 2598
 
2599 2599
 			?>;">
2600 2600
 
2601 2601
 			<?php
2602 2602
 			// #
2603
-			if (! empty($conf->global->MAIN_VIEW_LINE_NUMBER))
2603
+			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER))
2604 2604
 			{
2605
-				print '<td align="center">'.($i+1).'</td>';
2605
+				print '<td align="center">'.($i + 1).'</td>';
2606 2606
 			}
2607 2607
 			?>
2608 2608
 
2609
-			<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty>90)?'text-align:right':'' ?> "><?php
2609
+			<td style="<?php TSubtotal::isFreeText($line) ? '' : 'font-weight:bold;'; ?>  <?php echo ($line->qty > 90) ? 'text-align:right' : '' ?> "><?php
2610 2610
 
2611 2611
 
2612 2612
 			if ($conf->global->SUBTOTAL_USE_NEW_FORMAT)
2613 2613
 			{
2614
-				if(TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
2614
+				if (TSubtotal::isTitle($line) || TSubtotal::isSubtotal($line))
2615 2615
 				{
2616
-					echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty-1);
2616
+					echo str_repeat('&nbsp;&nbsp;&nbsp;', $line->qty - 1);
2617 2617
 
2618 2618
 					if (TSubtotal::isTitle($line)) print img_picto('', 'subtotal@subtotal').'<span style="font-size:9px;margin-left:-3px;">'.$line->qty.'</span>&nbsp;&nbsp;';
2619
-					else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100-$line->qty).'</span>&nbsp;&nbsp;';
2619
+					else print img_picto('', 'subtotal2@subtotal').'<span style="font-size:9px;margin-left:-1px;">'.(100 - $line->qty).'</span>&nbsp;&nbsp;';
2620 2620
 				}
2621 2621
 			}
2622 2622
 			else
2623 2623
 			{
2624
-				if($line->qty<=1) print img_picto('', 'subtotal@subtotal');
2625
-				else if($line->qty==2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
2624
+				if ($line->qty <= 1) print img_picto('', 'subtotal@subtotal');
2625
+				else if ($line->qty == 2) print img_picto('', 'subsubtotal@subtotal').'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
2626 2626
 			}
2627 2627
 
2628 2628
 
2629 2629
 			// Get display styles and apply them
2630 2630
 			$titleStyleItalic = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'I') === false ? '' : ' font-style: italic;';
2631
-			$titleStyleBold =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2632
-			$titleStyleUnderline =  strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2631
+			$titleStyleBold = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'B') === false ? '' : ' font-weight:bold;';
2632
+			$titleStyleUnderline = strpos($conf->global->SUBTOTAL_TITLE_STYLE, 'U') === false ? '' : ' text-decoration: underline;';
2633 2633
 
2634 2634
 			if (empty($line->label)) {
2635 2635
 				if ($line->qty >= 91 && $line->qty <= 99 && $conf->global->SUBTOTAL_USE_NEW_FORMAT) print  $line->description.' '.$this->getTitle($object, $line);
2636 2636
 				else print  $line->description;
2637 2637
 			}
2638 2638
 			else {
2639
-				if (! empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2639
+				if (!empty($conf->global->PRODUIT_DESC_IN_FORM) && !empty($line->description)) {
2640 2640
 					print '<span class="subtotal_label" style="'.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" >'.$line->label.'</span><br><div class="subtotal_desc">'.dol_htmlentitiesbr($line->description).'</div>';
2641 2641
 				}
2642
-				else{
2642
+				else {
2643 2643
 					print '<span class="subtotal_label classfortooltip '.$titleStyleItalic.$titleStyleBold.$titleStyleUnderline.'" title="'.$line->description.'">'.$line->label.'</span>';
2644 2644
 				}
2645 2645
 			}
2646 2646
 			//if($line->qty>90) print ' : ';
2647
-			if($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2647
+			if ($line->info_bits > 0) echo img_picto($langs->trans('Pagebreak'), 'pagebreak@subtotal');
2648 2648
 
2649 2649
 			?>
2650 2650
 				</td>
2651 2651
 				<td colspan="<?php echo $colspan; ?>">&nbsp;</td>
2652 2652
 			<?php
2653 2653
 
2654
-			if ($object->element == 'shipping' && $object->statut == 0 && ! empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
2654
+			if ($object->element == 'shipping' && $object->statut == 0 && !empty($conf->global->SUBTOTAL_ALLOW_REMOVE_BLOCK))
2655 2655
 			{
2656 2656
 				print '<td class="linecoldelete nowrap" width="10">';
2657 2657
 
@@ -2660,12 +2660,12 @@  discard block
 block discarded – undo
2660 2660
 					echo '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=deleteline&amp;lineid='.$line->id.'">'.img_delete().'</a>';
2661 2661
 				}
2662 2662
 
2663
-				if(TSubtotal::isTitle($line) && ($line->fk_prev_id === null) )
2663
+				if (TSubtotal::isTitle($line) && ($line->fk_prev_id === null))
2664 2664
 				{
2665 2665
 					if ((float) DOL_VERSION >= 8.0) {
2666 2666
 						$img_delete = img_delete($langs->trans('deleteWithAllLines'), ' class="pictodelete pictodeleteallline"');
2667 2667
 					} elseif ((float) DOL_VERSION >= 3.8) {
2668
-						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal',' class="pictodelete" ');
2668
+						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all.3.8@subtotal', ' class="pictodelete" ');
2669 2669
 					} else {
2670 2670
 						$img_delete = img_picto($langs->trans('deleteWithAllLines'), 'delete_all@subtotal');
2671 2671
 					}
@@ -2675,7 +2675,7 @@  discard block
 block discarded – undo
2675 2675
 					/* Depuis la 8.0, les icônes "standard" utilisent FontAwesome et sont préconfigurées selon la clé de l'image
2676 2676
 					 * Impossible d'en customiser par exemple la couleur, même en utilisant img_picto() directement
2677 2677
 					 */
2678
-					if((float) DOL_VERSION >= 8.0) {
2678
+					if ((float) DOL_VERSION >= 8.0) {
2679 2679
 						?>
2680 2680
 							<script>
2681 2681
 								$(document).ready(function () {
@@ -2693,11 +2693,11 @@  discard block
 block discarded – undo
2693 2693
 			print "</tr>";
2694 2694
 
2695 2695
 			// Display lines extrafields
2696
-			if ($object->element == 'shipping' && ! empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE) && is_array($extralabelslines) && count($extralabelslines)>0) {
2696
+			if ($object->element == 'shipping' && !empty($conf->global->SUBTOTAL_ALLOW_EXTRAFIELDS_ON_TITLE) && is_array($extralabelslines) && count($extralabelslines) > 0) {
2697 2697
 				$line = new ExpeditionLigne($db);
2698 2698
 				$line->fetch_optionals($line->id);
2699 2699
 				print '<tr class="oddeven">';
2700
-				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan),$i);
2700
+				print $line->showOptionals($extrafieldsline, 'view', array('style'=>$bc[$var], 'colspan'=>$colspan), $i);
2701 2701
 			}
2702 2702
 
2703 2703
 			return 1;
@@ -2709,20 +2709,20 @@  discard block
 block discarded – undo
2709 2709
 
2710 2710
 	
2711 2711
 	function addMoreActionsButtons($parameters, &$object, &$action, $hookmanager) {
2712
-		global $conf,$langs;
2712
+		global $conf, $langs;
2713 2713
 		 
2714 2714
 		if ($object->statut == 0 && !empty($conf->global->SUBTOTAL_MANAGE_COMPRIS_NONCOMPRIS) && $action != 'editline')
2715 2715
 		{
2716 2716
 		    
2717
-		    if($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
2717
+		    if ($object->element == 'invoice_supplier' || $object->element == 'order_supplier')
2718 2718
 		    {
2719 2719
 		        foreach ($object->lines as $line)
2720 2720
 		        {
2721 2721
 		            // fetch optionals attributes and labels
2722 2722
 		            require_once(DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php');
2723
-		            $extrafields=new ExtraFields($this->db);
2724
-		            $extralabels=$extrafields->fetch_name_optionals_label($object->table_element_line,true);
2725
-		            $line->fetch_optionals($line->id,$extralabels);
2723
+		            $extrafields = new ExtraFields($this->db);
2724
+		            $extralabels = $extrafields->fetch_name_optionals_label($object->table_element_line, true);
2725
+		            $line->fetch_optionals($line->id, $extralabels);
2726 2726
 		        }
2727 2727
 		    }
2728 2728
 		    
@@ -2822,23 +2822,23 @@  discard block
 block discarded – undo
2822 2822
 	    $ThtmlData['data-qty']          = 0; //$line->qty;
2823 2823
 	    $ThtmlData['data-level']        = TSubtotal::getNiveau($line);
2824 2824
 	    
2825
-	    if(TSubtotal::isTitle($line)){
2825
+	    if (TSubtotal::isTitle($line)) {
2826 2826
 	        $ThtmlData['data-issubtotal'] = 'title';
2827
-	    }elseif(TSubtotal::isSubtotal($line)){
2827
+	    }elseif (TSubtotal::isSubtotal($line)) {
2828 2828
 	        $ThtmlData['data-issubtotal'] = 'subtotal';
2829 2829
 	    }
2830
-	    else{
2830
+	    else {
2831 2831
 	        $ThtmlData['data-issubtotal'] = 'freetext';
2832 2832
 	    }
2833 2833
 	    
2834 2834
 	    
2835 2835
 	    // Change or add data  from hooks
2836
-	    $parameters = array_replace($parameters , array(  'ThtmlData' => $ThtmlData )  );
2836
+	    $parameters = array_replace($parameters, array('ThtmlData' => $ThtmlData));
2837 2837
 	    
2838 2838
 	    // hook 
2839
-	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
2839
+	    $reshook = $hookmanager->executeHooks('subtotalLineHtmlData', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
2840 2840
 	    if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
2841
-	    if ($reshook>0)
2841
+	    if ($reshook > 0)
2842 2842
 	    {
2843 2843
 	        $ThtmlData = $hookmanager->resArray;
2844 2844
 	    }
@@ -2851,14 +2851,14 @@  discard block
 block discarded – undo
2851 2851
 	function implodeHtmlData($ThtmlData = array())
2852 2852
 	{
2853 2853
 	    $data = '';
2854
-	    foreach($ThtmlData as $k => $h )
2854
+	    foreach ($ThtmlData as $k => $h)
2855 2855
 	    {
2856
-	        if(is_array($h))
2856
+	        if (is_array($h))
2857 2857
 	        {
2858 2858
 	            $h = json_encode($h);
2859 2859
 	        }
2860 2860
 	        
2861
-	        $data .= $k . '="'.dol_htmlentities($h, ENT_QUOTES).'" ';
2861
+	        $data .= $k.'="'.dol_htmlentities($h, ENT_QUOTES).'" ';
2862 2862
 	    }
2863 2863
 	    
2864 2864
 	    return $data;
@@ -2866,26 +2866,26 @@  discard block
 block discarded – undo
2866 2866
 	
2867 2867
 	function _ajax_block_order_js($object)
2868 2868
 	{
2869
-	    global $conf,$tagidfortablednd,$filepath,$langs;
2869
+	    global $conf, $tagidfortablednd, $filepath, $langs;
2870 2870
 	    
2871 2871
 	    /*
2872 2872
 	     * this part of js is base on dolibarr htdocs/core/tpl/ajaxrow.tpl.php 
2873 2873
 	     * for compatibility reasons we don't use tableDnD but jquery sortable
2874 2874
 	     */
2875 2875
 	    
2876
-	    $id=$object->id;
2877
-	    $nboflines=(isset($object->lines)?count($object->lines):0);
2878
-	    $forcereloadpage=empty($conf->global->MAIN_FORCE_RELOAD_PAGE)?0:1;
2876
+	    $id = $object->id;
2877
+	    $nboflines = (isset($object->lines) ?count($object->lines) : 0);
2878
+	    $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
2879 2879
 	    
2880
-	    $id=$object->id;
2881
-	    $fk_element=$object->fk_element;
2882
-	    $table_element_line=$object->table_element_line;
2883
-	    $nboflines=(isset($object->lines)?count($object->lines):(empty($nboflines)?0:$nboflines));
2884
-	    $tagidfortablednd=(empty($tagidfortablednd)?'tablelines':$tagidfortablednd);
2885
-	    $filepath=(empty($filepath)?'':$filepath);
2880
+	    $id = $object->id;
2881
+	    $fk_element = $object->fk_element;
2882
+	    $table_element_line = $object->table_element_line;
2883
+	    $nboflines = (isset($object->lines) ?count($object->lines) : (empty($nboflines) ? 0 : $nboflines));
2884
+	    $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
2885
+	    $filepath = (empty($filepath) ? '' : $filepath);
2886 2886
 	    
2887 2887
 	    
2888
-	    if (GETPOST('action','aZ09') != 'editline' && $nboflines > 1)
2888
+	    if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1)
2889 2889
 	    {
2890 2890
 	        
2891 2891
 	        ?>
@@ -2903,7 +2903,7 @@  discard block
 block discarded – undo
2903 2903
 				moveBlockCol.disableSelection(); // prevent selection
2904 2904
 <?php if ($object->statut == 0) { ?>
2905 2905
 				// apply some graphical stuff
2906
-				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png',2);  ?>)');
2906
+				moveBlockCol.css("background-image",'url(<?php echo dol_buildpath('subtotal/img/grip_all.png', 2); ?>)');
2907 2907
 				moveBlockCol.css("background-repeat","no-repeat");
2908 2908
 				moveBlockCol.css("background-position","center center");
2909 2909
 				moveBlockCol.css("cursor","move");
Please login to merge, or discard this patch.