Completed
Push — master ( 2d7571...84cfc6 )
by Laurent
02:00
created
generateExpenseNote.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -168,7 +168,7 @@
 block discarded – undo
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 {
Please login to merge, or discard this patch.
class/bbctypes.class.php 1 patch
Braces   +39 added lines, -13 removed lines patch added patch discarded remove patch
@@ -501,7 +501,9 @@  discard block
 block discarded – undo
501 501
         if ($withpicto)
502 502
         {
503 503
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
504
-            if ($withpicto != 2) $result.=' ';
504
+            if ($withpicto != 2) {
505
+                $result.=' ';
506
+            }
505 507
 		}
506 508
 		$result.= $link . $this->ref . $linkend;
507 509
 		return $result;
@@ -532,33 +534,57 @@  discard block
 block discarded – undo
532 534
 		if ($mode == 0)
533 535
 		{
534 536
 			$prefix='';
535
-			if ($status == 1) return $langs->trans('Enabled');
536
-			if ($status == 0) return $langs->trans('Disabled');
537
+			if ($status == 1) {
538
+			    return $langs->trans('Enabled');
539
+			}
540
+			if ($status == 0) {
541
+			    return $langs->trans('Disabled');
542
+			}
537 543
 		}
538 544
 		if ($mode == 1)
539 545
 		{
540
-			if ($status == 1) return $langs->trans('Enabled');
541
-			if ($status == 0) return $langs->trans('Disabled');
546
+			if ($status == 1) {
547
+			    return $langs->trans('Enabled');
548
+			}
549
+			if ($status == 0) {
550
+			    return $langs->trans('Disabled');
551
+			}
542 552
 		}
543 553
 		if ($mode == 2)
544 554
 		{
545
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
546
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
555
+			if ($status == 1) {
556
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
557
+			}
558
+			if ($status == 0) {
559
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
560
+			}
547 561
 		}
548 562
 		if ($mode == 3)
549 563
 		{
550
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
551
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
564
+			if ($status == 1) {
565
+			    return img_picto($langs->trans('Enabled'),'statut4');
566
+			}
567
+			if ($status == 0) {
568
+			    return img_picto($langs->trans('Disabled'),'statut5');
569
+			}
552 570
 		}
553 571
 		if ($mode == 4)
554 572
 		{
555
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
556
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
573
+			if ($status == 1) {
574
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
575
+			}
576
+			if ($status == 0) {
577
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
578
+			}
557 579
 		}
558 580
 		if ($mode == 5)
559 581
 		{
560
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
561
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
582
+			if ($status == 1) {
583
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
584
+			}
585
+			if ($status == 0) {
586
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
587
+			}
562 588
 		}
563 589
 
564 590
 		return "";
Please login to merge, or discard this patch.
generateBilling.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -613,9 +613,12 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
facture.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -338,9 +338,12 @@
 block discarded – undo
338 338
 
339 339
         <?php if (!$flightProduct) : ?>
340 340
             <a class="butActionRefused" href="#">Générer</a>
341
-        <?php else: ?>
341
+        <?php else {
342
+    : ?>
342 343
             <button class="butAction" type="submit">Générer</button>
343
-        <?php endif; ?>
344
+        <?php endif;
345
+}
346
+?>
344 347
 
345 348
         <a class="butAction" href="<?php echo DOL_URL_ROOT . '/flightlog/card.php?id=' . $flight->id; ?>">Retour au
346 349
             vol</a>
Please login to merge, or discard this patch.
card.php 1 patch
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -196,8 +196,7 @@
 block discarded – undo
196 196
                 $urltogo = $backtopage ? $backtopage : dol_buildpath('/flightlog/list.php', 1);
197 197
                 header("Location: " . $urltogo);
198 198
                 exit;
199
-            }
200
-            else{
199
+            } else{
201 200
                 // Creation KO
202 201
                 if (!empty($object->errors)) {
203 202
                     setEventMessages(null, $object->errors, 'errors');
Please login to merge, or discard this patch.
list.php 1 patch
Braces   +62 added lines, -22 removed lines patch added patch discarded remove patch
@@ -188,10 +188,12 @@  discard block
 block discarded – undo
188 188
     include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
189 189
 
190 190
     // Purge search criteria
191
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
191
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) {
192
+        // All tests are required to be compatible with all browsers
192 193
     {
193 194
 
194 195
         $search_idBBC_vols = '';
196
+    }
195 197
         $search_date = '';
196 198
         $search_lieuD = '';
197 199
         $search_lieuA = '';
@@ -798,7 +800,9 @@  discard block
 block discarded – undo
798 800
         {
799 801
             print '<td>'.$flight->getNomUrl(0).'</td>';
800 802
 
801
-            if (! $i) $totalarray['nbfield']++;
803
+            if (! $i) {
804
+                $totalarray['nbfield']++;
805
+            }
802 806
         }
803 807
         if (! empty($arrayfields['t.date']['checked']))
804 808
         {
@@ -806,112 +810,146 @@  discard block
 block discarded – undo
806 810
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
807 811
             print '</td>';
808 812
 
809
-            if (! $i) $totalarray['nbfield']++;
813
+            if (! $i) {
814
+                $totalarray['nbfield']++;
815
+            }
810 816
         }
811 817
         if (! empty($arrayfields['t.lieuD']['checked']))
812 818
         {
813 819
             print '<td>'.$obj->lieuD.'</td>';
814 820
 
815
-            if (! $i) $totalarray['nbfield']++;
821
+            if (! $i) {
822
+                $totalarray['nbfield']++;
823
+            }
816 824
         }
817 825
         if (! empty($arrayfields['t.lieuA']['checked']))
818 826
         {
819 827
             print '<td>'.$obj->lieuA.'</td>';
820 828
 
821
-            if (! $i) $totalarray['nbfield']++;
829
+            if (! $i) {
830
+                $totalarray['nbfield']++;
831
+            }
822 832
         }
823 833
         if (! empty($arrayfields['t.heureD']['checked']))
824 834
         {
825 835
             print '<td>'.$obj->heureD.'</td>';
826 836
 
827
-            if (! $i) $totalarray['nbfield']++;
837
+            if (! $i) {
838
+                $totalarray['nbfield']++;
839
+            }
828 840
         }
829 841
         if (! empty($arrayfields['t.heureA']['checked']))
830 842
         {
831 843
             print '<td>'.$obj->heureA.'</td>';
832 844
 
833
-            if (! $i) $totalarray['nbfield']++;
845
+            if (! $i) {
846
+                $totalarray['nbfield']++;
847
+            }
834 848
         }
835 849
         if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
836 850
         {
837 851
             print '<td>'.$obj->bal.'</td>';
838 852
 
839
-            if (! $i) $totalarray['nbfield']++;
853
+            if (! $i) {
854
+                $totalarray['nbfield']++;
855
+            }
840 856
         }
841 857
         if (! empty($arrayfields['t.nbrPax']['checked']))
842 858
         {
843 859
             print '<td>'.$obj->nbrPax.'</td>';
844 860
 
845
-            if (! $i) $totalarray['nbfield']++;
861
+            if (! $i) {
862
+                $totalarray['nbfield']++;
863
+            }
846 864
         }
847 865
         if (! empty($arrayfields['t.remarque']['checked']))
848 866
         {
849 867
             print '<td>'.$obj->remarque.'</td>';
850 868
 
851
-            if (! $i) $totalarray['nbfield']++;
869
+            if (! $i) {
870
+                $totalarray['nbfield']++;
871
+            }
852 872
         }
853 873
         if (! empty($arrayfields['t.incidents']['checked']))
854 874
         {
855 875
             print '<td>'.$obj->incidents.'</td>';
856 876
 
857
-            if (! $i) $totalarray['nbfield']++;
877
+            if (! $i) {
878
+                $totalarray['nbfield']++;
879
+            }
858 880
         }
859 881
         if (! empty($arrayfields['t.fk_type']['checked']))
860 882
         {
861 883
             print '<td>'.$obj->flight_type.'</td>';
862 884
 
863
-            if (! $i) $totalarray['nbfield']++;
885
+            if (! $i) {
886
+                $totalarray['nbfield']++;
887
+            }
864 888
         }
865 889
         if (! empty($arrayfields['t.fk_pilot']['checked']))
866 890
         {
867 891
             print '<td>'.$obj->pilot.'</td>';
868 892
 
869
-            if (! $i) $totalarray['nbfield']++;
893
+            if (! $i) {
894
+                $totalarray['nbfield']++;
895
+            }
870 896
         }
871 897
         if (! empty($arrayfields['t.fk_organisateur']['checked']))
872 898
         {
873 899
             print '<td>'.$obj->organisator.'</td>';
874 900
 
875
-            if (! $i) $totalarray['nbfield']++;
901
+            if (! $i) {
902
+                $totalarray['nbfield']++;
903
+            }
876 904
         }
877 905
         if (! empty($arrayfields['t.is_facture']['checked']))
878 906
         {
879 907
             $flight->is_facture = $obj->is_facture;
880 908
             print '<td>'.$flight->getLibStatut(3).'</td>';
881 909
 
882
-            if (! $i) $totalarray['nbfield']++;
910
+            if (! $i) {
911
+                $totalarray['nbfield']++;
912
+            }
883 913
         }
884 914
         if (! empty($arrayfields['t.kilometers']['checked']))
885 915
         {
886 916
             if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
887 917
                 print '<td>'.$obj->kilometers.' KM</td>';
888
-            }else{
918
+            } else{
889 919
                 print '<td> - Km</td>';
890 920
             }
891 921
 
892
-            if (! $i) $totalarray['nbfield']++;
922
+            if (! $i) {
923
+                $totalarray['nbfield']++;
924
+            }
893 925
         }
894 926
         if (! empty($arrayfields['t.cost']['checked']))
895 927
         {
896 928
             if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
897 929
                 print '<td>'.$obj->cost.'€</td>';
898
-            }else{
930
+            } else{
899 931
                 print '<td> - €</td>';
900 932
             }
901 933
 
902
-            if (! $i) $totalarray['nbfield']++;
934
+            if (! $i) {
935
+                $totalarray['nbfield']++;
936
+            }
903 937
         }
904 938
         if (! empty($arrayfields['t.fk_receiver']['checked']))
905 939
         {
906 940
             print '<td>'.$obj->receiver.'</td>';
907 941
 
908
-            if (! $i) $totalarray['nbfield']++;
942
+            if (! $i) {
943
+                $totalarray['nbfield']++;
944
+            }
909 945
         }
910 946
         if (! empty($arrayfields['t.justif_kilometers']['checked']))
911 947
         {
912 948
             print '<td>'.$obj->justif_kilometers.'</td>';
913 949
 
914
-            if (! $i) $totalarray['nbfield']++;
950
+            if (! $i) {
951
+                $totalarray['nbfield']++;
952
+            }
915 953
         }
916 954
 
917 955
         // Extra fields
@@ -959,9 +997,11 @@  discard block
 block discarded – undo
959 997
 
960 998
         // Action column
961 999
         print '<td class="nowrap" align="center">';
962
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
1000
+        if ($massactionbutton || $massaction) {
1001
+            // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
963 1002
         {
964 1003
             $selected = 0;
1004
+        }
965 1005
             if (in_array($obj->idBBC_vols, $arrayofselected)) {
966 1006
                 $selected = 1;
967 1007
             }
Please login to merge, or discard this patch.