@@ -66,7 +66,7 @@ discard block |
||
| 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 |
||
| 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. 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. 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 |
||
| 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 | } |
@@ -354,7 +354,7 @@ discard block |
||
| 354 | 354 | print '<div class="tabsAction">' . "\n"; |
| 355 | 355 | $parameters = array(); |
| 356 | 356 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
| 357 | - $action); // Note that $action and $object may have been modified by hook |
|
| 357 | + $action); // Note that $action and $object may have been modified by hook |
|
| 358 | 358 | if ($reshook < 0) { |
| 359 | 359 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
| 360 | 360 | } |
@@ -367,13 +367,13 @@ discard block |
||
| 367 | 367 | print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete">' . $langs->trans('Delete') . '</a></div>' . "\n"; |
| 368 | 368 | } |
| 369 | 369 | |
| 370 | - if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
| 371 | - 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"; |
|
| 370 | + if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
| 371 | + 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"; |
|
| 372 | 372 | } |
| 373 | 373 | |
| 374 | 374 | print '</div>' . "\n"; |
| 375 | 375 | |
| 376 | - if($user->rights->flightlog->vol->financial){ |
|
| 376 | + if ($user->rights->flightlog->vol->financial) { |
|
| 377 | 377 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
| 378 | 378 | $form->showLinkedObjectBlock($object); |
| 379 | 379 | print '</div></div>'; |
@@ -149,10 +149,10 @@ discard block |
||
| 149 | 149 | $this->lieuA = trim($this->lieuA); |
| 150 | 150 | } |
| 151 | 151 | if (isset($this->heureD)) { |
| 152 | - $this->heureD = trim($this->heureD).'00'; |
|
| 152 | + $this->heureD = trim($this->heureD) . '00'; |
|
| 153 | 153 | } |
| 154 | 154 | if (isset($this->heureA)) { |
| 155 | - $this->heureA = trim($this->heureA).'00'; |
|
| 155 | + $this->heureA = trim($this->heureA) . '00'; |
|
| 156 | 156 | } |
| 157 | 157 | if (isset($this->BBC_ballons_idBBC_ballons)) { |
| 158 | 158 | $this->BBC_ballons_idBBC_ballons = trim($this->BBC_ballons_idBBC_ballons); |
@@ -891,7 +891,7 @@ discard block |
||
| 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 | /** |