@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 60 | 60 | |
| 61 | 61 | // Load object |
| 62 | -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 |
|
| 62 | +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 |
|
| 63 | 63 | |
| 64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
| 65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 110 | 110 | |
| 111 | 111 | // Load object |
| 112 | -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 |
|
| 112 | +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 |
|
| 113 | 113 | |
| 114 | 114 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
| 115 | 115 | $hookmanager->initHooks(array('bbcvols')); |
@@ -128,7 +128,7 @@ discard block |
||
| 128 | 128 | |
| 129 | 129 | $parameters = array(); |
| 130 | 130 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
| 131 | - $action); // Note that $action and $object may have been modified by some hooks |
|
| 131 | + $action); // Note that $action and $object may have been modified by some hooks |
|
| 132 | 132 | if ($reshook < 0) { |
| 133 | 133 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 134 | 134 | } |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | print '<div class="tabsAction">' . "\n"; |
| 481 | 481 | $parameters = array(); |
| 482 | 482 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
| 483 | - $action); // Note that $action and $object may have been modified by hook |
|
| 483 | + $action); // Note that $action and $object may have been modified by hook |
|
| 484 | 484 | if ($reshook < 0) { |
| 485 | 485 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 486 | 486 | } |
@@ -59,7 +59,7 @@ discard block |
||
| 59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 60 | 60 | |
| 61 | 61 | // Load object |
| 62 | -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 |
|
| 62 | +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 |
|
| 63 | 63 | |
| 64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
| 65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>'; |
| 90 | 90 | |
| 91 | 91 | if ($user->rights->flightLog->vol->financial) { |
| 92 | - print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>'; |
|
| 92 | + print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>'; |
|
| 93 | 93 | } |
| 94 | 94 | |
| 95 | 95 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>'; |
@@ -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 | |
@@ -59,7 +59,7 @@ |
||
| 59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
| 60 | 60 | |
| 61 | 61 | // Load object |
| 62 | -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 |
|
| 62 | +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 |
|
| 63 | 63 | |
| 64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
| 65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | $this->results["flightLog"] = [ |
| 30 | 30 | 'label' => $langs->trans("Search flight"), |
| 31 | 31 | 'text' => $langs->trans("Search flight"), |
| 32 | - 'url' => DOL_URL_ROOT . '/flightLog/list.php?mainmenu=flightLog&sall='.$searchInfo['search_boxvalue'] |
|
| 32 | + 'url' => DOL_URL_ROOT . '/flightLog/list.php?mainmenu=flightLog&sall=' . $searchInfo['search_boxvalue'] |
|
| 33 | 33 | ]; |
| 34 | 34 | } |
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -152,7 +152,7 @@ discard block |
||
| 152 | 152 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>'; |
| 153 | 153 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>'; |
| 154 | 154 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>'; |
| 155 | - print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
| 155 | + print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
| 156 | 156 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>'; |
| 157 | 157 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>'; |
| 158 | 158 | print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>'; |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | print "<tr>"; |
| 251 | 251 | print "<td colspan='18'></td>"; |
| 252 | 252 | print "<td>Total à reçevoir</td>"; |
| 253 | - print "<td>".price($total)."€</td>"; |
|
| 253 | + print "<td>" . price($total) . "€</td>"; |
|
| 254 | 254 | print "</tr>"; |
| 255 | 255 | |
| 256 | 256 | |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | $adherent = new Adherent($db); |
| 110 | 110 | $adherent->fetch($expenseNoteUser->fk_member); |
| 111 | 111 | |
| 112 | - $addBonus = (int)$additionalBonus[$currentMissionUserId]; |
|
| 112 | + $addBonus = (int) $additionalBonus[$currentMissionUserId]; |
|
| 113 | 113 | if ($addBonus < 0) { |
| 114 | 114 | dol_htmloutput_mesg("Facture ignorée " . $adherent->getFullName($langs), '', 'warning'); |
| 115 | 115 | continue; |
@@ -335,7 +335,7 @@ discard block |
||
| 335 | 335 | $object->insert_discount($discountid); |
| 336 | 336 | |
| 337 | 337 | //Additional bonus |
| 338 | - if ((int)$addBonus > 0) { |
|
| 338 | + if ((int) $addBonus > 0) { |
|
| 339 | 339 | |
| 340 | 340 | $pu_ht = price2num($addBonus, 'MU'); |
| 341 | 341 | |
@@ -589,9 +589,12 @@ |
||
| 589 | 589 | |
| 590 | 590 | <?php if ($year >= $currentYear) : ?> |
| 591 | 591 | <a class="butActionRefused" href="#">Générer</a> |
| 592 | - <?php else: ?> |
|
| 592 | + <?php else { |
|
| 593 | + : ?> |
|
| 593 | 594 | <button class="butAction" type="submit">Générer</button> |
| 594 | - <?php endif; ?> |
|
| 595 | + <?php endif; |
|
| 596 | +} |
|
| 597 | +?> |
|
| 595 | 598 | |
| 596 | 599 | </form> |
| 597 | 600 | |