@@ -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> |
@@ -95,7 +95,7 @@ |
||
95 | 95 | if ($action == EXPENSE_REPORT_GENERATOR_ACTION_GENERATE) { |
96 | 96 | try { |
97 | 97 | |
98 | - $command = new CreateMonthBillCommand( $type, $publicNote, $privateNote, $year, $month); |
|
98 | + $command = new CreateMonthBillCommand($type, $publicNote, $privateNote, $year, $month); |
|
99 | 99 | $handler->handle($command); |
100 | 100 | dol_htmloutput_mesg('Génération : OK'); |
101 | 101 | } catch (Exception $e) { |
@@ -53,7 +53,7 @@ |
||
53 | 53 | |
54 | 54 | try { |
55 | 55 | |
56 | - if(date('d')>=15){ |
|
56 | + if (date('d') >= 15) { |
|
57 | 57 | dol_syslog('Monthly bill generation : date over'); |
58 | 58 | return -2; |
59 | 59 | } |
@@ -274,7 +274,7 @@ |
||
274 | 274 | print '<td>' . $totalT3 . '</td>'; |
275 | 275 | print '<td></td>'; |
276 | 276 | |
277 | -print '<td>' . $totalT4. '</td>'; |
|
277 | +print '<td>' . $totalT4 . '</td>'; |
|
278 | 278 | print '<td></td>'; |
279 | 279 | |
280 | 280 | print '<td>' . $totalT5 . '</td>'; |
@@ -564,9 +564,9 @@ |
||
564 | 564 | $label = '<u>' . $langs->trans("MyModule") . '</u>'; |
565 | 565 | $label .= '<div width="100%">'; |
566 | 566 | $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->idBBC_vols . '<br>'; |
567 | - $label .= '<b>' . $langs->trans('Date') . ':</b> ' . dol_print_date($this->date, '%d-%m-%Y').'<br/>'; |
|
568 | - $label .= '<b>' . $langs->trans('From') . ':</b> ' . $this->lieuD.'<br/>'; |
|
569 | - $label .= '<b>' . $langs->trans('To') . ':</b> ' . $this->lieuA.'<br/>'; |
|
567 | + $label .= '<b>' . $langs->trans('Date') . ':</b> ' . dol_print_date($this->date, '%d-%m-%Y') . '<br/>'; |
|
568 | + $label .= '<b>' . $langs->trans('From') . ':</b> ' . $this->lieuD . '<br/>'; |
|
569 | + $label .= '<b>' . $langs->trans('To') . ':</b> ' . $this->lieuA . '<br/>'; |
|
570 | 570 | $label .= '</div>'; |
571 | 571 | |
572 | 572 | $link = '<a href="' . DOL_URL_ROOT . '/flightlog/card.php?id=' . $this->idBBC_vols . '"'; |
@@ -232,7 +232,7 @@ |
||
232 | 232 | <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id, |
233 | 233 | $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?> |
234 | 234 | /> |
235 | - <?php else: ?> |
|
235 | + <?php else : ?> |
|
236 | 236 | |
237 | 237 | <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id, |
238 | 238 | $flight->linkedObjectsIds[$currentTask->table_element])): ?> |
@@ -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 |