Completed
Push — master ( 5bdd2e...0c75a4 )
by Laurent
09:56 queued 07:32
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.
list.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -136,12 +136,12 @@  discard block
 block discarded – undo
136 136
 
137 137
     //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
138 138
     't.datec'                     => array('label'    => $langs->trans("DateCreationShort"),
139
-                                           'checked'  => 0,
140
-                                           'position' => 500
139
+                                            'checked'  => 0,
140
+                                            'position' => 500
141 141
     ),
142 142
     't.tms'                       => array('label'    => $langs->trans("DateModificationShort"),
143
-                                           'checked'  => 0,
144
-                                           'position' => 500
143
+                                            'checked'  => 0,
144
+                                            'position' => 500
145 145
     ),
146 146
     //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
147 147
 );
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
150 150
     foreach ($extrafields->attribute_label as $key => $val) {
151 151
         $arrayfields["ef." . $key] = array('label'    => $extrafields->attribute_label[$key],
152
-                                           'checked'  => $extrafields->attribute_list[$key],
153
-                                           'position' => $extrafields->attribute_pos[$key],
154
-                                           'enabled'  => $extrafields->attribute_perms[$key]
152
+                                            'checked'  => $extrafields->attribute_list[$key],
153
+                                            'position' => $extrafields->attribute_pos[$key],
154
+                                            'enabled'  => $extrafields->attribute_perms[$key]
155 155
         );
156 156
     }
157 157
 }
Please login to merge, or discard this 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) && $obj->cost > 0){
897 929
                 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));
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.
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.
core/triggers/interface_50001_modFlightLog_mailOnIncident.class.php 1 patch
Indentation   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -26,58 +26,58 @@  discard block
 block discarded – undo
26 26
  */
27 27
 class InterfaceMailOnIncident extends DolibarrTriggers
28 28
 {
29
-	/**
30
-	 * @var DoliDB Database handler
31
-	 */
32
-	protected $db;
33
-
34
-	/**
35
-	 * Constructor
36
-	 *
37
-	 * @param DoliDB $db Database handler
38
-	 */
39
-	public function __construct($db)
40
-	{
41
-		$this->db = $db;
42
-
43
-		$this->name = preg_replace('/^Interface/i', '', get_class($this));
44
-		$this->family = "Belgian balloon club";
45
-		$this->description = "Trigger that send an e-mail on flight incident.";
46
-		$this->version = '1.0';
47
-		$this->picto = 'flightlog@flightlog';
48
-	}
49
-
50
-	/**
51
-	 * Trigger name
52
-	 *
53
-	 * @return string Name of trigger file
54
-	 */
55
-	public function getName()
56
-	{
57
-		return $this->name;
58
-	}
59
-
60
-	/**
61
-	 * Trigger description
62
-	 *
63
-	 * @return string Description of trigger file
64
-	 */
65
-	public function getDesc()
66
-	{
67
-		return $this->description;
68
-	}
69
-
70
-
71
-	/**
72
-	 * @param string 		$action 	Event action code
73
-	 * @param Bbcvols 	    $object 	Object
74
-	 * @param User 			$user 		Object user
75
-	 * @param Translate 	$langs 		Object langs
76
-	 * @param Conf 			$conf 		Object conf
77
-	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
78
-	 */
79
-	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
80
-	{
29
+    /**
30
+     * @var DoliDB Database handler
31
+     */
32
+    protected $db;
33
+
34
+    /**
35
+     * Constructor
36
+     *
37
+     * @param DoliDB $db Database handler
38
+     */
39
+    public function __construct($db)
40
+    {
41
+        $this->db = $db;
42
+
43
+        $this->name = preg_replace('/^Interface/i', '', get_class($this));
44
+        $this->family = "Belgian balloon club";
45
+        $this->description = "Trigger that send an e-mail on flight incident.";
46
+        $this->version = '1.0';
47
+        $this->picto = 'flightlog@flightlog';
48
+    }
49
+
50
+    /**
51
+     * Trigger name
52
+     *
53
+     * @return string Name of trigger file
54
+     */
55
+    public function getName()
56
+    {
57
+        return $this->name;
58
+    }
59
+
60
+    /**
61
+     * Trigger description
62
+     *
63
+     * @return string Description of trigger file
64
+     */
65
+    public function getDesc()
66
+    {
67
+        return $this->description;
68
+    }
69
+
70
+
71
+    /**
72
+     * @param string 		$action 	Event action code
73
+     * @param Bbcvols 	    $object 	Object
74
+     * @param User 			$user 		Object user
75
+     * @param Translate 	$langs 		Object langs
76
+     * @param Conf 			$conf 		Object conf
77
+     * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
78
+     */
79
+    public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
80
+    {
81 81
         if (empty($conf->flightlog->enabled) || empty($conf->workflow->enabled)){
82 82
             return 0;
83 83
         }
@@ -132,6 +132,6 @@  discard block
 block discarded – undo
132 132
             dol_syslog("Error while sending mail in flight log module : incident", LOG_ERR);
133 133
         }
134 134
 
135
-		return 0;
136
-	}
135
+        return 0;
136
+    }
137 137
 }
Please login to merge, or discard this patch.
facture.php 1 patch
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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>
Please login to merge, or discard this patch.
generateMonthlyBilling.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -239,9 +239,12 @@
 block discarded – undo
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>
Please login to merge, or discard this patch.