@@ -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 . '"'; |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | * Security |
| 92 | 92 | */ |
| 93 | 93 | restrictedArea($user, 'projet', $id, 'projet&project'); |
| 94 | -$userWrite = $project->restrictedProjectArea($user,'write') || $project->public; |
|
| 94 | +$userWrite = $project->restrictedProjectArea($user, 'write') || $project->public; |
|
| 95 | 95 | |
| 96 | 96 | /* |
| 97 | 97 | * Actions |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | </td> |
| 160 | 160 | |
| 161 | 161 | <td class="center"> |
| 162 | - <?php if($userWrite): ?> |
|
| 162 | + <?php if ($userWrite): ?> |
|
| 163 | 163 | <?php echo $formOther->select_percent($currentTask->progress, |
| 164 | 164 | sprintf('progression[%s]', $currentTask->id, false, 10)); ?> |
| 165 | 165 | <?php else: ?> |
@@ -175,15 +175,15 @@ discard block |
||
| 175 | 175 | |
| 176 | 176 | <td class="center"> |
| 177 | 177 | |
| 178 | - <?php if($userWrite):?> |
|
| 178 | + <?php if ($userWrite):?> |
|
| 179 | 179 | <input type="checkbox" |
| 180 | 180 | value="<?php echo $currentTask->id; ?>" |
| 181 | 181 | name="objective[<?php echo $flight->getId(); ?>][]" |
| 182 | 182 | <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id, $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?> |
| 183 | 183 | /> |
| 184 | - <?php else: ?> |
|
| 184 | + <?php else : ?> |
|
| 185 | 185 | |
| 186 | - <?php if(!empty($flight->linkedObjectsIds) && in_array($currentTask->id, $flight->linkedObjectsIds[$currentTask->table_element])): ?> |
|
| 186 | + <?php if (!empty($flight->linkedObjectsIds) && in_array($currentTask->id, $flight->linkedObjectsIds[$currentTask->table_element])): ?> |
|
| 187 | 187 | <span class="fa fa-check"></span> |
| 188 | 188 | <?php else: ?> |
| 189 | 189 | <span class="fa fa-times"></span> |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | |
| 203 | 203 | <div class="tabsAction"> |
| 204 | 204 | <div class="inline-block divButAction"> |
| 205 | - <?php if($userWrite): ?> |
|
| 205 | + <?php if ($userWrite): ?> |
|
| 206 | 206 | <button class="butAction" type="submit" name="action" value="save">Sauver</button> |
| 207 | 207 | <?php endif; ?> |
| 208 | 208 | </div> |
@@ -162,8 +162,11 @@ discard block |
||
| 162 | 162 | <?php if($userWrite): ?> |
| 163 | 163 | <?php echo $formOther->select_percent($currentTask->progress, |
| 164 | 164 | sprintf('progression[%s]', $currentTask->id, false, 10)); ?> |
| 165 | - <?php else: ?> |
|
| 166 | - <span><?php echo $currentTask->progress; ?> %</span> |
|
| 165 | + <?php else { |
|
| 166 | + : ?> |
|
| 167 | + <span><?php echo $currentTask->progress; |
|
| 168 | +} |
|
| 169 | +?> %</span> |
|
| 167 | 170 | <?php endif; ?> |
| 168 | 171 | |
| 169 | 172 | </td> |
@@ -181,13 +184,16 @@ discard block |
||
| 181 | 184 | name="objective[<?php echo $flight->getId(); ?>][]" |
| 182 | 185 | <?php echo !empty($flight->linkedObjectsIds) && in_array($currentTask->id, $flight->linkedObjectsIds[$currentTask->table_element]) ? 'checked' : '' ?> |
| 183 | 186 | /> |
| 184 | - <?php else: ?> |
|
| 187 | + <?php else { |
|
| 188 | + : ?> |
|
| 185 | 189 | |
| 186 | 190 | <?php if(!empty($flight->linkedObjectsIds) && in_array($currentTask->id, $flight->linkedObjectsIds[$currentTask->table_element])): ?> |
| 187 | 191 | <span class="fa fa-check"></span> |
| 188 | 192 | <?php else: ?> |
| 189 | 193 | <span class="fa fa-times"></span> |
| 190 | - <?php endif; ?> |
|
| 194 | + <?php endif; |
|
| 195 | +} |
|
| 196 | +?> |
|
| 191 | 197 | |
| 192 | 198 | <?php endif; ?> |
| 193 | 199 | |