Completed
Push — master ( 7cff09...c9a8e2 )
by Laurent
01:30
created
card_tab_financial.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
45 45
 $action = GETPOST('action', 'alpha');
46
-$permissiondellink=$user->rights->flightlog->vol->financial;
46
+$permissiondellink = $user->rights->flightlog->vol->financial;
47 47
 
48 48
 $object = new Bbcvols($db);
49 49
 $extrafields = new ExtraFields($db);
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
63 63
 
64 64
 // Load object
65
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
66
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
65
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
66
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
67 67
 
68 68
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
69 69
 $hookmanager->initHooks(array('bbcvols'));
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>';
94 94
 
95 95
 if ($user->rights->flightlog->vol->financial) {
96
-    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>';
96
+    print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>';
97 97
 }
98 98
 
99 99
 print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
@@ -107,13 +107,13 @@  discard block
 block discarded – undo
107 107
 // Buttons
108 108
 print '<div class="tabsAction">' . "\n";
109 109
 
110
-if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
111
-    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
110
+if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
111
+    print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
112 112
 }
113 113
 
114 114
 print '</div>' . "\n";
115 115
 
116
-if($user->rights->flightlog->vol->financial){
116
+if ($user->rights->flightlog->vol->financial) {
117 117
     print '<div class="fichecenter"><div class="fichehalfleft">';
118 118
     $form->showLinkedObjectBlock($object);
119 119
     print '</div></div>';
Please login to merge, or discard this patch.
card_tab_follow.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 
44 44
 $id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
45 45
 $action = GETPOST('action', 'alpha');
46
-$permissiondellink=$user->rights->flightlog->vol->financial;
46
+$permissiondellink = $user->rights->flightlog->vol->financial;
47 47
 
48 48
 $object = new Bbcvols($db);
49 49
 $extrafields = new ExtraFields($db);
@@ -62,8 +62,8 @@  discard block
 block discarded – undo
62 62
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
63 63
 
64 64
 // Load object
65
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
66
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
65
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
66
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
67 67
 
68 68
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
69 69
 $hookmanager->initHooks(array('bbcvols'));
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 print '<div class="tabsAction">' . "\n";
100 100
 print '</div>' . "\n";
101 101
 
102
-if($user->rights->flightlog->vol->financial){
102
+if ($user->rights->flightlog->vol->financial) {
103 103
     print '<div class="fichecenter"><div class="fichehalfleft">';
104 104
     $form->showLinkedObjectBlock($object);
105 105
     print '</div></div>';
Please login to merge, or discard this patch.
card.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 
67 67
 $isAllowedEdit = ($user->rights->flightlog->vol->edit || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id));
68 68
 $isAllowedDelete = ($user->rights->flightlog->vol->delete || ($user->rights->flightlog->vol->add && $object->fk_pilot == $user->id && !$object->is_facture));
69
-$permissiondellink=$user->rights->flightlog->vol->financial;
69
+$permissiondellink = $user->rights->flightlog->vol->financial;
70 70
 
71 71
 $search_idBBC_vols = GETPOST('search_idBBC_vols', 'int');
72 72
 $search_lieuD = GETPOST('search_lieuD', 'alpha');
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
114 114
 
115 115
 // Load object
116
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
117
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
116
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
117
+include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php';
118 118
 
119 119
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
120 120
 $hookmanager->initHooks(array('bbcvols'));
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 
140 140
 $parameters = array();
141 141
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
142
-    $action);    // Note that $action and $object may have been modified by some hooks
142
+    $action); // Note that $action and $object may have been modified by some hooks
143 143
 if ($reshook < 0) {
144 144
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
145 145
 }
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
                 header("Location: " . $urltogo);
198 198
                 exit;
199 199
             }
200
-            else{
200
+            else {
201 201
                 // Creation KO
202 202
                 if (!empty($object->errors)) {
203 203
                     setEventMessages(null, $object->errors, 'errors');
@@ -481,7 +481,7 @@  discard block
 block discarded – undo
481 481
     print '<div class="tabsAction">' . "\n";
482 482
     $parameters = array();
483 483
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
484
-        $action);    // Note that $action and $object may have been modified by hook
484
+        $action); // Note that $action and $object may have been modified by hook
485 485
     if ($reshook < 0) {
486 486
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
487 487
     }
@@ -494,13 +494,13 @@  discard block
 block discarded – undo
494 494
         print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=delete">' . $langs->trans('Delete') . '</a></div>' . "\n";
495 495
     }
496 496
 
497
-    if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){
498
-        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n";
497
+    if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) {
498
+        print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n";
499 499
     }
500 500
 
501 501
     print '</div>' . "\n";
502 502
 
503
-    if($user->rights->flightlog->vol->financial){
503
+    if ($user->rights->flightlog->vol->financial) {
504 504
         print '<div class="fichecenter"><div class="fichehalfleft">';
505 505
         $form->showLinkedObjectBlock($object);
506 506
         print '</div></div>';
Please login to merge, or discard this patch.
core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
  */
17 17
 
18 18
 
19
-require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
19
+require_once DOL_DOCUMENT_ROOT . '/core/triggers/dolibarrtriggers.class.php';
20 20
 dol_include_once('/flightlog/class/bbcvols.class.php');
21 21
 dol_include_once('/core/class/CMailFile.class.php');
22 22
 
@@ -78,23 +78,23 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
80 80
 	{
81
-        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
81
+        if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)) {
82 82
             return 0;
83 83
         }
84 84
 
85
-        if(empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)){
85
+        if (empty($conf->global->WORKFLOW_BBC_FLIGHTLOG_SEND_MAIL_ON_INCIDENT)) {
86 86
             return 0;
87 87
         }
88 88
 
89
-        if($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT'){
89
+        if ($action !== 'BBC_FLIGHT_LOG_ADD_FLIGHT') {
90 90
             return 0;
91 91
         }
92 92
 
93
-        if(empty(trim($object->incidents)) && empty(trim($object->remarque))){
93
+        if (empty(trim($object->incidents)) && empty(trim($object->remarque))) {
94 94
             return 0;
95 95
         }
96 96
 
97
-        if(!empty($conf->global->MAIN_DISABLE_ALL_MAILS)){
97
+        if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
98 98
             return 0;
99 99
         }
100 100
 
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
         );
128 128
 
129 129
 
130
-        if (! $mailfile->sendfile())
130
+        if (!$mailfile->sendfile())
131 131
         {
132 132
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
133 133
         }
Please login to merge, or discard this patch.
core/modules/modFlightLog.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -341,7 +341,7 @@
 block discarded – undo
341 341
      */
342 342
     private function initPermissions()
343 343
     {
344
-        $this->rights = array();        // Permission array used by this module
344
+        $this->rights = array(); // Permission array used by this module
345 345
         $r = 0;
346 346
 
347 347
         $this->rights[$r][0] = 9993;
Please login to merge, or discard this patch.
addFlight.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
         $vol->cost = $_POST['cost'];
49 49
         $vol->fk_receiver = $_POST['fk_receiver'];
50 50
         $vol->justif_kilometers = $_POST['justif_kilometers'];
51
-        $isGroupedFlight = (int)GETPOST('grouped_flight', 'int',2) === 1;
51
+        $isGroupedFlight = (int) GETPOST('grouped_flight', 'int', 2) === 1;
52 52
 
53 53
         //verification des heures
54 54
         $patern = '#[0-9]{4}#';
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
             $msg = '<div class="error">Erreur ce type de vol doit être payant.</div>';
88 88
             $error++;
89 89
         }
90
-        if($vol->getFlightType()->isBillingRequired() && !$vol->hasReceiver()){
90
+        if ($vol->getFlightType()->isBillingRequired() && !$vol->hasReceiver()) {
91 91
             $msg = '<div class="error">Erreur ce type de vol doit être payant, mais personne n\'a été signalé comme recepteur d\'argent.</div>';
92 92
             $error++;
93 93
         }
Please login to merge, or discard this patch.
list.php 1 patch
Spacing   +89 added lines, -89 removed lines patch added patch discarded remove patch
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 $search_fk_type = GETPOST('search_fk_type', 'int');
51 51
 $search_fk_pilot = GETPOST('search_fk_pilot', 'int') ?: ($user->admin ? '' : $user->id);
52 52
 $search_fk_organisateur = GETPOST('search_fk_organisateur', 'int');
53
-$search_is_facture = GETPOST('search_is_facture', 'int') === ''? -1 : (int)GETPOST('search_is_facture', 'int');
53
+$search_is_facture = GETPOST('search_is_facture', 'int') === '' ? -1 : (int) GETPOST('search_is_facture', 'int');
54 54
 $search_kilometers = GETPOST('search_kilometers', 'alpha');
55 55
 $search_cost = GETPOST('search_cost', 'alpha');
56 56
 $search_fk_receiver = GETPOST('search_fk_receiver', 'int');
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
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
 }
@@ -275,7 +275,7 @@  discard block
 block discarded – undo
275 275
 // Add fields from hooks
276 276
 $parameters = array();
277 277
 $reshook = $hookmanager->executeHooks('printFieldListSelect',
278
-    $parameters);    // Note that $action and $object may have been modified by hook
278
+    $parameters); // Note that $action and $object may have been modified by hook
279 279
 $sql .= $hookmanager->resPrint;
280 280
 $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t";
281 281
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
@@ -289,8 +289,8 @@  discard block
 block discarded – undo
289 289
 
290 290
 $sql .= " WHERE 1 = 1";
291 291
 
292
-if($search_all){
293
-    $sql .= natural_search(["idBBC_vols",  "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
292
+if ($search_all) {
293
+    $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
294 294
 }
295 295
 
296 296
 if ($search_idBBC_vols) {
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 // Add where from hooks
370 370
 $parameters = array();
371 371
 $reshook = $hookmanager->executeHooks('printFieldListWhere',
372
-    $parameters);    // Note that $action and $object may have been modified by hook
372
+    $parameters); // Note that $action and $object may have been modified by hook
373 373
 $sql .= $hookmanager->resPrint;
374 374
 $sql .= $db->order($sortfield, $sortorder);
375 375
 //$sql.= $db->plimit($conf->liste_limit+1, $offset);
@@ -411,58 +411,58 @@  discard block
 block discarded – undo
411 411
 if ($limit > 0 && $limit != $conf->liste_limit) {
412 412
     $param .= '&limit=' . $limit;
413 413
 }
414
-if ($search_idBBC_vols  != '') {
414
+if ($search_idBBC_vols != '') {
415 415
     $param .= '&amp;search_idBBC_vols=' . urlencode($search_idBBC_vols);
416 416
 }
417
-if ($search_date  != '') {
417
+if ($search_date != '') {
418 418
     $param .= '&amp;search_date=' . urlencode($search_date);
419 419
 }
420
-if ($search_lieuD  != '') {
420
+if ($search_lieuD != '') {
421 421
     $param .= '&amp;search_lieuD=' . urlencode($search_lieuD);
422 422
 }
423
-if ($search_lieuA  != '') {
423
+if ($search_lieuA != '') {
424 424
     $param .= '&amp;search_lieuA=' . urlencode($search_lieuA);
425 425
 }
426
-if ($search_heureD  != '') {
426
+if ($search_heureD != '') {
427 427
     $param .= '&amp;search_heureD=' . urlencode($search_heureD);
428 428
 }
429
-if ($search_heureA  != '') {
429
+if ($search_heureA != '') {
430 430
     $param .= '&amp;search_heureA=' . urlencode($search_heureA);
431 431
 }
432
-if ($search_BBC_ballons_idBBC_ballons  != '') {
432
+if ($search_BBC_ballons_idBBC_ballons != '') {
433 433
     $param .= '&amp;search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons);
434 434
 }
435
-if ($search_nbrPax  != '') {
435
+if ($search_nbrPax != '') {
436 436
     $param .= '&amp;search_nbrPax=' . urlencode($search_nbrPax);
437 437
 }
438
-if ($search_remarque  != '') {
438
+if ($search_remarque != '') {
439 439
     $param .= '&amp;search_remarque=' . urlencode($search_remarque);
440 440
 }
441
-if ($search_incidents  != '') {
441
+if ($search_incidents != '') {
442 442
     $param .= '&amp;search_incidents=' . urlencode($search_incidents);
443 443
 }
444
-if ($search_fk_type  != '') {
444
+if ($search_fk_type != '') {
445 445
     $param .= '&amp;search_fk_type=' . urlencode($search_fk_type);
446 446
 }
447 447
 if ($search_fk_pilot != '') {
448 448
     $param .= '&amp;search_fk_pilot=' . urlencode($search_fk_pilot);
449 449
 }
450
-if ($search_fk_organisateur  != '') {
450
+if ($search_fk_organisateur != '') {
451 451
     $param .= '&amp;search_fk_organisateur=' . urlencode($search_fk_organisateur);
452 452
 }
453
-if ($search_is_facture  != -1) {
453
+if ($search_is_facture != -1) {
454 454
     $param .= '&amp;search_is_facture=' . urlencode($search_is_facture);
455 455
 }
456
-if ($search_kilometers  != '') {
456
+if ($search_kilometers != '') {
457 457
     $param .= '&amp;search_kilometers=' . urlencode($search_kilometers);
458 458
 }
459
-if ($search_cost  != '') {
459
+if ($search_cost != '') {
460 460
     $param .= '&amp;search_cost=' . urlencode($search_cost);
461 461
 }
462
-if ($search_fk_receiver  != '') {
462
+if ($search_fk_receiver != '') {
463 463
     $param .= '&amp;search_fk_receiver=' . urlencode($search_fk_receiver);
464 464
 }
465
-if ($search_justif_kilometers  != '') {
465
+if ($search_justif_kilometers != '') {
466 466
     $param .= '&amp;search_justif_kilometers=' . urlencode($search_justif_kilometers);
467 467
 }
468 468
 if ($search_all != '') {
@@ -506,8 +506,8 @@  discard block
 block discarded – undo
506 506
 
507 507
 
508 508
 $moreHtml = "";
509
-if($search_all !== ""){
510
-    $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>";
509
+if ($search_all !== "") {
510
+    $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>";
511 511
 }
512 512
 
513 513
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 
528 528
 $parameters = array();
529 529
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle',
530
-    $parameters);    // Note that $action and $object may have been modified by hook
530
+    $parameters); // Note that $action and $object may have been modified by hook
531 531
 if (empty($reshook)) {
532 532
     $moreforfilter .= $hookmanager->resPrint;
533 533
 } else {
@@ -542,7 +542,7 @@  discard block
 block discarded – undo
542 542
 
543 543
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
544 544
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields,
545
-    $varpage);    // This also change content of $arrayfields
545
+    $varpage); // This also change content of $arrayfields
546 546
 
547 547
 print '<div class="div-table-responsive">';
548 548
 print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
 // Hook fields
639 639
 $parameters = array('arrayfields' => $arrayfields);
640 640
 $reshook = $hookmanager->executeHooks('printFieldListTitle',
641
-    $parameters);    // Note that $action and $object may have been modified by hook
641
+    $parameters); // Note that $action and $object may have been modified by hook
642 642
 print $hookmanager->resPrint;
643 643
 if (!empty($arrayfields['t.datec']['checked'])) {
644 644
     print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param,
@@ -707,7 +707,7 @@  discard block
 block discarded – undo
707 707
 
708 708
 if (!empty($arrayfields['t.is_facture']['checked'])) {
709 709
     print '<td class="liste_titre">';
710
-    print '<select name="search_is_facture"><option value="-1" '.($search_is_facture != 1 && $search_is_facture != 0 ? 'selected' : '' ).'></option><option value="1" '.($search_is_facture == 1 ? 'selected' : '' ).'>Facturé</option><option value="0" '.($search_is_facture == 0 ? 'selected' : '' ).'>Ouvert</option></select>';
710
+    print '<select name="search_is_facture"><option value="-1" ' . ($search_is_facture != 1 && $search_is_facture != 0 ? 'selected' : '') . '></option><option value="1" ' . ($search_is_facture == 1 ? 'selected' : '') . '>Facturé</option><option value="0" ' . ($search_is_facture == 0 ? 'selected' : '') . '>Ouvert</option></select>';
711 711
     print '</td>';
712 712
 }
713 713
 
@@ -752,7 +752,7 @@  discard block
 block discarded – undo
752 752
 // Fields from hook
753 753
 $parameters = array('arrayfields' => $arrayfields);
754 754
 $reshook = $hookmanager->executeHooks('printFieldListOption',
755
-    $parameters);    // Note that $action and $object may have been modified by hook
755
+    $parameters); // Note that $action and $object may have been modified by hook
756 756
 print $hookmanager->resPrint;
757 757
 if (!empty($arrayfields['t.datec']['checked'])) {
758 758
     // Date creation
@@ -794,124 +794,124 @@  discard block
 block discarded – undo
794 794
         // Show here line of result
795 795
         print '<tr ' . $bc[$var] . '>';
796 796
 
797
-        if (! empty($arrayfields['t.idBBC_vols']['checked']))
797
+        if (!empty($arrayfields['t.idBBC_vols']['checked']))
798 798
         {
799
-            print '<td>'.$flight->getNomUrl(0).'</td>';
799
+            print '<td>' . $flight->getNomUrl(0) . '</td>';
800 800
 
801
-            if (! $i) $totalarray['nbfield']++;
801
+            if (!$i) $totalarray['nbfield']++;
802 802
         }
803
-        if (! empty($arrayfields['t.date']['checked']))
803
+        if (!empty($arrayfields['t.date']['checked']))
804 804
         {
805 805
             print '<td>';
806 806
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
807 807
             print '</td>';
808 808
 
809
-            if (! $i) $totalarray['nbfield']++;
809
+            if (!$i) $totalarray['nbfield']++;
810 810
         }
811
-        if (! empty($arrayfields['t.lieuD']['checked']))
811
+        if (!empty($arrayfields['t.lieuD']['checked']))
812 812
         {
813
-            print '<td>'.$obj->lieuD.'</td>';
813
+            print '<td>' . $obj->lieuD . '</td>';
814 814
 
815
-            if (! $i) $totalarray['nbfield']++;
815
+            if (!$i) $totalarray['nbfield']++;
816 816
         }
817
-        if (! empty($arrayfields['t.lieuA']['checked']))
817
+        if (!empty($arrayfields['t.lieuA']['checked']))
818 818
         {
819
-            print '<td>'.$obj->lieuA.'</td>';
819
+            print '<td>' . $obj->lieuA . '</td>';
820 820
 
821
-            if (! $i) $totalarray['nbfield']++;
821
+            if (!$i) $totalarray['nbfield']++;
822 822
         }
823
-        if (! empty($arrayfields['t.heureD']['checked']))
823
+        if (!empty($arrayfields['t.heureD']['checked']))
824 824
         {
825
-            print '<td>'.$obj->heureD.'</td>';
825
+            print '<td>' . $obj->heureD . '</td>';
826 826
 
827
-            if (! $i) $totalarray['nbfield']++;
827
+            if (!$i) $totalarray['nbfield']++;
828 828
         }
829
-        if (! empty($arrayfields['t.heureA']['checked']))
829
+        if (!empty($arrayfields['t.heureA']['checked']))
830 830
         {
831
-            print '<td>'.$obj->heureA.'</td>';
831
+            print '<td>' . $obj->heureA . '</td>';
832 832
 
833
-            if (! $i) $totalarray['nbfield']++;
833
+            if (!$i) $totalarray['nbfield']++;
834 834
         }
835
-        if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
835
+        if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
836 836
         {
837
-            print '<td>'.$obj->bal.'</td>';
837
+            print '<td>' . $obj->bal . '</td>';
838 838
 
839
-            if (! $i) $totalarray['nbfield']++;
839
+            if (!$i) $totalarray['nbfield']++;
840 840
         }
841
-        if (! empty($arrayfields['t.nbrPax']['checked']))
841
+        if (!empty($arrayfields['t.nbrPax']['checked']))
842 842
         {
843
-            print '<td>'.$obj->nbrPax.'</td>';
843
+            print '<td>' . $obj->nbrPax . '</td>';
844 844
 
845
-            if (! $i) $totalarray['nbfield']++;
845
+            if (!$i) $totalarray['nbfield']++;
846 846
         }
847
-        if (! empty($arrayfields['t.remarque']['checked']))
847
+        if (!empty($arrayfields['t.remarque']['checked']))
848 848
         {
849
-            print '<td>'.$obj->remarque.'</td>';
849
+            print '<td>' . $obj->remarque . '</td>';
850 850
 
851
-            if (! $i) $totalarray['nbfield']++;
851
+            if (!$i) $totalarray['nbfield']++;
852 852
         }
853
-        if (! empty($arrayfields['t.incidents']['checked']))
853
+        if (!empty($arrayfields['t.incidents']['checked']))
854 854
         {
855
-            print '<td>'.$obj->incidents.'</td>';
855
+            print '<td>' . $obj->incidents . '</td>';
856 856
 
857
-            if (! $i) $totalarray['nbfield']++;
857
+            if (!$i) $totalarray['nbfield']++;
858 858
         }
859
-        if (! empty($arrayfields['t.fk_type']['checked']))
859
+        if (!empty($arrayfields['t.fk_type']['checked']))
860 860
         {
861
-            print '<td>'.$obj->flight_type.'</td>';
861
+            print '<td>' . $obj->flight_type . '</td>';
862 862
 
863
-            if (! $i) $totalarray['nbfield']++;
863
+            if (!$i) $totalarray['nbfield']++;
864 864
         }
865
-        if (! empty($arrayfields['t.fk_pilot']['checked']))
865
+        if (!empty($arrayfields['t.fk_pilot']['checked']))
866 866
         {
867
-            print '<td>'.$obj->pilot.'</td>';
867
+            print '<td>' . $obj->pilot . '</td>';
868 868
 
869
-            if (! $i) $totalarray['nbfield']++;
869
+            if (!$i) $totalarray['nbfield']++;
870 870
         }
871
-        if (! empty($arrayfields['t.fk_organisateur']['checked']))
871
+        if (!empty($arrayfields['t.fk_organisateur']['checked']))
872 872
         {
873
-            print '<td>'.$obj->organisator.'</td>';
873
+            print '<td>' . $obj->organisator . '</td>';
874 874
 
875
-            if (! $i) $totalarray['nbfield']++;
875
+            if (!$i) $totalarray['nbfield']++;
876 876
         }
877
-        if (! empty($arrayfields['t.is_facture']['checked']))
877
+        if (!empty($arrayfields['t.is_facture']['checked']))
878 878
         {
879 879
             $flight->is_facture = $obj->is_facture;
880
-            print '<td>'.$flight->getLibStatut(3).'</td>';
880
+            print '<td>' . $flight->getLibStatut(3) . '</td>';
881 881
 
882
-            if (! $i) $totalarray['nbfield']++;
882
+            if (!$i) $totalarray['nbfield']++;
883 883
         }
884
-        if (! empty($arrayfields['t.kilometers']['checked']))
884
+        if (!empty($arrayfields['t.kilometers']['checked']))
885 885
         {
886
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
887
-                print '<td>'.$obj->kilometers.' KM</td>';
888
-            }else{
886
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
887
+                print '<td>' . $obj->kilometers . ' KM</td>';
888
+            } else {
889 889
                 print '<td> - Km</td>';
890 890
             }
891 891
 
892
-            if (! $i) $totalarray['nbfield']++;
892
+            if (!$i) $totalarray['nbfield']++;
893 893
         }
894
-        if (! empty($arrayfields['t.cost']['checked']))
894
+        if (!empty($arrayfields['t.cost']['checked']))
895 895
         {
896
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
897
-                print '<td>'.$obj->cost.'€</td>';
898
-            }else{
896
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
897
+                print '<td>' . $obj->cost . '€</td>';
898
+            } else {
899 899
                 print '<td> - €</td>';
900 900
             }
901 901
 
902
-            if (! $i) $totalarray['nbfield']++;
902
+            if (!$i) $totalarray['nbfield']++;
903 903
         }
904
-        if (! empty($arrayfields['t.fk_receiver']['checked']))
904
+        if (!empty($arrayfields['t.fk_receiver']['checked']))
905 905
         {
906
-            print '<td>'.$obj->receiver.'</td>';
906
+            print '<td>' . $obj->receiver . '</td>';
907 907
 
908
-            if (! $i) $totalarray['nbfield']++;
908
+            if (!$i) $totalarray['nbfield']++;
909 909
         }
910
-        if (! empty($arrayfields['t.justif_kilometers']['checked']))
910
+        if (!empty($arrayfields['t.justif_kilometers']['checked']))
911 911
         {
912
-            print '<td>'.$obj->justif_kilometers.'</td>';
912
+            print '<td>' . $obj->justif_kilometers . '</td>';
913 913
 
914
-            if (! $i) $totalarray['nbfield']++;
914
+            if (!$i) $totalarray['nbfield']++;
915 915
         }
916 916
 
917 917
         // Extra fields
@@ -936,7 +936,7 @@  discard block
 block discarded – undo
936 936
         // Fields from hook
937 937
         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
938 938
         $reshook = $hookmanager->executeHooks('printFieldListValue',
939
-            $parameters);    // Note that $action and $object may have been modified by hook
939
+            $parameters); // Note that $action and $object may have been modified by hook
940 940
         print $hookmanager->resPrint;
941 941
         // Date creation
942 942
         if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1006,7 +1006,7 @@  discard block
 block discarded – undo
1006 1006
 
1007 1007
 $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
1008 1008
 $reshook = $hookmanager->executeHooks('printFieldListFooter',
1009
-    $parameters);    // Note that $action and $object may have been modified by hook
1009
+    $parameters); // Note that $action and $object may have been modified by hook
1010 1010
 print $hookmanager->resPrint;
1011 1011
 
1012 1012
 print '</table>' . "\n";
Please login to merge, or discard this patch.
class/bbcvols.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -891,7 +891,7 @@
 block discarded – undo
891 891
      */
892 892
     public function hasPax()
893 893
     {
894
-        return (int)$this->nbrPax > 0;
894
+        return (int) $this->nbrPax > 0;
895 895
     }
896 896
 
897 897
     /**
Please login to merge, or discard this patch.
command/CreatePilotYearBillCommandHandler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -271,7 +271,7 @@
 block discarded – undo
271 271
      */
272 272
     private function addAdditionalBonusToOrder(CreatePilotYearBillCommand $command, $object)
273 273
     {
274
-        if ((int)$command->getAdditionalBonus() <= 0) {
274
+        if ((int) $command->getAdditionalBonus() <= 0) {
275 275
             return;
276 276
         }
277 277
 
Please login to merge, or discard this patch.