@@ -168,7 +168,7 @@ |
||
| 168 | 168 | |
| 169 | 169 | if ($result > 0) { |
| 170 | 170 | dol_htmloutput_mesg("Notes de frais créées"); |
| 171 | - }else{ |
|
| 171 | + } else{ |
|
| 172 | 172 | dol_htmloutput_errors("Note de frais non créée"); |
| 173 | 173 | } |
| 174 | 174 | } else { |
@@ -613,9 +613,12 @@ |
||
| 613 | 613 | |
| 614 | 614 | <?php if ($year >= $currentYear || !$t1->service || !$t2->service || !$t3->service || !$t4->service || !$t5->service || !$t6->service || !$t7->service) : ?> |
| 615 | 615 | <a class="butActionRefused" href="#">Générer</a> |
| 616 | - <?php else: ?> |
|
| 616 | + <?php else { |
|
| 617 | + : ?> |
|
| 617 | 618 | <button class="butAction" type="submit">Générer</button> |
| 618 | - <?php endif; ?> |
|
| 619 | + <?php endif; |
|
| 620 | +} |
|
| 621 | +?> |
|
| 619 | 622 | |
| 620 | 623 | </form> |
| 621 | 624 | |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | $command = new CreateFlightBillCommand($flight->getId(), $modeReglement, $conditionReglement, $documentModel, $type, $publicNote, $privateNote,$bankAccount); |
| 132 | 132 | $handler->handle($command); |
| 133 | 133 | Header("Location: card.php?id=" . $flight->getId()); |
| 134 | - }catch (\Exception $e){ |
|
| 134 | + } catch (\Exception $e){ |
|
| 135 | 135 | dol_syslog($e->getMessage(),LOG_ERR); |
| 136 | 136 | dol_htmloutput_mesg("Facture non créée", '', 'error'); |
| 137 | 137 | } |
@@ -267,9 +267,12 @@ discard block |
||
| 267 | 267 | |
| 268 | 268 | <?php if (!$flightProduct) : ?> |
| 269 | 269 | <a class="butActionRefused" href="#">Générer</a> |
| 270 | - <?php else: ?> |
|
| 270 | + <?php else { |
|
| 271 | + : ?> |
|
| 271 | 272 | <button class="butAction" type="submit">Générer</button> |
| 272 | - <?php endif; ?> |
|
| 273 | + <?php endif; |
|
| 274 | +} |
|
| 275 | +?> |
|
| 273 | 276 | |
| 274 | 277 | <a class="butAction" href="<?php echo DOL_URL_ROOT . '/flightlog/card.php?id=' . $flight->id; ?>">Retour au |
| 275 | 278 | vol</a> |
@@ -239,9 +239,12 @@ |
||
| 239 | 239 | <?php echo $langs->trans('La periode demandée n\'est pas cloturée.') ?> |
| 240 | 240 | </p> |
| 241 | 241 | <a class="butActionRefused" href="#">Générer</a> |
| 242 | - <?php else: ?> |
|
| 242 | + <?php else { |
|
| 243 | + : ?> |
|
| 243 | 244 | <button class="butAction" type="submit">Générer</button> |
| 244 | - <?php endif; ?> |
|
| 245 | + <?php endif; |
|
| 246 | +} |
|
| 247 | +?> |
|
| 245 | 248 | |
| 246 | 249 | </form> |
| 247 | 250 | </section> |
@@ -211,8 +211,11 @@ discard block |
||
| 211 | 211 | <?php if ($userWrite): ?> |
| 212 | 212 | <?php echo $formOther->select_percent($currentTask->progress, |
| 213 | 213 | sprintf('progression[%s]', $currentTask->id, false, 10)); ?> |
| 214 | - <?php else: ?> |
|
| 215 | - <span><?php echo $currentTask->progress; ?> %</span> |
|
| 214 | + <?php else { |
|
| 215 | + : ?> |
|
| 216 | + <span><?php echo $currentTask->progress; |
|
| 217 | +} |
|
| 218 | +?> %</span> |
|
| 216 | 219 | <?php endif; ?> |
| 217 | 220 | |
| 218 | 221 | </td> |
@@ -232,14 +235,17 @@ discard block |
||
| 232 | 235 | <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id, |
| 233 | 236 | $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?> |
| 234 | 237 | /> |
| 235 | - <?php else: ?> |
|
| 238 | + <?php else { |
|
| 239 | + : ?> |
|
| 236 | 240 | |
| 237 | 241 | <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id, |
| 238 | 242 | $flight->linkedObjectsIds[$currentTask->table_element])): ?> |
| 239 | 243 | <span class="fa fa-check"></span> |
| 240 | 244 | <?php else: ?> |
| 241 | 245 | <span class="fa fa-times"></span> |
| 242 | - <?php endif; ?> |
|
| 246 | + <?php endif; |
|
| 247 | +} |
|
| 248 | +?> |
|
| 243 | 249 | |
| 244 | 250 | <?php endif; ?> |
| 245 | 251 | |
@@ -69,7 +69,7 @@ |
||
| 69 | 69 | |
| 70 | 70 | $msg = '<div class="ok">L\'ajout du vol du : ' . $_POST["reday"] . '/' . $_POST["remonth"] . '/' . $_POST["reyear"] . ' s\'est correctement effectue ! </div>'; |
| 71 | 71 | Header("Location: card.php?id=" . $vol->id); |
| 72 | - }catch (\Exception $e){ |
|
| 72 | + } catch (\Exception $e){ |
|
| 73 | 73 | $msg = '<div class="error">Erreur lors de l\'ajout du vol : ' . $vol->error . '! </div>'; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -25,8 +25,10 @@ discard block |
||
| 25 | 25 | foreach ($dirsociete as $dirroot) |
| 26 | 26 | { |
| 27 | 27 | $res=dol_include_once($dirroot.$module.'.php'); |
| 28 | - if ($res) break; |
|
| 29 | -} |
|
| 28 | + if ($res) { |
|
| 29 | + break; |
|
| 30 | + } |
|
| 31 | + } |
|
| 30 | 32 | $modCodeClient = new $module; |
| 31 | 33 | // Load object modCodeFournisseur |
| 32 | 34 | $module=(! empty($conf->global->SOCIETE_CODECLIENT_ADDON)?$conf->global->SOCIETE_CODECLIENT_ADDON:'mod_codeclient_leopard'); |
@@ -38,8 +40,10 @@ discard block |
||
| 38 | 40 | foreach ($dirsociete as $dirroot) |
| 39 | 41 | { |
| 40 | 42 | $res=dol_include_once($dirroot.$module.'.php'); |
| 41 | - if ($res) break; |
|
| 42 | -} |
|
| 43 | + if ($res) { |
|
| 44 | + break; |
|
| 45 | + } |
|
| 46 | + } |
|
| 43 | 47 | $modCodeFournisseur = new $module; |
| 44 | 48 | |
| 45 | 49 | // Load translation files required by the page |
@@ -302,8 +306,11 @@ discard block |
||
| 302 | 306 | </script> |
| 303 | 307 | <a href="#" class="hideonsmartphone" onclick="javascript: CheckVAT(document.add.tva_intra.value);"><?php echo $langs->trans("VATIntraCheck"); ?></a> |
| 304 | 308 | <?php echo $html->textwithpicto($s,$langs->trans("VATIntraCheckDesc",$langs->trans("VATIntraCheck")),1); ?> |
| 305 | - <?php else: ?> |
|
| 306 | - <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); ?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
| 309 | + <?php else { |
|
| 310 | + : ?> |
|
| 311 | + <a href="<?php echo $langs->transcountry("VATIntraCheckURL",$object->country_id); |
|
| 312 | +} |
|
| 313 | +?>" target="_blank"><?php echo img_picto($langs->trans("VATIntraCheckableOnEUSite"),'help'); ?></a> |
|
| 307 | 314 | <?php endif; ?> |
| 308 | 315 | <?php endif; ?> |
| 309 | 316 | </td> |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | if(!$object->isLinkedToOrder()){ |
| 102 | 102 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>'; |
| 103 | 103 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>'; |
| 104 | -}else{ |
|
| 104 | +} else{ |
|
| 105 | 105 | print '<tr><td class="fieldrequired">' . $langs->trans("Order") . '</td><td>' . $object->getOrder()->getNomUrl(1). '</td></tr>'; |
| 106 | 106 | } |
| 107 | 107 | print '</table>'; |
@@ -347,7 +347,7 @@ |
||
| 347 | 347 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyOjbect'), |
| 348 | 348 | $langs->trans('êtes-vous sure de vouloir supprimer ce vol ?'), 'confirm_delete', '', 0, 1); |
| 349 | 349 | print $formconfirm; |
| 350 | - }elseif ($user->rights->flightlog->vol->financial && !$object->isBilled() && $action == ACTION_FLAG_BILLED) { |
|
| 350 | + } elseif ($user->rights->flightlog->vol->financial && !$object->isBilled() && $action == ACTION_FLAG_BILLED) { |
|
| 351 | 351 | $formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('Marque comme facturé'), |
| 352 | 352 | $langs->trans('Ce vol va être marqué comme facturé, est-ce bien le cas ?'), ACTION_CONFIRM_FLAG_BILLED, '', 0, 1); |
| 353 | 353 | print $formconfirm; |