| @@ -61,8 +61,8 @@ | ||
| 61 | 61 | $form = new Form($db); | 
| 62 | 62 | print '<!-- debut cartouche rapport --> | 
| 63 | 63 | <div class="tabs"> | 
| 64 | - <a id="'.($viewSelection == 1 ? 'active' : '').'" class="tab" href="listFact.php?view=1">Facturation</a> | |
| 65 | - <a id="'.($viewSelection == 2 ? 'active' : '').'" class="tab" href="listFact.php?view=2">AVIABEL</a> | |
| 64 | + <a id="'.($viewSelection == 1 ? 'active' : '') . '" class="tab" href="listFact.php?view=1">Facturation</a> | |
| 65 | + <a id="'.($viewSelection == 2 ? 'active' : '') . '" class="tab" href="listFact.php?view=2">AVIABEL</a> | |
| 66 | 66 | </div>'; | 
| 67 | 67 | print '<div class="tabBar">'; | 
| 68 | 68 | print "<form name='listFact' action=\"listFact.php\" method=\"get\">\n"; | 
| @@ -69,7 +69,7 @@ | ||
| 69 | 69 | $result = [$this->year]; | 
| 70 | 70 | |
| 71 | 71 |          foreach ($this->graphData as $typeId => $data) { | 
| 72 | -            if(!in_array($typeId, [1,2,3,6])){ | |
| 72 | +            if (!in_array($typeId, [1, 2, 3, 6])) { | |
| 73 | 73 | continue; | 
| 74 | 74 | } | 
| 75 | 75 | |
| @@ -36,14 +36,14 @@ | ||
| 36 | 36 | /** | 
| 37 | 37 | * @param GraphicalValue $value | 
| 38 | 38 | */ | 
| 39 | -    public function addValue(GraphicalValue $value){ | |
| 39 | +    public function addValue(GraphicalValue $value) { | |
| 40 | 40 | $this->counter = $this->counter->add($value); | 
| 41 | 41 | } | 
| 42 | 42 | |
| 43 | 43 | /** | 
| 44 | 44 | * @return int | 
| 45 | 45 | */ | 
| 46 | -    public function getValue(){ | |
| 46 | +    public function getValue() { | |
| 47 | 47 | return $this->counter->getValue(); | 
| 48 | 48 | } | 
| 49 | 49 | |
| @@ -40,7 +40,7 @@ discard block | ||
| 40 | 40 | */ | 
| 41 | 41 | public function addValue($year, GraphicalValue $value) | 
| 42 | 42 |      { | 
| 43 | -        if(!isset($this->data[$year])){ | |
| 43 | +        if (!isset($this->data[$year])) { | |
| 44 | 44 |              throw new \Exception("Year is not defined"); | 
| 45 | 45 | } | 
| 46 | 46 | |
| @@ -54,7 +54,7 @@ discard block | ||
| 54 | 54 |      { | 
| 55 | 55 | $result = []; | 
| 56 | 56 | |
| 57 | -        foreach($this->data as $year){ | |
| 57 | +        foreach ($this->data as $year) { | |
| 58 | 58 | $result[] = $year->export(); | 
| 59 | 59 | } | 
| 60 | 60 | |
| @@ -430,7 +430,7 @@ discard block | ||
| 430 | 430 | */ | 
| 431 | 431 | private function initPermissions() | 
| 432 | 432 |      { | 
| 433 | - $this->rights = array(); // Permission array used by this module | |
| 433 | + $this->rights = array(); // Permission array used by this module | |
| 434 | 434 | $r = 0; | 
| 435 | 435 | |
| 436 | 436 | $this->rights[$r][0] = 9993; | 
| @@ -485,7 +485,7 @@ discard block | ||
| 485 | 485 | |
| 486 | 486 | private function initCronJobs() | 
| 487 | 487 |      { | 
| 488 | - $this->cronjobs = array(); // List of cron jobs entries to add | |
| 488 | + $this->cronjobs = array(); // List of cron jobs entries to add | |
| 489 | 489 |          // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true), | 
| 490 | 490 |          //                                1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true) | 
| 491 | 491 | // ); | 
| @@ -149,9 +149,9 @@ | ||
| 149 | 149 | } | 
| 150 | 150 | |
| 151 | 151 | /** | 
| 152 | - * @param null $year | |
| 153 | - * @param null $pilotId | |
| 154 | - * @param null $quarter | |
| 152 | + * @param integer $year | |
| 153 | + * @param integer $pilotId | |
| 154 | + * @param integer $quarter | |
| 155 | 155 | * @param bool $groupBy | 
| 156 | 156 | * | 
| 157 | 157 | * @return string | 
| @@ -337,7 +337,7 @@ discard block | ||
| 337 | 337 | $totalQ4 = 0; | 
| 338 | 338 | |
| 339 | 339 |      $curMonth = date("m", time()); | 
| 340 | - $curQuarter = ceil($curMonth/3); | |
| 340 | + $curQuarter = ceil($curMonth / 3); | |
| 341 | 341 | $disableColor = 'style="background-color: lightyellow;" title="N/A" data-toggle="tooltip"'; | 
| 342 | 342 | |
| 343 | 343 |      foreach ($kmByQuartil as $id => $rembKm) { | 
| @@ -371,29 +371,29 @@ discard block | ||
| 371 | 371 | print '<td>' . $name . '</td>'; | 
| 372 | 372 | print '<td>' . $firstname . '</td>'; | 
| 373 | 373 | |
| 374 | - print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1) . '</td>'; | |
| 375 | - print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1 * $unitPriceMission) . '€</td>'; | |
| 376 | - print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . $sumQ1 . '</td>'; | |
| 377 | - print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($sumQ1 * $tauxRemb) . '</td>'; | |
| 378 | - print '<td'.($curQuarter < 1 ? $disableColor: '').'><b>' . $amoutQ1 . '€</b></td>'; | |
| 379 | - | |
| 380 | - print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2) . '</td>'; | |
| 381 | - print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2 * $unitPriceMission) . '€</td>'; | |
| 382 | - print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . $sumQ2 . '</td>'; | |
| 383 | - print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($sumQ2 * $tauxRemb) . '</td>'; | |
| 384 | - print '<td '.($curQuarter < 2 ? $disableColor: '').'><b>' . $amoutQ2 . '€</b></td>'; | |
| 385 | - | |
| 386 | - print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3) . '</td>'; | |
| 387 | - print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3 * $unitPriceMission) . '€</td>'; | |
| 388 | - print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . $sumQ3 . '</td>'; | |
| 389 | - print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($sumQ3 * $tauxRemb) . '</td>'; | |
| 390 | - print '<td '.($curQuarter < 3 ? $disableColor: '').'><b>' . $amoutQ3 . '€</b></td>'; | |
| 391 | - | |
| 392 | - print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4) . '</td>'; | |
| 393 | - print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4 * $unitPriceMission) . '€</td>'; | |
| 394 | - print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . $sumQ4 . '</td>'; | |
| 395 | - print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($sumQ4 * $tauxRemb) . '</td>'; | |
| 396 | - print '<td '.($curQuarter < 4 ? $disableColor: '').'><b>' . $amoutQ4 . '€</b></td>'; | |
| 374 | + print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1) . '</td>'; | |
| 375 | + print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1 * $unitPriceMission) . '€</td>'; | |
| 376 | + print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . $sumQ1 . '</td>'; | |
| 377 | + print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($sumQ1 * $tauxRemb) . '</td>'; | |
| 378 | + print '<td' . ($curQuarter < 1 ? $disableColor : '') . '><b>' . $amoutQ1 . '€</b></td>'; | |
| 379 | + | |
| 380 | + print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2) . '</td>'; | |
| 381 | + print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2 * $unitPriceMission) . '€</td>'; | |
| 382 | + print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . $sumQ2 . '</td>'; | |
| 383 | + print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($sumQ2 * $tauxRemb) . '</td>'; | |
| 384 | + print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '><b>' . $amoutQ2 . '€</b></td>'; | |
| 385 | + | |
| 386 | + print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3) . '</td>'; | |
| 387 | + print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3 * $unitPriceMission) . '€</td>'; | |
| 388 | + print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . $sumQ3 . '</td>'; | |
| 389 | + print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($sumQ3 * $tauxRemb) . '</td>'; | |
| 390 | + print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '><b>' . $amoutQ3 . '€</b></td>'; | |
| 391 | + | |
| 392 | + print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4) . '</td>'; | |
| 393 | + print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4 * $unitPriceMission) . '€</td>'; | |
| 394 | + print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . $sumQ4 . '</td>'; | |
| 395 | + print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($sumQ4 * $tauxRemb) . '</td>'; | |
| 396 | + print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '><b>' . $amoutQ4 . '€</b></td>'; | |
| 397 | 397 | |
| 398 | 398 | print '<td>' . (($sumFlights * $unitPriceMission) + ($sumKm * $tauxRemb)) . '€</td>'; | 
| 399 | 399 | |
| @@ -401,13 +401,13 @@ discard block | ||
| 401 | 401 | } | 
| 402 | 402 | |
| 403 | 403 | print "<td colspan='6'></td>"; | 
| 404 | - print "<td>".price($totalQ1)."€</td>"; | |
| 404 | + print "<td>" . price($totalQ1) . "€</td>"; | |
| 405 | 405 | print "<td colspan='4'></td>"; | 
| 406 | - print "<td>".price($totalQ2)."€</td>"; | |
| 406 | + print "<td>" . price($totalQ2) . "€</td>"; | |
| 407 | 407 | print "<td colspan='4'></td>"; | 
| 408 | - print "<td>".price($totalQ3)."€</td>"; | |
| 408 | + print "<td>" . price($totalQ3) . "€</td>"; | |
| 409 | 409 | print "<td colspan='4'></td>"; | 
| 410 | - print "<td>".price($totalQ4)."€</td>"; | |
| 410 | + print "<td>" . price($totalQ4) . "€</td>"; | |
| 411 | 411 | print "<td></td>"; | 
| 412 | 412 | |
| 413 | 413 | print '</table>'; | 
| @@ -75,7 +75,7 @@ discard block | ||
| 75 | 75 | public $date_update; | 
| 76 | 76 | |
| 77 | 77 | /** | 
| 78 | - * @return int | |
| 78 | + * @return string | |
| 79 | 79 | */ | 
| 80 | 80 | public function getIdBBCVols() | 
| 81 | 81 |      { | 
| @@ -83,7 +83,7 @@ discard block | ||
| 83 | 83 | } | 
| 84 | 84 | |
| 85 | 85 | /** | 
| 86 | - * @return int | |
| 86 | + * @return string | |
| 87 | 87 | */ | 
| 88 | 88 | public function getId() | 
| 89 | 89 |      { | 
| @@ -873,7 +873,7 @@ | ||
| 873 | 873 | /** | 
| 874 | 874 | * @return boolean | 
| 875 | 875 | */ | 
| 876 | -    public function hasFacture(){ | |
| 876 | +    public function hasFacture() { | |
| 877 | 877 | return count($this->linkedObjectsIds) > 0; | 
| 878 | 878 | } | 
| 879 | 879 | |
| @@ -45,17 +45,17 @@ | ||
| 45 | 45 | * | 
| 46 | 46 | * @return TabCollection | 
| 47 | 47 | */ | 
| 48 | -    public function addTab(Tab $tab){ | |
| 48 | +    public function addTab(Tab $tab) { | |
| 49 | 49 | $this->tabs[] = $tab; | 
| 50 | 50 | } | 
| 51 | 51 | |
| 52 | 52 | /** | 
| 53 | 53 | * @return array | 
| 54 | 54 | */ | 
| 55 | -    public function toArray(){ | |
| 55 | +    public function toArray() { | |
| 56 | 56 | $tabAsArray = []; | 
| 57 | 57 | |
| 58 | -        foreach ($this->tabs as $tab){ | |
| 58 | +        foreach ($this->tabs as $tab) { | |
| 59 | 59 | $tabAsArray[] = $tab->toArray(); | 
| 60 | 60 | } | 
| 61 | 61 | |
| @@ -178,7 +178,7 @@ discard block | ||
| 178 | 178 | |
| 179 | 179 | $parameters = array(); | 
| 180 | 180 |  $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, | 
| 181 | - $action); // Note that $action and $object may have been modified by some hooks | |
| 181 | + $action); // Note that $action and $object may have been modified by some hooks | |
| 182 | 182 |  if ($reshook < 0) { | 
| 183 | 183 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); | 
| 184 | 184 | } | 
| @@ -290,7 +290,7 @@ discard block | ||
| 290 | 290 | // Add fields from hooks | 
| 291 | 291 | $parameters = array(); | 
| 292 | 292 |  $reshook = $hookmanager->executeHooks('printFieldListSelect', | 
| 293 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 293 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 294 | 294 | $sql .= $hookmanager->resPrint; | 
| 295 | 295 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; | 
| 296 | 296 |  if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { | 
| @@ -304,8 +304,8 @@ discard block | ||
| 304 | 304 | |
| 305 | 305 | $sql .= " WHERE 1 = 1"; | 
| 306 | 306 | |
| 307 | -if($search_all){ | |
| 308 | - $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all); | |
| 307 | +if ($search_all) { | |
| 308 | + $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all); | |
| 309 | 309 | } | 
| 310 | 310 | |
| 311 | 311 |  if ($search_idBBC_vols) { | 
| @@ -384,7 +384,7 @@ discard block | ||
| 384 | 384 | // Add where from hooks | 
| 385 | 385 | $parameters = array(); | 
| 386 | 386 |  $reshook = $hookmanager->executeHooks('printFieldListWhere', | 
| 387 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 387 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 388 | 388 | $sql .= $hookmanager->resPrint; | 
| 389 | 389 | $sql .= $db->order($sortfield, $sortorder); | 
| 390 | 390 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); | 
| @@ -426,58 +426,58 @@ discard block | ||
| 426 | 426 |  if ($limit > 0 && $limit != $conf->liste_limit) { | 
| 427 | 427 | $param .= '&limit=' . $limit; | 
| 428 | 428 | } | 
| 429 | -if ($search_idBBC_vols  != '') { | |
| 429 | +if ($search_idBBC_vols != '') { | |
| 430 | 430 | $param .= '&search_idBBC_vols=' . urlencode($search_idBBC_vols); | 
| 431 | 431 | } | 
| 432 | -if ($search_date  != '') { | |
| 432 | +if ($search_date != '') { | |
| 433 | 433 | $param .= '&search_date=' . urlencode($search_date); | 
| 434 | 434 | } | 
| 435 | -if ($search_lieuD  != '') { | |
| 435 | +if ($search_lieuD != '') { | |
| 436 | 436 | $param .= '&search_lieuD=' . urlencode($search_lieuD); | 
| 437 | 437 | } | 
| 438 | -if ($search_lieuA  != '') { | |
| 438 | +if ($search_lieuA != '') { | |
| 439 | 439 | $param .= '&search_lieuA=' . urlencode($search_lieuA); | 
| 440 | 440 | } | 
| 441 | -if ($search_heureD  != '') { | |
| 441 | +if ($search_heureD != '') { | |
| 442 | 442 | $param .= '&search_heureD=' . urlencode($search_heureD); | 
| 443 | 443 | } | 
| 444 | -if ($search_heureA  != '') { | |
| 444 | +if ($search_heureA != '') { | |
| 445 | 445 | $param .= '&search_heureA=' . urlencode($search_heureA); | 
| 446 | 446 | } | 
| 447 | -if ($search_BBC_ballons_idBBC_ballons  != '') { | |
| 447 | +if ($search_BBC_ballons_idBBC_ballons != '') { | |
| 448 | 448 | $param .= '&search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons); | 
| 449 | 449 | } | 
| 450 | -if ($search_nbrPax  != '') { | |
| 450 | +if ($search_nbrPax != '') { | |
| 451 | 451 | $param .= '&search_nbrPax=' . urlencode($search_nbrPax); | 
| 452 | 452 | } | 
| 453 | -if ($search_remarque  != '') { | |
| 453 | +if ($search_remarque != '') { | |
| 454 | 454 | $param .= '&search_remarque=' . urlencode($search_remarque); | 
| 455 | 455 | } | 
| 456 | -if ($search_incidents  != '') { | |
| 456 | +if ($search_incidents != '') { | |
| 457 | 457 | $param .= '&search_incidents=' . urlencode($search_incidents); | 
| 458 | 458 | } | 
| 459 | -if ($search_fk_type  != '') { | |
| 459 | +if ($search_fk_type != '') { | |
| 460 | 460 | $param .= '&search_fk_type=' . urlencode($search_fk_type); | 
| 461 | 461 | } | 
| 462 | 462 |  if ($search_fk_pilot != '') { | 
| 463 | 463 | $param .= '&search_fk_pilot=' . urlencode($search_fk_pilot); | 
| 464 | 464 | } | 
| 465 | -if ($search_fk_organisateur  != '') { | |
| 465 | +if ($search_fk_organisateur != '') { | |
| 466 | 466 | $param .= '&search_fk_organisateur=' . urlencode($search_fk_organisateur); | 
| 467 | 467 | } | 
| 468 | -if ($search_is_facture  != '') { | |
| 468 | +if ($search_is_facture != '') { | |
| 469 | 469 | $param .= '&search_is_facture=' . urlencode($search_is_facture); | 
| 470 | 470 | } | 
| 471 | -if ($search_kilometers  != '') { | |
| 471 | +if ($search_kilometers != '') { | |
| 472 | 472 | $param .= '&search_kilometers=' . urlencode($search_kilometers); | 
| 473 | 473 | } | 
| 474 | -if ($search_cost  != '') { | |
| 474 | +if ($search_cost != '') { | |
| 475 | 475 | $param .= '&search_cost=' . urlencode($search_cost); | 
| 476 | 476 | } | 
| 477 | -if ($search_fk_receiver  != '') { | |
| 477 | +if ($search_fk_receiver != '') { | |
| 478 | 478 | $param .= '&search_fk_receiver=' . urlencode($search_fk_receiver); | 
| 479 | 479 | } | 
| 480 | -if ($search_justif_kilometers  != '') { | |
| 480 | +if ($search_justif_kilometers != '') { | |
| 481 | 481 | $param .= '&search_justif_kilometers=' . urlencode($search_justif_kilometers); | 
| 482 | 482 | } | 
| 483 | 483 |  if ($search_all != '') { | 
| @@ -521,8 +521,8 @@ discard block | ||
| 521 | 521 | |
| 522 | 522 | |
| 523 | 523 | $moreHtml = ""; | 
| 524 | -if($search_all !== ""){ | |
| 525 | -    $moreHtml = "<p>".$langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all))."</p>"; | |
| 524 | +if ($search_all !== "") { | |
| 525 | +    $moreHtml = "<p>" . $langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all)) . "</p>"; | |
| 526 | 526 | } | 
| 527 | 527 | |
| 528 | 528 | print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, | 
| @@ -542,7 +542,7 @@ discard block | ||
| 542 | 542 | |
| 543 | 543 | $parameters = array(); | 
| 544 | 544 |  $reshook = $hookmanager->executeHooks('printFieldPreListTitle', | 
| 545 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 545 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 546 | 546 |  if (empty($reshook)) { | 
| 547 | 547 | $moreforfilter .= $hookmanager->resPrint; | 
| 548 | 548 |  } else { | 
| @@ -557,7 +557,7 @@ discard block | ||
| 557 | 557 | |
| 558 | 558 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; | 
| 559 | 559 |  $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, | 
| 560 | - $varpage); // This also change content of $arrayfields | |
| 560 | + $varpage); // This also change content of $arrayfields | |
| 561 | 561 | |
| 562 | 562 | print '<div class="div-table-responsive">'; | 
| 563 | 563 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; | 
| @@ -652,7 +652,7 @@ discard block | ||
| 652 | 652 | // Hook fields | 
| 653 | 653 |  $parameters = array('arrayfields' => $arrayfields); | 
| 654 | 654 |  $reshook = $hookmanager->executeHooks('printFieldListTitle', | 
| 655 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 655 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 656 | 656 | print $hookmanager->resPrint; | 
| 657 | 657 |  if (!empty($arrayfields['t.datec']['checked'])) { | 
| 658 | 658 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, | 
| @@ -766,7 +766,7 @@ discard block | ||
| 766 | 766 | // Fields from hook | 
| 767 | 767 |  $parameters = array('arrayfields' => $arrayfields); | 
| 768 | 768 |  $reshook = $hookmanager->executeHooks('printFieldListOption', | 
| 769 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 769 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 770 | 770 | print $hookmanager->resPrint; | 
| 771 | 771 |  if (!empty($arrayfields['t.datec']['checked'])) { | 
| 772 | 772 | // Date creation | 
| @@ -807,116 +807,116 @@ discard block | ||
| 807 | 807 | // Show here line of result | 
| 808 | 808 | print '<tr ' . $bc[$var] . '>'; | 
| 809 | 809 | |
| 810 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) | |
| 810 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) | |
| 811 | 811 |          { | 
| 812 | - print '<td>'.$flight->getNomUrl(0).'</td>'; | |
| 812 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; | |
| 813 | 813 | |
| 814 | - if (! $i) $totalarray['nbfield']++; | |
| 814 | + if (!$i) $totalarray['nbfield']++; | |
| 815 | 815 | } | 
| 816 | - if (! empty($arrayfields['t.date']['checked'])) | |
| 816 | + if (!empty($arrayfields['t.date']['checked'])) | |
| 817 | 817 |          { | 
| 818 | 818 | print '<td>'; | 
| 819 | 819 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); | 
| 820 | 820 | print '</td>'; | 
| 821 | 821 | |
| 822 | - if (! $i) $totalarray['nbfield']++; | |
| 822 | + if (!$i) $totalarray['nbfield']++; | |
| 823 | 823 | } | 
| 824 | - if (! empty($arrayfields['t.lieuD']['checked'])) | |
| 824 | + if (!empty($arrayfields['t.lieuD']['checked'])) | |
| 825 | 825 |          { | 
| 826 | - print '<td>'.$obj->lieuD.'</td>'; | |
| 826 | + print '<td>' . $obj->lieuD . '</td>'; | |
| 827 | 827 | |
| 828 | - if (! $i) $totalarray['nbfield']++; | |
| 828 | + if (!$i) $totalarray['nbfield']++; | |
| 829 | 829 | } | 
| 830 | - if (! empty($arrayfields['t.lieuA']['checked'])) | |
| 830 | + if (!empty($arrayfields['t.lieuA']['checked'])) | |
| 831 | 831 |          { | 
| 832 | - print '<td>'.$obj->lieuA.'</td>'; | |
| 832 | + print '<td>' . $obj->lieuA . '</td>'; | |
| 833 | 833 | |
| 834 | - if (! $i) $totalarray['nbfield']++; | |
| 834 | + if (!$i) $totalarray['nbfield']++; | |
| 835 | 835 | } | 
| 836 | - if (! empty($arrayfields['t.heureD']['checked'])) | |
| 836 | + if (!empty($arrayfields['t.heureD']['checked'])) | |
| 837 | 837 |          { | 
| 838 | - print '<td>'.$obj->heureD.'</td>'; | |
| 838 | + print '<td>' . $obj->heureD . '</td>'; | |
| 839 | 839 | |
| 840 | - if (! $i) $totalarray['nbfield']++; | |
| 840 | + if (!$i) $totalarray['nbfield']++; | |
| 841 | 841 | } | 
| 842 | - if (! empty($arrayfields['t.heureA']['checked'])) | |
| 842 | + if (!empty($arrayfields['t.heureA']['checked'])) | |
| 843 | 843 |          { | 
| 844 | - print '<td>'.$obj->heureA.'</td>'; | |
| 844 | + print '<td>' . $obj->heureA . '</td>'; | |
| 845 | 845 | |
| 846 | - if (! $i) $totalarray['nbfield']++; | |
| 846 | + if (!$i) $totalarray['nbfield']++; | |
| 847 | 847 | } | 
| 848 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) | |
| 848 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) | |
| 849 | 849 |          { | 
| 850 | - print '<td>'.$obj->bal.'</td>'; | |
| 850 | + print '<td>' . $obj->bal . '</td>'; | |
| 851 | 851 | |
| 852 | - if (! $i) $totalarray['nbfield']++; | |
| 852 | + if (!$i) $totalarray['nbfield']++; | |
| 853 | 853 | } | 
| 854 | - if (! empty($arrayfields['t.nbrPax']['checked'])) | |
| 854 | + if (!empty($arrayfields['t.nbrPax']['checked'])) | |
| 855 | 855 |          { | 
| 856 | - print '<td>'.$obj->nbrPax.'</td>'; | |
| 856 | + print '<td>' . $obj->nbrPax . '</td>'; | |
| 857 | 857 | |
| 858 | - if (! $i) $totalarray['nbfield']++; | |
| 858 | + if (!$i) $totalarray['nbfield']++; | |
| 859 | 859 | } | 
| 860 | - if (! empty($arrayfields['t.remarque']['checked'])) | |
| 860 | + if (!empty($arrayfields['t.remarque']['checked'])) | |
| 861 | 861 |          { | 
| 862 | - print '<td>'.$obj->remarque.'</td>'; | |
| 862 | + print '<td>' . $obj->remarque . '</td>'; | |
| 863 | 863 | |
| 864 | - if (! $i) $totalarray['nbfield']++; | |
| 864 | + if (!$i) $totalarray['nbfield']++; | |
| 865 | 865 | } | 
| 866 | - if (! empty($arrayfields['t.incidents']['checked'])) | |
| 866 | + if (!empty($arrayfields['t.incidents']['checked'])) | |
| 867 | 867 |          { | 
| 868 | - print '<td>'.$obj->incidents.'</td>'; | |
| 868 | + print '<td>' . $obj->incidents . '</td>'; | |
| 869 | 869 | |
| 870 | - if (! $i) $totalarray['nbfield']++; | |
| 870 | + if (!$i) $totalarray['nbfield']++; | |
| 871 | 871 | } | 
| 872 | - if (! empty($arrayfields['t.fk_type']['checked'])) | |
| 872 | + if (!empty($arrayfields['t.fk_type']['checked'])) | |
| 873 | 873 |          { | 
| 874 | - print '<td>'.$obj->flight_type.'</td>'; | |
| 874 | + print '<td>' . $obj->flight_type . '</td>'; | |
| 875 | 875 | |
| 876 | - if (! $i) $totalarray['nbfield']++; | |
| 876 | + if (!$i) $totalarray['nbfield']++; | |
| 877 | 877 | } | 
| 878 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) | |
| 878 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) | |
| 879 | 879 |          { | 
| 880 | - print '<td>'.$obj->pilot.'</td>'; | |
| 880 | + print '<td>' . $obj->pilot . '</td>'; | |
| 881 | 881 | |
| 882 | - if (! $i) $totalarray['nbfield']++; | |
| 882 | + if (!$i) $totalarray['nbfield']++; | |
| 883 | 883 | } | 
| 884 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) | |
| 884 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) | |
| 885 | 885 |          { | 
| 886 | - print '<td>'.$obj->organisator.'</td>'; | |
| 886 | + print '<td>' . $obj->organisator . '</td>'; | |
| 887 | 887 | |
| 888 | - if (! $i) $totalarray['nbfield']++; | |
| 888 | + if (!$i) $totalarray['nbfield']++; | |
| 889 | 889 | } | 
| 890 | - if (! empty($arrayfields['t.is_facture']['checked'])) | |
| 890 | + if (!empty($arrayfields['t.is_facture']['checked'])) | |
| 891 | 891 |          { | 
| 892 | 892 | $flight->is_facture = $obj->is_facture; | 
| 893 | - print '<td>'.$flight->getLibStatut(3).'</td>'; | |
| 893 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; | |
| 894 | 894 | |
| 895 | - if (! $i) $totalarray['nbfield']++; | |
| 895 | + if (!$i) $totalarray['nbfield']++; | |
| 896 | 896 | } | 
| 897 | - if (! empty($arrayfields['t.kilometers']['checked'])) | |
| 897 | + if (!empty($arrayfields['t.kilometers']['checked'])) | |
| 898 | 898 |          { | 
| 899 | - print '<td>'.$obj->kilometers.'</td>'; | |
| 899 | + print '<td>' . $obj->kilometers . '</td>'; | |
| 900 | 900 | |
| 901 | - if (! $i) $totalarray['nbfield']++; | |
| 901 | + if (!$i) $totalarray['nbfield']++; | |
| 902 | 902 | } | 
| 903 | - if (! empty($arrayfields['t.cost']['checked'])) | |
| 903 | + if (!empty($arrayfields['t.cost']['checked'])) | |
| 904 | 904 |          { | 
| 905 | - print '<td>'.$obj->cost.'</td>'; | |
| 905 | + print '<td>' . $obj->cost . '</td>'; | |
| 906 | 906 | |
| 907 | - if (! $i) $totalarray['nbfield']++; | |
| 907 | + if (!$i) $totalarray['nbfield']++; | |
| 908 | 908 | } | 
| 909 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) | |
| 909 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) | |
| 910 | 910 |          { | 
| 911 | - print '<td>'.$obj->receiver.'</td>'; | |
| 911 | + print '<td>' . $obj->receiver . '</td>'; | |
| 912 | 912 | |
| 913 | - if (! $i) $totalarray['nbfield']++; | |
| 913 | + if (!$i) $totalarray['nbfield']++; | |
| 914 | 914 | } | 
| 915 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) | |
| 915 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) | |
| 916 | 916 |          { | 
| 917 | - print '<td>'.$obj->justif_kilometers.'</td>'; | |
| 917 | + print '<td>' . $obj->justif_kilometers . '</td>'; | |
| 918 | 918 | |
| 919 | - if (! $i) $totalarray['nbfield']++; | |
| 919 | + if (!$i) $totalarray['nbfield']++; | |
| 920 | 920 | } | 
| 921 | 921 | |
| 922 | 922 | // Extra fields | 
| @@ -941,7 +941,7 @@ discard block | ||
| 941 | 941 | // Fields from hook | 
| 942 | 942 |          $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); | 
| 943 | 943 |          $reshook = $hookmanager->executeHooks('printFieldListValue', | 
| 944 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 944 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 945 | 945 | print $hookmanager->resPrint; | 
| 946 | 946 | // Date creation | 
| 947 | 947 |          if (!empty($arrayfields['t.datec']['checked'])) { | 
| @@ -1018,7 +1018,7 @@ discard block | ||
| 1018 | 1018 | |
| 1019 | 1019 |  $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); | 
| 1020 | 1020 |  $reshook = $hookmanager->executeHooks('printFieldListFooter', | 
| 1021 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 1021 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 1022 | 1022 | print $hookmanager->resPrint; | 
| 1023 | 1023 | |
| 1024 | 1024 | print '</table>' . "\n"; |