@@ -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>'; |
@@ -191,10 +191,12 @@ discard block |
||
191 | 191 | include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; |
192 | 192 | |
193 | 193 | // Purge search criteria |
194 | - if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers |
|
194 | + if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) { |
|
195 | + // All tests are required to be compatible with all browsers |
|
195 | 196 | { |
196 | 197 | |
197 | 198 | $search_idBBC_vols = ''; |
199 | + } |
|
198 | 200 | $search_date = ''; |
199 | 201 | $search_lieuD = ''; |
200 | 202 | $search_lieuA = ''; |
@@ -801,7 +803,9 @@ discard block |
||
801 | 803 | { |
802 | 804 | print '<td>'.$flight->getNomUrl(0).'</td>'; |
803 | 805 | |
804 | - if (! $i) $totalarray['nbfield']++; |
|
806 | + if (! $i) { |
|
807 | + $totalarray['nbfield']++; |
|
808 | + } |
|
805 | 809 | } |
806 | 810 | if (! empty($arrayfields['t.date']['checked'])) |
807 | 811 | { |
@@ -809,112 +813,146 @@ discard block |
||
809 | 813 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
810 | 814 | print '</td>'; |
811 | 815 | |
812 | - if (! $i) $totalarray['nbfield']++; |
|
816 | + if (! $i) { |
|
817 | + $totalarray['nbfield']++; |
|
818 | + } |
|
813 | 819 | } |
814 | 820 | if (! empty($arrayfields['t.lieuD']['checked'])) |
815 | 821 | { |
816 | 822 | print '<td>'.$obj->lieuD.'</td>'; |
817 | 823 | |
818 | - if (! $i) $totalarray['nbfield']++; |
|
824 | + if (! $i) { |
|
825 | + $totalarray['nbfield']++; |
|
826 | + } |
|
819 | 827 | } |
820 | 828 | if (! empty($arrayfields['t.lieuA']['checked'])) |
821 | 829 | { |
822 | 830 | print '<td>'.$obj->lieuA.'</td>'; |
823 | 831 | |
824 | - if (! $i) $totalarray['nbfield']++; |
|
832 | + if (! $i) { |
|
833 | + $totalarray['nbfield']++; |
|
834 | + } |
|
825 | 835 | } |
826 | 836 | if (! empty($arrayfields['t.heureD']['checked'])) |
827 | 837 | { |
828 | 838 | print '<td>'.$obj->heureD.'</td>'; |
829 | 839 | |
830 | - if (! $i) $totalarray['nbfield']++; |
|
840 | + if (! $i) { |
|
841 | + $totalarray['nbfield']++; |
|
842 | + } |
|
831 | 843 | } |
832 | 844 | if (! empty($arrayfields['t.heureA']['checked'])) |
833 | 845 | { |
834 | 846 | print '<td>'.$obj->heureA.'</td>'; |
835 | 847 | |
836 | - if (! $i) $totalarray['nbfield']++; |
|
848 | + if (! $i) { |
|
849 | + $totalarray['nbfield']++; |
|
850 | + } |
|
837 | 851 | } |
838 | 852 | if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
839 | 853 | { |
840 | 854 | print '<td>'.$obj->bal.'</td>'; |
841 | 855 | |
842 | - if (! $i) $totalarray['nbfield']++; |
|
856 | + if (! $i) { |
|
857 | + $totalarray['nbfield']++; |
|
858 | + } |
|
843 | 859 | } |
844 | 860 | if (! empty($arrayfields['t.nbrPax']['checked'])) |
845 | 861 | { |
846 | 862 | print '<td>'.$obj->nbrPax.'</td>'; |
847 | 863 | |
848 | - if (! $i) $totalarray['nbfield']++; |
|
864 | + if (! $i) { |
|
865 | + $totalarray['nbfield']++; |
|
866 | + } |
|
849 | 867 | } |
850 | 868 | if (! empty($arrayfields['t.remarque']['checked'])) |
851 | 869 | { |
852 | 870 | print '<td>'.$obj->remarque.'</td>'; |
853 | 871 | |
854 | - if (! $i) $totalarray['nbfield']++; |
|
872 | + if (! $i) { |
|
873 | + $totalarray['nbfield']++; |
|
874 | + } |
|
855 | 875 | } |
856 | 876 | if (! empty($arrayfields['t.incidents']['checked'])) |
857 | 877 | { |
858 | 878 | print '<td>'.$obj->incidents.'</td>'; |
859 | 879 | |
860 | - if (! $i) $totalarray['nbfield']++; |
|
880 | + if (! $i) { |
|
881 | + $totalarray['nbfield']++; |
|
882 | + } |
|
861 | 883 | } |
862 | 884 | if (! empty($arrayfields['t.fk_type']['checked'])) |
863 | 885 | { |
864 | 886 | print '<td>'.$obj->flight_type.'</td>'; |
865 | 887 | |
866 | - if (! $i) $totalarray['nbfield']++; |
|
888 | + if (! $i) { |
|
889 | + $totalarray['nbfield']++; |
|
890 | + } |
|
867 | 891 | } |
868 | 892 | if (! empty($arrayfields['t.fk_pilot']['checked'])) |
869 | 893 | { |
870 | 894 | print '<td>'.$obj->pilot.'</td>'; |
871 | 895 | |
872 | - if (! $i) $totalarray['nbfield']++; |
|
896 | + if (! $i) { |
|
897 | + $totalarray['nbfield']++; |
|
898 | + } |
|
873 | 899 | } |
874 | 900 | if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
875 | 901 | { |
876 | 902 | print '<td>'.$obj->organisator.'</td>'; |
877 | 903 | |
878 | - if (! $i) $totalarray['nbfield']++; |
|
904 | + if (! $i) { |
|
905 | + $totalarray['nbfield']++; |
|
906 | + } |
|
879 | 907 | } |
880 | 908 | if (! empty($arrayfields['t.is_facture']['checked'])) |
881 | 909 | { |
882 | 910 | $flight->is_facture = $obj->is_facture; |
883 | 911 | print '<td>'.$flight->getLibStatut(3).'</td>'; |
884 | 912 | |
885 | - if (! $i) $totalarray['nbfield']++; |
|
913 | + if (! $i) { |
|
914 | + $totalarray['nbfield']++; |
|
915 | + } |
|
886 | 916 | } |
887 | 917 | if (! empty($arrayfields['t.kilometers']['checked'])) |
888 | 918 | { |
889 | 919 | if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){ |
890 | 920 | print '<td>'.$obj->kilometers.' KM</td>'; |
891 | - }else{ |
|
921 | + } else{ |
|
892 | 922 | print '<td> - Km</td>'; |
893 | 923 | } |
894 | 924 | |
895 | - if (! $i) $totalarray['nbfield']++; |
|
925 | + if (! $i) { |
|
926 | + $totalarray['nbfield']++; |
|
927 | + } |
|
896 | 928 | } |
897 | 929 | if (! empty($arrayfields['t.cost']['checked'])) |
898 | 930 | { |
899 | 931 | if(($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) && $obj->cost > 0){ |
900 | 932 | print sprintf('<td>%s - (%s/pax)</td>', price($obj->cost, 0, $langs, 0, 0, -1, $conf->currency), price($obj->cost/$obj->nbrPax, 0, $langs, -1, -1, -1, $conf->currency)); |
901 | - }else{ |
|
933 | + } else{ |
|
902 | 934 | print '<td> - €</td>'; |
903 | 935 | } |
904 | 936 | |
905 | - if (! $i) $totalarray['nbfield']++; |
|
937 | + if (! $i) { |
|
938 | + $totalarray['nbfield']++; |
|
939 | + } |
|
906 | 940 | } |
907 | 941 | if (! empty($arrayfields['t.fk_receiver']['checked'])) |
908 | 942 | { |
909 | 943 | print '<td>'.$obj->receiver.'</td>'; |
910 | 944 | |
911 | - if (! $i) $totalarray['nbfield']++; |
|
945 | + if (! $i) { |
|
946 | + $totalarray['nbfield']++; |
|
947 | + } |
|
912 | 948 | } |
913 | 949 | if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
914 | 950 | { |
915 | 951 | print '<td>'.$obj->justif_kilometers.'</td>'; |
916 | 952 | |
917 | - if (! $i) $totalarray['nbfield']++; |
|
953 | + if (! $i) { |
|
954 | + $totalarray['nbfield']++; |
|
955 | + } |
|
918 | 956 | } |
919 | 957 | |
920 | 958 | // Extra fields |
@@ -962,9 +1000,11 @@ discard block |
||
962 | 1000 | |
963 | 1001 | // Action column |
964 | 1002 | print '<td class="nowrap" align="center">'; |
965 | - if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
1003 | + if ($massactionbutton || $massaction) { |
|
1004 | + // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
966 | 1005 | { |
967 | 1006 | $selected = 0; |
1007 | + } |
|
968 | 1008 | if (in_array($obj->idBBC_vols, $arrayofselected)) { |
969 | 1009 | $selected = 1; |
970 | 1010 | } |