Passed
Push — master ( 4e6d28...85ca43 )
by
unknown
02:49
created
class/subtotal.class.php 1 patch
Spacing   +193 added lines, -193 removed lines patch added patch discarded remove patch
@@ -5,28 +5,28 @@  discard block
 block discarded – undo
5 5
 	
6 6
 	static $module_number = 104777;
7 7
 	
8
-	static function addSubTotalLine(&$object, $label, $qty, $rang=-1) {
8
+	static function addSubTotalLine(&$object, $label, $qty, $rang = -1) {
9 9
 		
10 10
 		$res = 0;
11 11
 		
12
-		if( (float)DOL_VERSION <= 3.4 ) {
12
+		if ((float) DOL_VERSION <= 3.4) {
13 13
 			/**
14 14
 			 * @var $object Facture
15 15
 			 */
16
-			if($object->element=='facture') $res =  $object->addline($object->id, $label, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,-1, TSubtotal::$module_number);
16
+			if ($object->element == 'facture') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, -1, TSubtotal::$module_number);
17 17
 			/**
18 18
 			 * @var $object Propal
19 19
 			 */
20
-			else if($object->element=='propal') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,'HT',0,0,9,-1, TSubtotal::$module_number);
20
+			else if ($object->element == 'propal') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, -1, TSubtotal::$module_number);
21 21
 			/**
22 22
 			 * @var $object Commande
23 23
 			 */
24
-			else if($object->element=='commande') $res =  $object->addline($object->id,$label, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,-1, TSubtotal::$module_number);
24
+			else if ($object->element == 'commande') $res = $object->addline($object->id, $label, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, -1, TSubtotal::$module_number);
25 25
 
26 26
 		}
27 27
 		else {
28 28
 			$desc = '';
29
-			if ((float) DOL_VERSION < 6  || $qty==50) {
29
+			if ((float) DOL_VERSION < 6 || $qty == 50) {
30 30
 				$desc = $label;
31 31
 				$label = '';
32 32
 			}
@@ -34,40 +34,40 @@  discard block
 block discarded – undo
34 34
 			/**
35 35
 			 * @var $object Facture
36 36
 			 */
37
-			if($object->element=='facture') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,'','',0,0,'','HT',0,9,$rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
37
+			if ($object->element == 'facture') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, '', '', 0, 0, '', 'HT', 0, 9, $rang, TSubtotal::$module_number, '', 0, 0, null, 0, $label);
38 38
 			/**
39 39
 			 * @var $object Facture fournisseur
40 40
 			 */
41
-			else if($object->element=='invoice_supplier') {
41
+			else if ($object->element == 'invoice_supplier') {
42 42
 			    $object->special_code = TSubtotal::$module_number;
43 43
 			    $rang = $object->line_max() + 1;
44
-			    if($qty==50) $res = $object->addline($desc,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
45
-			    else $res = $object->addline($label,0,0,0,0,$qty,0,0,'','',0,0,'HT',9,$rang);
44
+			    if ($qty == 50) $res = $object->addline($desc, 0, 0, 0, 0, $qty, 0, 0, '', '', 0, 0, 'HT', 9, $rang);
45
+			    else $res = $object->addline($label, 0, 0, 0, 0, $qty, 0, 0, '', '', 0, 0, 'HT', 9, $rang);
46 46
 			}
47 47
 			/**
48 48
 			 * @var $object Propal
49 49
 			 */
50
-			else if($object->element=='propal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
50
+			else if ($object->element == 'propal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
51 51
 			/**
52 52
 			 * @var $object Propal Fournisseur
53 53
 			 */
54
-			else if($object->element=='supplier_proposal') $res = $object->addline($desc, 0,$qty,0,0,0,0,0,'HT',0,0,9,$rang, TSubtotal::$module_number, 0, 0, 0, $label);
54
+			else if ($object->element == 'supplier_proposal') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, 0, 9, $rang, TSubtotal::$module_number, 0, 0, 0, $label);
55 55
 			
56 56
 			/**
57 57
 			 * @var $object Commande
58 58
 			 */
59
-			else if($object->element=='commande') $res =  $object->addline($desc, 0,$qty,0,0,0,0,0,0,0,'HT',0,'','',9,$rang, TSubtotal::$module_number, 0, null, 0, $label);
59
+			else if ($object->element == 'commande') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 0, 0, 'HT', 0, '', '', 9, $rang, TSubtotal::$module_number, 0, null, 0, $label);
60 60
 			/**
61 61
 			 * @var $object Commande fournisseur
62 62
 			 */
63
-			else if($object->element=='order_supplier') {
63
+			else if ($object->element == 'order_supplier') {
64 64
 			    $object->special_code = TSubtotal::$module_number;
65
-			    $res = $object->addline($label, 0,$qty,0,0,0,0,0,'',0,'HT', 0, 9);
65
+			    $res = $object->addline($label, 0, $qty, 0, 0, 0, 0, 0, '', 0, 'HT', 0, 9);
66 66
 			}
67 67
 			/**
68 68
 			 * @var $object Facturerec
69 69
 			 */
70
-			else if($object->element=='facturerec') $res =  $object->addline($desc, 0,$qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number,$label); 
70
+			else if ($object->element == 'facturerec') $res = $object->addline($desc, 0, $qty, 0, 0, 0, 0, 0, 'HT', 0, '', 0, 9, $rang, TSubtotal::$module_number, $label); 
71 71
 			
72 72
 		}
73 73
 	
@@ -78,20 +78,20 @@  discard block
 block discarded – undo
78 78
 
79 79
 	public static function generateDoc(&$object)
80 80
 	{
81
-		global $conf,$langs,$db;
81
+		global $conf, $langs, $db;
82 82
 		
83 83
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE))
84 84
 		{
85
-			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
86
-			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
87
-			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (! empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
85
+			$hidedetails = (GETPOST('hidedetails', 'int') ? GETPOST('hidedetails', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0));
86
+			$hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0));
87
+			$hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
88 88
 			
89 89
 			// Define output language
90 90
 			$outputlangs = $langs;
91 91
 			$newlang = GETPOST('lang_id', 'alpha');
92
-			if (! empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
92
+			if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang))
93 93
 				$newlang = !empty($object->client) ? $object->client->default_lang : $object->thirdparty->default_lang;
94
-			if (! empty($newlang)) {
94
+			if (!empty($newlang)) {
95 95
 				$outputlangs = new Translate("", $conf);
96 96
 				$outputlangs->setDefaultLang($newlang);
97 97
 			}
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 			}
106 106
 			else
107 107
 			{
108
-				if ($object->element!= 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
108
+				if ($object->element != 'facturerec') $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
109 109
 			}
110 110
 		}
111 111
 	}
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
 	 * @param type $rang_start
118 118
 	 * @param type $move_to
119 119
 	 */
120
-	public static function updateRang(&$object, $rang_start, $move_to=1)
120
+	public static function updateRang(&$object, $rang_start, $move_to = 1)
121 121
 	{
122 122
 		if (!class_exists('GenericObject')) require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
123 123
 		
124
-		$row=new GenericObject($object->db);
124
+		$row = new GenericObject($object->db);
125 125
 		$row->table_element_line = $object->table_element_line;
126 126
 		$row->fk_element = $object->fk_element;
127 127
 		$row->id = $object->id;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 		{
131 131
 			if ($line->rang < $rang_start) continue;
132 132
 			
133
-			$row->updateRangOfLine($line->id, $line->rang+$move_to);
133
+			$row->updateRangOfLine($line->id, $line->rang + $move_to);
134 134
 		}
135 135
 	}
136 136
 	
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 			{
160 160
 				if ($rang_to_add != -1) self::updateRang($object, $rang_to_add);
161 161
 				
162
-				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100-$title_niveau, $rang_to_add);
162
+				self::addSubTotalLine($object, $langs->trans('SubTotal'), 100 - $title_niveau, $rang_to_add);
163 163
 				
164 164
 				$object->lines[] = $object->line; // ajout de la ligne dans le tableau de ligne (Dolibarr ne le fait pas)
165 165
 				if ($rang_to_add != -1) 
@@ -171,14 +171,14 @@  discard block
 block discarded – undo
171 171
 		}
172 172
 	}
173 173
 	
174
-	public static function addTitle(&$object, $label, $level, $rang=-1)
174
+	public static function addTitle(&$object, $label, $level, $rang = -1)
175 175
 	{
176 176
 		self::addSubTotalLine($object, $label, $level, $rang);
177 177
 	}
178 178
 	
179
-	public static function addTotal(&$object, $label, $level, $rang=-1)
179
+	public static function addTotal(&$object, $label, $level, $rang = -1)
180 180
 	{
181
-		self::addSubTotalLine($object, $label, (100-$level), $rang);
181
+		self::addSubTotalLine($object, $label, (100 - $level), $rang);
182 182
 	}
183 183
 
184 184
 	/**
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
 	 * 
190 190
 	 * @return array
191 191
 	 */
192
-	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total=false)
192
+	public static function getAllTitleWithoutTotalFromDocument(&$object, $get_block_total = false)
193 193
 	{
194 194
 		$TTitle = self::getAllTitleFromDocument($object, $get_block_total);
195 195
 		
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 	 * @param boolean								$return_rang_on_false	si true alors renvoi le rang où devrait ce trouver le sous-total
211 211
 	 * @return boolean
212 212
 	 */
213
-	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode=false, $return_rang_on_false=false)
213
+	public static function titleHasTotalLine(&$object, &$title_line, $strict_mode = false, $return_rang_on_false = false)
214 214
 	{
215 215
 		if (empty($object->lines) || !is_array($object->lines)) return false;
216 216
 		
@@ -236,7 +236,7 @@  discard block
 block discarded – undo
236 236
 		return ($return_rang_on_false) ? -1 : false;
237 237
 	}
238 238
 	
239
-	public static function getAllTitleFromDocument(&$object, $get_block_total=false)
239
+	public static function getAllTitleFromDocument(&$object, $get_block_total = false)
240 240
 	{
241 241
 		$TRes = array();
242 242
 		if (!empty($object->lines))
@@ -357,19 +357,19 @@  discard block
 block discarded – undo
357 357
 		return false;
358 358
 	}
359 359
 	
360
-	public static function isTitle(&$line, $level=-1)
360
+	public static function isTitle(&$line, $level = -1)
361 361
 	{
362 362
 		$res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty <= 9;
363
-		if($res && $level > -1) {
363
+		if ($res && $level > -1) {
364 364
 			return $line->qty == $level;
365 365
 		} else return $res;
366 366
 		
367 367
 	}
368 368
 	
369
-	public static function isSubtotal(&$line, $level=-1)
369
+	public static function isSubtotal(&$line, $level = -1)
370 370
 	{
371 371
 	    $res = $line->special_code == self::$module_number && $line->product_type == 9 && $line->qty >= 90;
372
-	    if($res && $level > -1) {
372
+	    if ($res && $level > -1) {
373 373
 	        return self::getNiveau($line) == $level;
374 374
 	    } else return $res;
375 375
 	}
@@ -384,43 +384,43 @@  discard block
 block discarded – undo
384 384
 		return self::isTitle($line) || self::isSubtotal($line) || self::isFreeText($line);
385 385
 	}
386 386
 
387
-	public static function getFreeTextHtml(&$line, $readonly=0)
387
+	public static function getFreeTextHtml(&$line, $readonly = 0)
388 388
 	{
389 389
 		global $conf;
390 390
 		
391 391
 		// Copie du fichier "objectline_edit.tpl.php"
392 392
 		// editeur wysiwyg
393 393
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
394
-		$nbrows=ROWS_2;
395
-		if (! empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows=$conf->global->MAIN_INPUT_DESC_HEIGHT;
396
-		$enable=(isset($conf->global->FCKEDITOR_ENABLE_DETAILS)?$conf->global->FCKEDITOR_ENABLE_DETAILS:0);
397
-		$toolbarname='dolibarr_details';
398
-		if (! empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname='dolibarr_notes';
399
-		$text = !empty($line->description)?$line->description:$line->label;
400
-		$doleditor=new DolEditor('line-description',$text,'',164,$toolbarname,'',false,true,$enable,$nbrows,'98%', $readonly);
394
+		$nbrows = ROWS_2;
395
+		if (!empty($conf->global->MAIN_INPUT_DESC_HEIGHT)) $nbrows = $conf->global->MAIN_INPUT_DESC_HEIGHT;
396
+		$enable = (isset($conf->global->FCKEDITOR_ENABLE_DETAILS) ? $conf->global->FCKEDITOR_ENABLE_DETAILS : 0);
397
+		$toolbarname = 'dolibarr_details';
398
+		if (!empty($conf->global->FCKEDITOR_ENABLE_DETAILS_FULL)) $toolbarname = 'dolibarr_notes';
399
+		$text = !empty($line->description) ? $line->description : $line->label;
400
+		$doleditor = new DolEditor('line-description', $text, '', 164, $toolbarname, '', false, true, $enable, $nbrows, '98%', $readonly);
401 401
 		return $doleditor->Create(1);
402 402
 	}
403 403
 	
404
-	public static function duplicateLines(&$object, $lineid, $withBlockLine=false)
404
+	public static function duplicateLines(&$object, $lineid, $withBlockLine = false)
405 405
 	{
406
-		global $db,$user,$conf;
406
+		global $db, $user, $conf;
407 407
 
408 408
 		$createRight = $user->rights->{$object->element}->creer;
409
-		if($object->element == 'facturerec' )
409
+		if ($object->element == 'facturerec')
410 410
 		{
411 411
 		    $object->statut = 0; // hack for facture rec
412 412
 		    $createRight = $user->rights->facture->creer;
413 413
 		}
414
-		elseif($object->element == 'order_supplier' )
414
+		elseif ($object->element == 'order_supplier')
415 415
 		{
416 416
 		    $createRight = $user->rights->fournisseur->commande->creer;
417 417
 		}
418
-		elseif($object->element == 'invoice_supplier' )
418
+		elseif ($object->element == 'invoice_supplier')
419 419
 		{
420 420
 		    $createRight = $user->rights->fournisseur->facture->creer;
421 421
 		}
422 422
 		
423
-		if ($object->statut == 0  && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
423
+		if ($object->statut == 0 && $createRight && !empty($conf->global->SUBTOTAL_ALLOW_DUPLICATE_BLOCK))
424 424
 		{
425 425
 			dol_include_once('/subtotal/lib/subtotal.lib.php');
426 426
 			
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
 						case 'order_supplier':
454 454
 						    $object->line = $line;
455 455
 						    $object->line->fk_commande = $object->id;
456
-						    $object->line->rang = $object->line_max() +1;
456
+						    $object->line->rang = $object->line_max() + 1;
457 457
 						    $res = $object->line->insert(1);
458 458
 							break;
459 459
 							
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 					{
494 494
 						$object->line_from = $line;
495 495
 						// Call trigger
496
-						$result=$object->call_trigger('LINE_DUPLICATE',$user); // $object->line
496
+						$result = $object->call_trigger('LINE_DUPLICATE', $user); // $object->line
497 497
 						if ($result < 0)
498 498
 						{
499 499
 							$object->db->rollback();
@@ -523,7 +523,7 @@  discard block
 block discarded – undo
523 523
 		}
524 524
 	}
525 525
 	
526
-	public static function getLinesFromTitle(&$object, $key_trad, $level=1, $under_title='', $withBlockLine=false, $key_is_id=false)
526
+	public static function getLinesFromTitle(&$object, $key_trad, $level = 1, $under_title = '', $withBlockLine = false, $key_is_id = false)
527 527
 	{
528 528
 		global $langs;
529 529
 		
@@ -535,17 +535,17 @@  discard block
 block discarded – undo
535 535
 		
536 536
 		$TLine = array();
537 537
 		$add_line = false;
538
-		$under_title_found=false;
538
+		$under_title_found = false;
539 539
 		
540 540
 		foreach ($object->lines as $key => &$line)
541 541
 		{
542 542
 			if (!$under_title_found && !empty($TTitle_under_search))
543 543
 			{
544
-				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search)) ) $under_title_found = true;
544
+				if ($line->product_type == 9 && (in_array($line->desc, $TTitle_under_search) || in_array($line->label, $TTitle_under_search))) $under_title_found = true;
545 545
 			}
546 546
 			else
547 547
 			{
548
-				if ( ($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search) )))
548
+				if (($key_is_id && $line->id == $key_trad) || (!$key_is_id && $line->product_type == 9 && $line->qty == $level && (in_array($line->desc, $TTitle_search) || in_array($line->label, $TTitle_search))))
549 549
 				{
550 550
 					if ($key_is_id) $level = $line->qty;
551 551
 					
@@ -553,7 +553,7 @@  discard block
 block discarded – undo
553 553
 					if ($withBlockLine) $TLine[] = $line;
554 554
 					continue;
555 555
 				}
556
-				elseif ($add_line && $line->product_type == 9 && (100 - $line->qty == $level) ) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
556
+				elseif ($add_line && $line->product_type == 9 && (100 - $line->qty == $level)) // Si on tombe sur un sous-total, il faut que ce soit un du même niveau que le titre
557 557
 				{
558 558
 					if ($withBlockLine) $TLine[] = $line;
559 559
 					break;
@@ -561,7 +561,7 @@  discard block
 block discarded – undo
561 561
 				
562 562
 				if ($add_line)
563 563
 				{
564
-					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line)) ) continue;
564
+					if (!$withBlockLine && (self::isTitle($line) || self::isSubtotal($line))) continue;
565 565
 					else $TLine[] = $line;
566 566
 				}
567 567
 			}
@@ -570,12 +570,12 @@  discard block
 block discarded – undo
570 570
 		return $TLine;
571 571
 	}
572 572
 	
573
-	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine=false)
573
+	public static function getLinesFromTitleId(&$object, $lineid, $withBlockLine = false)
574 574
 	{
575 575
 		return self::getLinesFromTitle($object, $lineid, '', '', $withBlockLine, true);
576 576
 	}
577 577
 	
578
-	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1=0, $txlocaltax2=0, $price_base_type='HT', $info_bits=0, $fk_parent_line=0, $skip_update_total=0, $fk_fournprice=null, $pa_ht=0, $label='', $special_code=0, $array_options=0, $situation_percent=0, $fk_unit = null, $notrigger = 0)
578
+	public static function doUpdateLine(&$object, $rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $type, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 0, $fk_unit = null, $notrigger = 0)
579 579
 	{
580 580
 		$res = 0;
581 581
 		$object->db->begin();
@@ -587,7 +587,7 @@  discard block
 block discarded – undo
587 587
 		        break;
588 588
 		        
589 589
 		    case 'supplier_proposal':
590
-		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options,'', $fk_unit);
590
+		        $res = $object->updateline($rowid, $pu, $qty, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, $desc, $price_base_type, $info_bits, $special_code, $fk_parent_line, $skip_update_total, $fk_fournprice, $pa_ht, $label, $type, $array_options, '', $fk_unit);
591 591
 		        break;
592 592
 		        
593 593
 			case 'commande':
@@ -616,9 +616,9 @@  discard block
 block discarded – undo
616 616
 				$factureRecLine->fetch($rowid);
617 617
 				$factureRecLine->array_options = $array_options;
618 618
 				$factureRecLine->insertExtraFields();
619
-				$rang=$factureRecLine->rang;
619
+				$rang = $factureRecLine->rang;
620 620
 				
621
-				$fk_product=0; $fk_remise_except=''; $pu_ttc=0;	
621
+				$fk_product = 0; $fk_remise_except = ''; $pu_ttc = 0;	
622 622
 				$res = $object->updateline($rowid, $desc, $pu, $qty, $txtva, $txlocaltax1, $txlocaltax2, $fk_product, $remise_percent, $price_base_type, $info_bits, $fk_remise_except, $pu_ttc, $type, $rang, $special_code, $label, $fk_unit);
623 623
 				break;
624 624
 		}
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
 		global $db, $object;
635 635
 		
636 636
 		$TTitle = array();
637
-		if(! empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
637
+		if (!empty($object->id) && in_array($object->element, array('propal', 'commande', 'facture'))) {}
638 638
 		else {
639 639
 			if ($origin_line->element == 'propaldet')
640 640
 			{
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 	 */
715 715
 	public static function addRecapPage(&$parameters, &$origin_pdf)
716 716
 	{
717
-		global $user,$conf,$langs;
717
+		global $user, $conf, $langs;
718 718
 		
719 719
 		$origin_file = $parameters['file'];
720 720
 		$outputlangs = $parameters['outputlangs'];
@@ -730,21 +730,21 @@  discard block
 block discarded – undo
730 730
 		$objmarge->marge_droite = 10;
731 731
 		
732 732
 		$objectref = dol_sanitizeFileName($object->ref);
733
-		if ($object->element == 'propal') $dir = $conf->propal->dir_output . '/' . $objectref;
734
-		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output . '/' . $objectref;
735
-		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output . '/' . $objectref;
733
+		if ($object->element == 'propal') $dir = $conf->propal->dir_output.'/'.$objectref;
734
+		elseif ($object->element == 'commande') $dir = $conf->commande->dir_output.'/'.$objectref;
735
+		elseif ($object->element == 'facture') $dir = $conf->facture->dir_output.'/'.$objectref;
736 736
 		elseif ($object->element == 'facturerec') return; // no PDF for facturerec
737 737
 		else
738 738
 		{
739 739
 			setEventMessage($langs->trans('warning_subtotal_recap_object_element_unknown', $object->element), 'warnings');
740 740
 			return -1;
741 741
 		}
742
-		$file = $dir . '/' . $objectref . '_recap.pdf';
742
+		$file = $dir.'/'.$objectref.'_recap.pdf';
743 743
 
744 744
 //		$pdf=pdf_getInstance($origin_pdf->format);
745
-		$pdf=pdf_getInstance(array(210, 297)); // Format A4 Portrait
746
-		$default_font_size = pdf_getPDFFontSize($outputlangs);	// Must be after pdf_getInstance
747
-		$pdf->SetAutoPageBreak(1,0);
745
+		$pdf = pdf_getInstance(array(210, 297)); // Format A4 Portrait
746
+		$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
747
+		$pdf->SetAutoPageBreak(1, 0);
748 748
 	             
749 749
 		if (class_exists('TCPDF'))
750 750
 		{
@@ -753,49 +753,49 @@  discard block
 block discarded – undo
753 753
 		}
754 754
 		$pdf->SetFont(pdf_getPDFFont($outputlangs));
755 755
 		// Set path to the background PDF File
756
-		if (empty($conf->global->MAIN_DISABLE_FPDI) && ! empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
756
+		if (empty($conf->global->MAIN_DISABLE_FPDI) && !empty($conf->global->MAIN_ADD_PDF_BACKGROUND))
757 757
 		{
758 758
 			$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
759 759
 			$tplidx = $pdf->importPage(1);
760 760
 		}
761 761
 
762 762
 		$pdf->Open();
763
-		$pagenb=0;
764
-		$pdf->SetDrawColor(128,128,128);
763
+		$pagenb = 0;
764
+		$pdf->SetDrawColor(128, 128, 128);
765 765
 
766 766
 		$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
767 767
 		$pdf->SetSubject($outputlangs->transnoentities("subtotalRecap"));
768 768
 		$pdf->SetCreator("Dolibarr ".DOL_VERSION);
769 769
 		$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
770 770
 		$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("subtotalRecap")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
771
-		if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
771
+		if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
772 772
 
773
-		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite);   // Left, Top, Right
773
+		$pdf->SetMargins($objmarge->marge_gauche, $objmarge->marge_haute, $objmarge->marge_droite); // Left, Top, Right
774 774
 
775
-		$pagenb=0;
776
-		$pdf->SetDrawColor(128,128,128);
775
+		$pagenb = 0;
776
+		$pdf->SetDrawColor(128, 128, 128);
777 777
 
778 778
 			
779 779
 		// New page
780 780
 		$pdf->AddPage();
781
-		if (! empty($tplidx)) $pdf->useTemplate($tplidx);
781
+		if (!empty($tplidx)) $pdf->useTemplate($tplidx);
782 782
 		$pagenb++;
783 783
 		
784 784
 		
785 785
 		self::pagehead($objmarge, $pdf, $object, 1, $outputlangs);
786
-		$pdf->SetFont('','', $default_font_size - 1);
787
-		$pdf->MultiCell(0, 3, '');		// Set interline to 3
788
-		$pdf->SetTextColor(0,0,0);
786
+		$pdf->SetFont('', '', $default_font_size - 1);
787
+		$pdf->MultiCell(0, 3, ''); // Set interline to 3
788
+		$pdf->SetTextColor(0, 0, 0);
789 789
 		
790
-		$heightforinfotot = 25;	// Height reserved to output the info and total part
791
-		$heightforfooter = $objmarge->marge_basse + 8;	// Height reserved to output the footer (value include bottom margin)
790
+		$heightforinfotot = 25; // Height reserved to output the info and total part
791
+		$heightforfooter = $objmarge->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
792 792
 		
793 793
 		$posx_designation = 25;
794 794
 		$posx_options = 150;
795 795
 		$posx_montant = 170;
796 796
 		
797 797
 		$tab_top = 72;
798
-		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)?72:20); // TODO à vérifier
798
+		$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 72 : 20); // TODO à vérifier
799 799
 		
800 800
 		$TTot = array('total_ht' => 0, 'total_ttc' => 0, 'TTotal_tva' => array());
801 801
 		
@@ -809,14 +809,14 @@  discard block
 block discarded – undo
809 809
 			$nexY = $tab_top + 10;
810 810
 			
811 811
 			$nblignes = count($TLine);
812
-			foreach($TLine as $i => &$line)
812
+			foreach ($TLine as $i => &$line)
813 813
 			{
814 814
 				$curY = $nexY;
815 815
 				
816 816
 				if (self::getNiveau($line) == 1) 
817 817
 				{
818
-					$pdf->SetFont('','B', $default_font_size - 1);   // Into loop to work with multipage
819
-					$curY+=2;
818
+					$pdf->SetFont('', 'B', $default_font_size - 1); // Into loop to work with multipage
819
+					$curY += 2;
820 820
 					
821 821
 					$TTot['total_ht'] += $line->total_ht;
822 822
 					$TTot['total_tva'] += $line->total_tva;
@@ -835,67 +835,67 @@  discard block
 block discarded – undo
835 835
 						$TTot['TTotal_tva_multicurrency'][$tx] += $amount;
836 836
 					}	
837 837
 				}
838
-				else $pdf->SetFont('','', $default_font_size - 1);   // Into loop to work with multipage
838
+				else $pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
839 839
 				
840
-				$pdf->SetTextColor(0,0,0);
840
+				$pdf->SetTextColor(0, 0, 0);
841 841
 				
842 842
 				$pdf->setTopMargin($tab_top_newpage + 10);
843
-				$pdf->setPageOrientation('', 1, $heightforfooter+$heightforinfotot);	// The only function to edit the bottom margin of current page to set it.
844
-				$pageposbefore=$pdf->getPage();
843
+				$pdf->setPageOrientation('', 1, $heightforfooter + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
844
+				$pageposbefore = $pdf->getPage();
845 845
 				
846
-				$showpricebeforepagebreak=1;
846
+				$showpricebeforepagebreak = 1;
847 847
 				
848 848
 				$decalage = (self::getNiveau($line) - 1) * 2;
849 849
 				
850 850
 				// Print: Designation
851 851
 				$label = $line->label;
852
-				if( (float)DOL_VERSION < 6 ) {
852
+				if ((float) DOL_VERSION < 6) {
853 853
 					$label = !empty($line->label) ? $line->label : $line->desc;
854 854
 				}
855 855
 				
856 856
 				
857 857
 				$pdf->startTransaction();
858
-				$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
859
-				$pageposafter=$pdf->getPage();
858
+				$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
859
+				$pageposafter = $pdf->getPage();
860 860
 				if ($pageposafter > $pageposbefore)	// There is a pagebreak
861 861
 				{
862 862
 					$pdf->rollbackTransaction(true);
863
-					$pageposafter=$pageposbefore;
863
+					$pageposafter = $pageposbefore;
864 864
 					//print $pageposafter.'-'.$pageposbefore;exit;
865
-					$pdf->setPageOrientation('', 1, $heightforfooter);	// The only function to edit the bottom margin of current page to set it.
866
-					$pdf->writeHTMLCell($posx_options-$posx_designation-$decalage, 3, $posx_designation+$decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J',true);
865
+					$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
866
+					$pdf->writeHTMLCell($posx_options - $posx_designation - $decalage, 3, $posx_designation + $decalage, $curY, $outputlangs->convToOutputCharset($label), 0, 1, false, true, 'J', true);
867 867
 
868
-					$pageposafter=$pdf->getPage();
869
-					$posyafter=$pdf->GetY();
868
+					$pageposafter = $pdf->getPage();
869
+					$posyafter = $pdf->GetY();
870 870
 					//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
871
-					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter+$heightforinfotot)))	// There is no space left for total+free text
871
+					if ($posyafter > ($objmarge->page_hauteur - ($heightforfooter + $heightforinfotot)))	// There is no space left for total+free text
872 872
 					{
873
-						if ($i == ($nblignes-1))	// No more lines, and no space left to show total, so we create a new page
873
+						if ($i == ($nblignes - 1))	// No more lines, and no space left to show total, so we create a new page
874 874
 						{
875
-							$pdf->AddPage('','',true);
876
-							if (! empty($tplidx)) $pdf->useTemplate($tplidx);
875
+							$pdf->AddPage('', '', true);
876
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
877 877
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
878
-							$pdf->setPage($pageposafter+1);
878
+							$pdf->setPage($pageposafter + 1);
879 879
 						}
880 880
 					}
881 881
 					else
882 882
 					{
883 883
 						// We found a page break
884
-						$showpricebeforepagebreak=0;
884
+						$showpricebeforepagebreak = 0;
885 885
 					}
886 886
 				}
887 887
 				else	// No pagebreak
888 888
 				{
889 889
 					$pdf->commitTransaction();
890 890
 				}
891
-				$posYAfterDescription=$pdf->GetY();
891
+				$posYAfterDescription = $pdf->GetY();
892 892
 
893 893
 				$nexY = $pdf->GetY();
894
-				$pageposafter=$pdf->getPage();
894
+				$pageposafter = $pdf->getPage();
895 895
 
896 896
 				$pdf->setPage($pageposbefore);
897 897
 				$pdf->setTopMargin($objmarge->marge_haute);
898
-				$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
898
+				$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
899 899
 
900 900
 				// We suppose that a too long description or photo were moved completely on next page
901 901
 				if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
@@ -908,14 +908,14 @@  discard block
 block discarded – undo
908 908
 				if (!empty($line->total_options))
909 909
 				{
910 910
 					$pdf->SetXY($posx_options, $curY);
911
-					$pdf->MultiCell($posx_montant-$posx_options-0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
911
+					$pdf->MultiCell($posx_montant - $posx_options - 0.8, 3, price($line->total_options, 0, $outputlangs), 0, 'R', 0);
912 912
 				}
913 913
 				
914 914
 				// Print: Montant
915 915
 				$pdf->SetXY($posx_montant, $curY);
916
-				$pdf->MultiCell($objmarge->page_largeur-$objmarge->marge_droite-$posx_montant-0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
916
+				$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant - 0.8, 3, price($line->total_ht, 0, $outputlangs), 0, 'R', 0);
917 917
 				
918
-				$nexY+=2;    // Passe espace entre les lignes
918
+				$nexY += 2; // Passe espace entre les lignes
919 919
 
920 920
 				// Detect if some page were added automatically and output _tableau for past pages
921 921
 				while ($pagenb < $pageposafter)
@@ -932,7 +932,7 @@  discard block
 block discarded – undo
932 932
 					
933 933
 					$pagenb++;
934 934
 					$pdf->setPage($pagenb);
935
-					$pdf->setPageOrientation('', 1, 0);	// The only function to edit the bottom margin of current page to set it.
935
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
936 936
 					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) self::pagehead($objmarge, $pdf, $object, 0, $outputlangs);
937 937
 				}
938 938
 			}
@@ -942,19 +942,19 @@  discard block
 block discarded – undo
942 942
 		if ($pagenb == 1)
943 943
 		{
944 944
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $objmarge->page_hauteur - $tab_top - $heightforinfotot - $heightforfooter, 0, $outputlangs, 0, 0, $object->multicurrency_code);
945
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
945
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
946 946
 		}
947 947
 		else
948 948
 		{
949 949
 			self::tableau($objmarge, $pdf, $posx_designation, $posx_options, $posx_montant, $tab_top_newpage, $objmarge->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
950
-			$bottomlasttab=$objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
950
+			$bottomlasttab = $objmarge->page_hauteur - $heightforinfotot - $heightforfooter + 1;
951 951
 		}
952 952
 		
953 953
 		// Affiche zone totaux
954
-		$posy=self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
954
+		$posy = self::tableau_tot($objmarge, $pdf, $object, $bottomlasttab, $outputlangs, $TTot);
955 955
 		
956 956
 		$pdf->Close();
957
-		$pdf->Output($file,'F');
957
+		$pdf->Output($file, 'F');
958 958
 		
959 959
 		$pagecount = self::concat($outputlangs, array($origin_file, $file), $origin_file);
960 960
 		
@@ -966,7 +966,7 @@  discard block
 block discarded – undo
966 966
 		$level = $line->qty; // TODO à améliorer
967 967
 		
968 968
 		$pdf->SetXY($objmarge->marge_gauche, $curY);
969
-		$pdf->MultiCell($posx_designation-$objmarge->marge_gauche-0.8, 5, $level, 0, 'L', 0);
969
+		$pdf->MultiCell($posx_designation - $objmarge->marge_gauche - 0.8, 5, $level, 0, 'L', 0);
970 970
 	}
971 971
 	
972 972
 	/**
@@ -980,50 +980,50 @@  discard block
 block discarded – undo
980 980
 	 */
981 981
 	private static function pagehead(&$objmarge, &$pdf, &$object, $showdetail, $outputlangs)
982 982
 	{
983
-		global $conf,$mysoc;
983
+		global $conf, $mysoc;
984 984
 
985 985
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
986 986
 
987
-		pdf_pagehead($pdf,$outputlangs,$objmarge->page_hauteur);
987
+		pdf_pagehead($pdf, $outputlangs, $objmarge->page_hauteur);
988 988
 
989
-		$pdf->SetTextColor(0,0,60);
990
-		$pdf->SetFont('','B', $default_font_size + 3);
989
+		$pdf->SetTextColor(0, 0, 60);
990
+		$pdf->SetFont('', 'B', $default_font_size + 3);
991 991
 
992
-		$posy=$objmarge->marge_haute;
993
-		$posx=$objmarge->page_largeur-$objmarge->marge_droite-100;
992
+		$posy = $objmarge->marge_haute;
993
+		$posx = $objmarge->page_largeur - $objmarge->marge_droite - 100;
994 994
 		
995
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
995
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
996 996
 
997
-		$logo=$conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
997
+		$logo = $conf->mycompany->dir_output.'/logos/'.$mysoc->logo;
998 998
 		if ($mysoc->logo)
999 999
 		{
1000 1000
 			if (is_readable($logo))
1001 1001
 			{
1002
-			    $height=pdf_getHeightForLogo($logo);
1003
-			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height);	// width=0 (auto)
1002
+			    $height = pdf_getHeightForLogo($logo);
1003
+			    $pdf->Image($logo, $objmarge->marge_gauche, $posy, 0, $height); // width=0 (auto)
1004 1004
 			}
1005 1005
 			else
1006 1006
 			{
1007
-				$pdf->SetTextColor(200,0,0);
1008
-				$pdf->SetFont('','B',$default_font_size - 2);
1009
-				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound",$logo), 0, 'L');
1007
+				$pdf->SetTextColor(200, 0, 0);
1008
+				$pdf->SetFont('', 'B', $default_font_size - 2);
1009
+				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
1010 1010
 				$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
1011 1011
 			}
1012 1012
 			
1013
-			$posy+=35;
1013
+			$posy += 35;
1014 1014
 		}
1015 1015
 		else
1016 1016
 		{
1017
-			$text=$mysoc->name;
1017
+			$text = $mysoc->name;
1018 1018
 			$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
1019 1019
 			
1020
-			$posy+=15;
1020
+			$posy += 15;
1021 1021
 		}
1022 1022
 		
1023 1023
 		
1024
-		$pdf->SetTextColor(0,0,0);
1025
-		$pdf->SetFont('','B', $default_font_size + 2);
1026
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
1024
+		$pdf->SetTextColor(0, 0, 0);
1025
+		$pdf->SetFont('', 'B', $default_font_size + 2);
1026
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
1027 1027
 		
1028 1028
 		$key = 'subtotalPropalTitle';
1029 1029
 		if ($object->element == 'commande') $key = 'subtotalCommandeTitle';
@@ -1032,14 +1032,14 @@  discard block
 block discarded – undo
1032 1032
 		
1033 1033
 		$pdf->MultiCell(150, 4, $outputlangs->transnoentities($key, $object->ref, $object->thirdparty->name), '', 'L');
1034 1034
 		
1035
-		$pdf->SetFont('','', $default_font_size);
1036
-		$pdf->SetXY($objmarge->page_largeur-$objmarge->marge_droite-40,$posy);
1035
+		$pdf->SetFont('', '', $default_font_size);
1036
+		$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - 40, $posy);
1037 1037
 		$pdf->MultiCell(40, 4, dol_print_date($object->date, 'daytext'), '', 'R');
1038 1038
 		
1039 1039
 		$posy += 8;
1040 1040
 			
1041
-		$pdf->SetFont('','B', $default_font_size + 2);
1042
-		$pdf->SetXY($objmarge->marge_gauche,$posy);
1041
+		$pdf->SetFont('', 'B', $default_font_size + 2);
1042
+		$pdf->SetXY($objmarge->marge_gauche, $posy);
1043 1043
 		$pdf->MultiCell(70, 4, $outputlangs->transnoentities('subtotalRecapLot'), '', 'L');
1044 1044
 		
1045 1045
 	}
@@ -1057,44 +1057,44 @@  discard block
 block discarded – undo
1057 1057
 	 *   @param		string		$currency		Currency code
1058 1058
 	 *   @return	void
1059 1059
 	 */
1060
-	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop=0, $hidebottom=0, $currency='')
1060
+	private static function tableau(&$objmarge, &$pdf, $posx_designation, $posx_options, $posx_montant, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '')
1061 1061
 	{
1062 1062
 		global $conf;
1063 1063
 		
1064 1064
 		// Force to disable hidetop and hidebottom
1065
-		$hidebottom=0;
1066
-		if ($hidetop) $hidetop=-1;
1065
+		$hidebottom = 0;
1066
+		if ($hidetop) $hidetop = -1;
1067 1067
 
1068 1068
 		$currency = !empty($currency) ? $currency : $conf->currency;
1069 1069
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
1070 1070
 
1071 1071
 		// Amount in (at tab_top - 1)
1072
-		$pdf->SetTextColor(0,0,0);
1073
-		$pdf->SetFont('','',$default_font_size);
1072
+		$pdf->SetTextColor(0, 0, 0);
1073
+		$pdf->SetFont('', '', $default_font_size);
1074 1074
 
1075 1075
 		if (empty($hidetop))
1076 1076
 		{
1077
-			$titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$currency));
1078
-			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4.5);
1077
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
1078
+			$pdf->SetXY($objmarge->page_largeur - $objmarge->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4.5);
1079 1079
 			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
1080 1080
 			
1081
-			if (! empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite-$objmarge->marge_gauche, 8, 'F', null, explode(',',$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
1081
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) $pdf->Rect($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite - $objmarge->marge_gauche, 8, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
1082 1082
 			
1083 1083
 			
1084
-			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top);	// line prend une position y en 2eme param et 4eme param
1084
+			$pdf->line($objmarge->marge_gauche, $tab_top, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top); // line prend une position y en 2eme param et 4eme param
1085 1085
 
1086
-			$pdf->SetXY($posx_designation, $tab_top+2);
1087
-			$pdf->MultiCell($posx_options - $posx_designation,2, $outputlangs->transnoentities("Designation"),'','L');
1088
-			$pdf->SetXY($posx_options, $tab_top+2);
1089
-			$pdf->MultiCell($posx_montant - $posx_options,2, $outputlangs->transnoentities("Options"),'','R');
1090
-			$pdf->SetXY($posx_montant, $tab_top+2);
1091
-			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant,2, $outputlangs->transnoentities("Amount"),'','R');
1086
+			$pdf->SetXY($posx_designation, $tab_top + 2);
1087
+			$pdf->MultiCell($posx_options - $posx_designation, 2, $outputlangs->transnoentities("Designation"), '', 'L');
1088
+			$pdf->SetXY($posx_options, $tab_top + 2);
1089
+			$pdf->MultiCell($posx_montant - $posx_options, 2, $outputlangs->transnoentities("Options"), '', 'R');
1090
+			$pdf->SetXY($posx_montant, $tab_top + 2);
1091
+			$pdf->MultiCell($objmarge->page_largeur - $objmarge->marge_droite - $posx_montant, 2, $outputlangs->transnoentities("Amount"), '', 'R');
1092 1092
 			
1093
-			$pdf->line($objmarge->marge_gauche, $tab_top+8, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top+8);	// line prend une position y en 2eme param et 4eme param
1093
+			$pdf->line($objmarge->marge_gauche, $tab_top + 8, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top + 8); // line prend une position y en 2eme param et 4eme param
1094 1094
 		}
1095 1095
 		else
1096 1096
 		{
1097
-			$pdf->line($objmarge->marge_gauche, $tab_top-2, $objmarge->page_largeur-$objmarge->marge_droite, $tab_top-2);	// line prend une position y en 2eme param et 4eme param
1097
+			$pdf->line($objmarge->marge_gauche, $tab_top - 2, $objmarge->page_largeur - $objmarge->marge_droite, $tab_top - 2); // line prend une position y en 2eme param et 4eme param
1098 1098
 		}
1099 1099
 		
1100 1100
 	}
@@ -1103,29 +1103,29 @@  discard block
 block discarded – undo
1103 1103
 	{
1104 1104
 		global $conf;
1105 1105
 		
1106
-		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur-$objmarge->marge_droite, $posy);	// line prend une position y en 2eme param et 4eme param
1106
+		$pdf->line($objmarge->marge_gauche, $posy, $objmarge->page_largeur - $objmarge->marge_droite, $posy); // line prend une position y en 2eme param et 4eme param
1107 1107
 		
1108 1108
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
1109 1109
 		
1110
-		$tab2_top = $posy+2;
1110
+		$tab2_top = $posy + 2;
1111 1111
 		$tab2_hl = 4;
1112
-		$pdf->SetFont('','', $default_font_size - 1);
1112
+		$pdf->SetFont('', '', $default_font_size - 1);
1113 1113
 
1114 1114
 		// Tableau total
1115 1115
 		$col1x = 120; $col2x = 170;
1116 1116
 		if ($objmarge->page_largeur < 210) // To work with US executive format
1117 1117
 		{
1118
-			$col2x-=20;
1118
+			$col2x -= 20;
1119 1119
 		}
1120 1120
 		$largcol2 = ($objmarge->page_largeur - $objmarge->marge_droite - $col2x);
1121 1121
 
1122
-		$useborder=0;
1122
+		$useborder = 0;
1123 1123
 		$index = 0;
1124 1124
 
1125 1125
 		// Total HT
1126
-		$pdf->SetFillColor(255,255,255);
1126
+		$pdf->SetFillColor(255, 255, 255);
1127 1127
 		$pdf->SetXY($col1x, $tab2_top + 0);
1128
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
1128
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT"), 0, 'L', 1);
1129 1129
 
1130 1130
 		// $total_ht = ($conf->multicurrency->enabled && $object->mylticurrency_tx != 1) ? $TTot['multicurrency_total_ht'] : $TTot['total_ht'];
1131 1131
 		$total_ht = $TTot['total_ht'];
@@ -1133,10 +1133,10 @@  discard block
 block discarded – undo
1133 1133
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht, 0, $outputlangs), 0, 'R', 1);
1134 1134
 
1135 1135
 		// Show VAT by rates and total
1136
-		$pdf->SetFillColor(248,248,248);
1136
+		$pdf->SetFillColor(248, 248, 248);
1137 1137
 		
1138
-		$atleastoneratenotnull=0;
1139
-		foreach($TTot['TTotal_tva'] as $tvakey => $tvaval)
1138
+		$atleastoneratenotnull = 0;
1139
+		foreach ($TTot['TTotal_tva'] as $tvakey => $tvaval)
1140 1140
 		{
1141 1141
 			if ($tvakey != 0)    // On affiche pas taux 0
1142 1142
 			{
@@ -1145,15 +1145,15 @@  discard block
 block discarded – undo
1145 1145
 				$index++;
1146 1146
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
1147 1147
 
1148
-				$tvacompl='';
1149
-				if (preg_match('/\*/',$tvakey))
1148
+				$tvacompl = '';
1149
+				if (preg_match('/\*/', $tvakey))
1150 1150
 				{
1151
-					$tvakey=str_replace('*','',$tvakey);
1151
+					$tvakey = str_replace('*', '', $tvakey);
1152 1152
 					$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
1153 1153
 				}
1154
-				$totalvat =$outputlangs->transnoentities("TotalVAT").' ';
1155
-				$totalvat.=vatrate($tvakey,1).$tvacompl;
1156
-				$pdf->MultiCell($col2x-$col1x, $tab2_hl, $totalvat, 0, 'L', 1);
1154
+				$totalvat = $outputlangs->transnoentities("TotalVAT").' ';
1155
+				$totalvat .= vatrate($tvakey, 1).$tvacompl;
1156
+				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
1157 1157
 
1158 1158
 				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
1159 1159
 				$pdf->MultiCell($largcol2, $tab2_hl, price($tvaval, 0, $outputlangs), 0, 'R', 1);
@@ -1163,16 +1163,16 @@  discard block
 block discarded – undo
1163 1163
 		// Total TTC
1164 1164
 		$index++;
1165 1165
 		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
1166
-		$pdf->SetTextColor(0,0,60);
1167
-		$pdf->SetFillColor(224,224,224);
1168
-		$pdf->MultiCell($col2x-$col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
1166
+		$pdf->SetTextColor(0, 0, 60);
1167
+		$pdf->SetFillColor(224, 224, 224);
1168
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalTTC"), $useborder, 'L', 1);
1169 1169
 
1170 1170
 		// $total_ttc = ($conf->multicurrency->enabled && $object->multiccurency_tx != 1) ? $TTot['multicurrency_total_ttc'] : $TTot['total_ttc'];
1171 1171
 		$total_ttc = $TTot['total_ttc'];
1172 1172
 		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
1173 1173
 		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
1174 1174
 
1175
-		$pdf->SetTextColor(0,0,0);
1175
+		$pdf->SetTextColor(0, 0, 0);
1176 1176
 				
1177 1177
 		$index++;
1178 1178
 		return ($tab2_top + ($tab2_hl * $index));
@@ -1191,22 +1191,22 @@  discard block
 block discarded – undo
1191 1191
 	 * @param	int		$hidebottom		Hide bottom
1192 1192
 	 * @return	void
1193 1193
 	 */
1194
-    private static function printRect($pdf, $x, $y, $l, $h, $hidetop=0, $hidebottom=0)
1194
+    private static function printRect($pdf, $x, $y, $l, $h, $hidetop = 0, $hidebottom = 0)
1195 1195
     {
1196
-	    if (empty($hidetop) || $hidetop==-1) $pdf->line($x, $y, $x+$l, $y);
1197
-	    $pdf->line($x+$l, $y, $x+$l, $y+$h);
1198
-	    if (empty($hidebottom)) $pdf->line($x+$l, $y+$h, $x, $y+$h);
1199
-	    $pdf->line($x, $y+$h, $x, $y);
1196
+	    if (empty($hidetop) || $hidetop == -1) $pdf->line($x, $y, $x + $l, $y);
1197
+	    $pdf->line($x + $l, $y, $x + $l, $y + $h);
1198
+	    if (empty($hidebottom)) $pdf->line($x + $l, $y + $h, $x, $y + $h);
1199
+	    $pdf->line($x, $y + $h, $x, $y);
1200 1200
     }
1201 1201
 	
1202 1202
 	
1203
-	public static function concat(&$outputlangs, $files, $fileoutput='')
1203
+	public static function concat(&$outputlangs, $files, $fileoutput = '')
1204 1204
 	{
1205 1205
 		global $conf;
1206 1206
 		
1207 1207
 		if (empty($fileoutput)) $fileoutput = $file[0];
1208 1208
 		
1209
-		$pdf=pdf_getInstance();
1209
+		$pdf = pdf_getInstance();
1210 1210
         if (class_exists('TCPDF'))
1211 1211
         {
1212 1212
             $pdf->setPrintHeader(false);
@@ -1214,10 +1214,10 @@  discard block
 block discarded – undo
1214 1214
         }
1215 1215
         $pdf->SetFont(pdf_getPDFFont($outputlangs));
1216 1216
 
1217
-        if (! empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
1217
+        if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
1218 1218
 
1219 1219
 		
1220
-		foreach($files as $file)
1220
+		foreach ($files as $file)
1221 1221
 		{
1222 1222
 			$pagecount = $pdf->setSourceFile($file);
1223 1223
 			for ($i = 1; $i <= $pagecount; $i++)
@@ -1229,8 +1229,8 @@  discard block
 block discarded – undo
1229 1229
 			}
1230 1230
 		}
1231 1231
 		
1232
-		$pdf->Output($fileoutput,'F');
1233
-		if (! empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
1232
+		$pdf->Output($fileoutput, 'F');
1233
+		if (!empty($conf->global->MAIN_UMASK)) @chmod($file, octdec($conf->global->MAIN_UMASK));
1234 1234
 
1235 1235
 		return $pagecount;
1236 1236
 	}
@@ -1243,7 +1243,7 @@  discard block
 block discarded – undo
1243 1243
 	 */
1244 1244
 	public static function hasNcTitle(&$line)
1245 1245
 	{
1246
-		if(isset($line->has_nc_title)) return $line->has_nc_title;
1246
+		if (isset($line->has_nc_title)) return $line->has_nc_title;
1247 1247
 
1248 1248
 		$TTitle = self::getAllTitleFromLine($line);
1249 1249
 		foreach ($TTitle as &$line_title)
Please login to merge, or discard this patch.