@@ -61,8 +61,8 @@ |
||
61 | 61 | $form = new Form($db); |
62 | 62 | print '<!-- debut cartouche rapport --> |
63 | 63 | <div class="tabs"> |
64 | - <a id="'.($viewSelection == 1 ? 'active' : '').'" class="tab" href="listFact.php?view=1">Facturation</a> |
|
65 | - <a id="'.($viewSelection == 2 ? 'active' : '').'" class="tab" href="listFact.php?view=2">AVIABEL</a> |
|
64 | + <a id="'.($viewSelection == 1 ? 'active' : '') . '" class="tab" href="listFact.php?view=1">Facturation</a> |
|
65 | + <a id="'.($viewSelection == 2 ? 'active' : '') . '" class="tab" href="listFact.php?view=2">AVIABEL</a> |
|
66 | 66 | </div>'; |
67 | 67 | print '<div class="tabBar">'; |
68 | 68 | print "<form name='listFact' action=\"listFact.php\" method=\"get\">\n"; |
@@ -81,9 +81,9 @@ discard block |
||
81 | 81 | |
82 | 82 | $missions = bbcKilometersByQuartil($year); |
83 | 83 | |
84 | - foreach($missions as $currentMissionUserId => $currentMission){ |
|
84 | + foreach ($missions as $currentMissionUserId => $currentMission) { |
|
85 | 85 | |
86 | - if($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0){ |
|
86 | + if ($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0) { |
|
87 | 87 | continue; |
88 | 88 | } |
89 | 89 | |
@@ -97,18 +97,18 @@ discard block |
||
97 | 97 | $object->fk_statut = 1; |
98 | 98 | $object->fk_user_validator = GETPOST("fk_user_validator", 'int'); |
99 | 99 | $object->note_public = GETPOST('public_note', 'alpha'); |
100 | - $object->note_private = GETPOST('private_note','alpha'); |
|
100 | + $object->note_private = GETPOST('private_note', 'alpha'); |
|
101 | 101 | |
102 | 102 | $expenseNoteId = $object->create($expenseNoteUser); |
103 | - if($expenseNoteId < 0){ |
|
104 | - dol_htmloutput_errors("Erreur lors de la création de la note de frais" , $object->errors); |
|
103 | + if ($expenseNoteId < 0) { |
|
104 | + dol_htmloutput_errors("Erreur lors de la création de la note de frais", $object->errors); |
|
105 | 105 | continue; |
106 | 106 | } |
107 | 107 | |
108 | 108 | |
109 | 109 | $flightsForQuarter = findFlightByPilotAndQuarter($currentMissionUserId, $year, $quarter); |
110 | 110 | |
111 | - foreach($flightsForQuarter as $currentFlightForQuarter) { |
|
111 | + foreach ($flightsForQuarter as $currentFlightForQuarter) { |
|
112 | 112 | |
113 | 113 | // Kilometers |
114 | 114 | $object_ligne = new ExpenseReportLine($db); |
@@ -168,7 +168,7 @@ discard block |
||
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 { |
@@ -187,15 +187,15 @@ discard block |
||
187 | 187 | $form = new Form($db); |
188 | 188 | |
189 | 189 | $tabLinks = []; |
190 | -foreach($flightYears as $currentFlightYear){ |
|
190 | +foreach ($flightYears as $currentFlightYear) { |
|
191 | 191 | $tabLinks[] = [ |
192 | - DOL_URL_ROOT."/flightLog/generateExpenseNote.php?year=".$currentFlightYear, |
|
192 | + DOL_URL_ROOT . "/flightLog/generateExpenseNote.php?year=" . $currentFlightYear, |
|
193 | 193 | $currentFlightYear, |
194 | - "tab_".$currentFlightYear |
|
194 | + "tab_" . $currentFlightYear |
|
195 | 195 | ]; |
196 | 196 | } |
197 | 197 | |
198 | -dol_fiche_head($tabLinks, "tab_".$year); |
|
198 | +dol_fiche_head($tabLinks, "tab_" . $year); |
|
199 | 199 | |
200 | 200 | ?> |
201 | 201 | <form method="POST"> |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | <select name="quarter" id="field_quarter"> |
212 | 212 | <option value="1" <?= ($year == $currentYear && $currentQuarter <= 1) ? 'disabled="disabled"' : "" ?>>1</option> |
213 | 213 | <option value="2" <?= ($year == $currentYear && $currentQuarter <= 2) ? 'disabled="disabled"' : "" ?>>2</option> |
214 | - <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"': "" ?>>3</option> |
|
214 | + <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"' : "" ?>>3</option> |
|
215 | 215 | <option value="4" <?= ($year == $currentYear && $currentQuarter <= 4) ? 'disabled="disabled"' : "" ?>>4</option> |
216 | 216 | </select> |
217 | 217 | <br/> |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | <label><?= $langs->trans("Validateur de la note de frais")?></label><br/> |
221 | 221 | <?php |
222 | 222 | $include_users = $object->fetch_users_approver_expensereport(); |
223 | - print $form->select_dolusers($user->id,"fk_user_validator",1,"",0,$include_users); |
|
223 | + print $form->select_dolusers($user->id, "fk_user_validator", 1, "", 0, $include_users); |
|
224 | 224 | ?> |
225 | 225 | <br/> |
226 | 226 |
@@ -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 { |
@@ -69,7 +69,7 @@ |
||
69 | 69 | $result = [$this->year]; |
70 | 70 | |
71 | 71 | foreach ($this->graphData as $typeId => $data) { |
72 | - if(!in_array($typeId, [1,2,3,6])){ |
|
72 | + if (!in_array($typeId, [1, 2, 3, 6])) { |
|
73 | 73 | continue; |
74 | 74 | } |
75 | 75 |
@@ -36,14 +36,14 @@ |
||
36 | 36 | /** |
37 | 37 | * @param GraphicalValue $value |
38 | 38 | */ |
39 | - public function addValue(GraphicalValue $value){ |
|
39 | + public function addValue(GraphicalValue $value) { |
|
40 | 40 | $this->counter = $this->counter->add($value); |
41 | 41 | } |
42 | 42 | |
43 | 43 | /** |
44 | 44 | * @return int |
45 | 45 | */ |
46 | - public function getValue(){ |
|
46 | + public function getValue() { |
|
47 | 47 | return $this->counter->getValue(); |
48 | 48 | } |
49 | 49 |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | */ |
41 | 41 | public function addValue($year, GraphicalValue $value) |
42 | 42 | { |
43 | - if(!isset($this->data[$year])){ |
|
43 | + if (!isset($this->data[$year])) { |
|
44 | 44 | throw new \Exception("Year is not defined"); |
45 | 45 | } |
46 | 46 | |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | { |
55 | 55 | $result = []; |
56 | 56 | |
57 | - foreach($this->data as $year){ |
|
57 | + foreach ($this->data as $year) { |
|
58 | 58 | $result[] = $year->export(); |
59 | 59 | } |
60 | 60 |
@@ -136,12 +136,12 @@ discard block |
||
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 |
||
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 | } |
@@ -189,10 +189,12 @@ discard block |
||
189 | 189 | include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php'; |
190 | 190 | |
191 | 191 | // Purge search criteria |
192 | - if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers |
|
192 | + if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) { |
|
193 | + // All tests are required to be compatible with all browsers |
|
193 | 194 | { |
194 | 195 | |
195 | 196 | $search_idBBC_vols = ''; |
197 | + } |
|
196 | 198 | $search_date = ''; |
197 | 199 | $search_lieuD = ''; |
198 | 200 | $search_lieuA = ''; |
@@ -756,7 +758,9 @@ discard block |
||
756 | 758 | { |
757 | 759 | print '<td>'.$flight->getNomUrl(0).'</td>'; |
758 | 760 | |
759 | - if (! $i) $totalarray['nbfield']++; |
|
761 | + if (! $i) { |
|
762 | + $totalarray['nbfield']++; |
|
763 | + } |
|
760 | 764 | } |
761 | 765 | if (! empty($arrayfields['t.date']['checked'])) |
762 | 766 | { |
@@ -764,104 +768,138 @@ discard block |
||
764 | 768 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
765 | 769 | print '</td>'; |
766 | 770 | |
767 | - if (! $i) $totalarray['nbfield']++; |
|
771 | + if (! $i) { |
|
772 | + $totalarray['nbfield']++; |
|
773 | + } |
|
768 | 774 | } |
769 | 775 | if (! empty($arrayfields['t.lieuD']['checked'])) |
770 | 776 | { |
771 | 777 | print '<td>'.$obj->lieuD.'</td>'; |
772 | 778 | |
773 | - if (! $i) $totalarray['nbfield']++; |
|
779 | + if (! $i) { |
|
780 | + $totalarray['nbfield']++; |
|
781 | + } |
|
774 | 782 | } |
775 | 783 | if (! empty($arrayfields['t.lieuA']['checked'])) |
776 | 784 | { |
777 | 785 | print '<td>'.$obj->lieuA.'</td>'; |
778 | 786 | |
779 | - if (! $i) $totalarray['nbfield']++; |
|
787 | + if (! $i) { |
|
788 | + $totalarray['nbfield']++; |
|
789 | + } |
|
780 | 790 | } |
781 | 791 | if (! empty($arrayfields['t.heureD']['checked'])) |
782 | 792 | { |
783 | 793 | print '<td>'.$obj->heureD.'</td>'; |
784 | 794 | |
785 | - if (! $i) $totalarray['nbfield']++; |
|
795 | + if (! $i) { |
|
796 | + $totalarray['nbfield']++; |
|
797 | + } |
|
786 | 798 | } |
787 | 799 | if (! empty($arrayfields['t.heureA']['checked'])) |
788 | 800 | { |
789 | 801 | print '<td>'.$obj->heureA.'</td>'; |
790 | 802 | |
791 | - if (! $i) $totalarray['nbfield']++; |
|
803 | + if (! $i) { |
|
804 | + $totalarray['nbfield']++; |
|
805 | + } |
|
792 | 806 | } |
793 | 807 | if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
794 | 808 | { |
795 | 809 | print '<td>'.$obj->bal.'</td>'; |
796 | 810 | |
797 | - if (! $i) $totalarray['nbfield']++; |
|
811 | + if (! $i) { |
|
812 | + $totalarray['nbfield']++; |
|
813 | + } |
|
798 | 814 | } |
799 | 815 | if (! empty($arrayfields['t.nbrPax']['checked'])) |
800 | 816 | { |
801 | 817 | print '<td>'.$obj->nbrPax.'</td>'; |
802 | 818 | |
803 | - if (! $i) $totalarray['nbfield']++; |
|
819 | + if (! $i) { |
|
820 | + $totalarray['nbfield']++; |
|
821 | + } |
|
804 | 822 | } |
805 | 823 | if (! empty($arrayfields['t.remarque']['checked'])) |
806 | 824 | { |
807 | 825 | print '<td>'.$obj->remarque.'</td>'; |
808 | 826 | |
809 | - if (! $i) $totalarray['nbfield']++; |
|
827 | + if (! $i) { |
|
828 | + $totalarray['nbfield']++; |
|
829 | + } |
|
810 | 830 | } |
811 | 831 | if (! empty($arrayfields['t.incidents']['checked'])) |
812 | 832 | { |
813 | 833 | print '<td>'.$obj->incidents.'</td>'; |
814 | 834 | |
815 | - if (! $i) $totalarray['nbfield']++; |
|
835 | + if (! $i) { |
|
836 | + $totalarray['nbfield']++; |
|
837 | + } |
|
816 | 838 | } |
817 | 839 | if (! empty($arrayfields['t.fk_type']['checked'])) |
818 | 840 | { |
819 | 841 | print '<td>'.$obj->flight_type.'</td>'; |
820 | 842 | |
821 | - if (! $i) $totalarray['nbfield']++; |
|
843 | + if (! $i) { |
|
844 | + $totalarray['nbfield']++; |
|
845 | + } |
|
822 | 846 | } |
823 | 847 | if (! empty($arrayfields['t.fk_pilot']['checked'])) |
824 | 848 | { |
825 | 849 | print '<td>'.$obj->pilot.'</td>'; |
826 | 850 | |
827 | - if (! $i) $totalarray['nbfield']++; |
|
851 | + if (! $i) { |
|
852 | + $totalarray['nbfield']++; |
|
853 | + } |
|
828 | 854 | } |
829 | 855 | if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
830 | 856 | { |
831 | 857 | print '<td>'.$obj->organisator.'</td>'; |
832 | 858 | |
833 | - if (! $i) $totalarray['nbfield']++; |
|
859 | + if (! $i) { |
|
860 | + $totalarray['nbfield']++; |
|
861 | + } |
|
834 | 862 | } |
835 | 863 | if (! empty($arrayfields['t.is_facture']['checked'])) |
836 | 864 | { |
837 | 865 | $flight->is_facture = $obj->is_facture; |
838 | 866 | print '<td>'.$flight->getLibStatut(3).'</td>'; |
839 | 867 | |
840 | - if (! $i) $totalarray['nbfield']++; |
|
868 | + if (! $i) { |
|
869 | + $totalarray['nbfield']++; |
|
870 | + } |
|
841 | 871 | } |
842 | 872 | if (! empty($arrayfields['t.kilometers']['checked'])) |
843 | 873 | { |
844 | 874 | print '<td>'.$obj->kilometers.'</td>'; |
845 | 875 | |
846 | - if (! $i) $totalarray['nbfield']++; |
|
876 | + if (! $i) { |
|
877 | + $totalarray['nbfield']++; |
|
878 | + } |
|
847 | 879 | } |
848 | 880 | if (! empty($arrayfields['t.cost']['checked'])) |
849 | 881 | { |
850 | 882 | print '<td>'.$obj->cost.'</td>'; |
851 | 883 | |
852 | - if (! $i) $totalarray['nbfield']++; |
|
884 | + if (! $i) { |
|
885 | + $totalarray['nbfield']++; |
|
886 | + } |
|
853 | 887 | } |
854 | 888 | if (! empty($arrayfields['t.fk_receiver']['checked'])) |
855 | 889 | { |
856 | 890 | print '<td>'.$obj->receiver.'</td>'; |
857 | 891 | |
858 | - if (! $i) $totalarray['nbfield']++; |
|
892 | + if (! $i) { |
|
893 | + $totalarray['nbfield']++; |
|
894 | + } |
|
859 | 895 | } |
860 | 896 | if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
861 | 897 | { |
862 | 898 | print '<td>'.$obj->justif_kilometers.'</td>'; |
863 | 899 | |
864 | - if (! $i) $totalarray['nbfield']++; |
|
900 | + if (! $i) { |
|
901 | + $totalarray['nbfield']++; |
|
902 | + } |
|
865 | 903 | } |
866 | 904 | |
867 | 905 | // Extra fields |
@@ -916,9 +954,11 @@ discard block |
||
916 | 954 | |
917 | 955 | // Action column |
918 | 956 | print '<td class="nowrap" align="center">'; |
919 | - if ($massactionbutton || $massaction) // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
957 | + if ($massactionbutton || $massaction) { |
|
958 | + // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined |
|
920 | 959 | { |
921 | 960 | $selected = 0; |
961 | + } |
|
922 | 962 | if (in_array($obj->idBBC_vols, $arrayofselected)) { |
923 | 963 | $selected = 1; |
924 | 964 | } |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | |
179 | 179 | $parameters = array(); |
180 | 180 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
181 | - $action); // Note that $action and $object may have been modified by some hooks |
|
181 | + $action); // Note that $action and $object may have been modified by some hooks |
|
182 | 182 | if ($reshook < 0) { |
183 | 183 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
184 | 184 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | // Add fields from hooks |
291 | 291 | $parameters = array(); |
292 | 292 | $reshook = $hookmanager->executeHooks('printFieldListSelect', |
293 | - $parameters); // Note that $action and $object may have been modified by hook |
|
293 | + $parameters); // Note that $action and $object may have been modified by hook |
|
294 | 294 | $sql .= $hookmanager->resPrint; |
295 | 295 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; |
296 | 296 | if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { |
@@ -380,7 +380,7 @@ discard block |
||
380 | 380 | // Add where from hooks |
381 | 381 | $parameters = array(); |
382 | 382 | $reshook = $hookmanager->executeHooks('printFieldListWhere', |
383 | - $parameters); // Note that $action and $object may have been modified by hook |
|
383 | + $parameters); // Note that $action and $object may have been modified by hook |
|
384 | 384 | $sql .= $hookmanager->resPrint; |
385 | 385 | $sql .= $db->order($sortfield, $sortorder); |
386 | 386 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); |
@@ -422,58 +422,58 @@ discard block |
||
422 | 422 | if ($limit > 0 && $limit != $conf->liste_limit) { |
423 | 423 | $param .= '&limit=' . $limit; |
424 | 424 | } |
425 | -if ($search_idBBC_vols != '') { |
|
425 | +if ($search_idBBC_vols != '') { |
|
426 | 426 | $param .= '&search_idBBC_vols=' . urlencode($search_idBBC_vols); |
427 | 427 | } |
428 | -if ($search_date != '') { |
|
428 | +if ($search_date != '') { |
|
429 | 429 | $param .= '&search_date=' . urlencode($search_date); |
430 | 430 | } |
431 | -if ($search_lieuD != '') { |
|
431 | +if ($search_lieuD != '') { |
|
432 | 432 | $param .= '&search_lieuD=' . urlencode($search_lieuD); |
433 | 433 | } |
434 | -if ($search_lieuA != '') { |
|
434 | +if ($search_lieuA != '') { |
|
435 | 435 | $param .= '&search_lieuA=' . urlencode($search_lieuA); |
436 | 436 | } |
437 | -if ($search_heureD != '') { |
|
437 | +if ($search_heureD != '') { |
|
438 | 438 | $param .= '&search_heureD=' . urlencode($search_heureD); |
439 | 439 | } |
440 | -if ($search_heureA != '') { |
|
440 | +if ($search_heureA != '') { |
|
441 | 441 | $param .= '&search_heureA=' . urlencode($search_heureA); |
442 | 442 | } |
443 | -if ($search_BBC_ballons_idBBC_ballons != '') { |
|
443 | +if ($search_BBC_ballons_idBBC_ballons != '') { |
|
444 | 444 | $param .= '&search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons); |
445 | 445 | } |
446 | -if ($search_nbrPax != '') { |
|
446 | +if ($search_nbrPax != '') { |
|
447 | 447 | $param .= '&search_nbrPax=' . urlencode($search_nbrPax); |
448 | 448 | } |
449 | -if ($search_remarque != '') { |
|
449 | +if ($search_remarque != '') { |
|
450 | 450 | $param .= '&search_remarque=' . urlencode($search_remarque); |
451 | 451 | } |
452 | -if ($search_incidents != '') { |
|
452 | +if ($search_incidents != '') { |
|
453 | 453 | $param .= '&search_incidents=' . urlencode($search_incidents); |
454 | 454 | } |
455 | -if ($search_fk_type != '') { |
|
455 | +if ($search_fk_type != '') { |
|
456 | 456 | $param .= '&search_fk_type=' . urlencode($search_fk_type); |
457 | 457 | } |
458 | 458 | if ($search_fk_pilot != '') { |
459 | 459 | $param .= '&search_fk_pilot=' . urlencode($search_fk_pilot); |
460 | 460 | } |
461 | -if ($search_fk_organisateur != '') { |
|
461 | +if ($search_fk_organisateur != '') { |
|
462 | 462 | $param .= '&search_fk_organisateur=' . urlencode($search_fk_organisateur); |
463 | 463 | } |
464 | -if ($search_is_facture != '') { |
|
464 | +if ($search_is_facture != '') { |
|
465 | 465 | $param .= '&search_is_facture=' . urlencode($search_is_facture); |
466 | 466 | } |
467 | -if ($search_kilometers != '') { |
|
467 | +if ($search_kilometers != '') { |
|
468 | 468 | $param .= '&search_kilometers=' . urlencode($search_kilometers); |
469 | 469 | } |
470 | -if ($search_cost != '') { |
|
470 | +if ($search_cost != '') { |
|
471 | 471 | $param .= '&search_cost=' . urlencode($search_cost); |
472 | 472 | } |
473 | -if ($search_fk_receiver != '') { |
|
473 | +if ($search_fk_receiver != '') { |
|
474 | 474 | $param .= '&search_fk_receiver=' . urlencode($search_fk_receiver); |
475 | 475 | } |
476 | -if ($search_justif_kilometers != '') { |
|
476 | +if ($search_justif_kilometers != '') { |
|
477 | 477 | $param .= '&search_justif_kilometers=' . urlencode($search_justif_kilometers); |
478 | 478 | } |
479 | 479 | |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | |
530 | 530 | $parameters = array(); |
531 | 531 | $reshook = $hookmanager->executeHooks('printFieldPreListTitle', |
532 | - $parameters); // Note that $action and $object may have been modified by hook |
|
532 | + $parameters); // Note that $action and $object may have been modified by hook |
|
533 | 533 | if (empty($reshook)) { |
534 | 534 | $moreforfilter .= $hookmanager->resPrint; |
535 | 535 | } else { |
@@ -544,7 +544,7 @@ discard block |
||
544 | 544 | |
545 | 545 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; |
546 | 546 | $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, |
547 | - $varpage); // This also change content of $arrayfields |
|
547 | + $varpage); // This also change content of $arrayfields |
|
548 | 548 | |
549 | 549 | print '<div class="div-table-responsive">'; |
550 | 550 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; |
@@ -639,7 +639,7 @@ discard block |
||
639 | 639 | // Hook fields |
640 | 640 | $parameters = array('arrayfields' => $arrayfields); |
641 | 641 | $reshook = $hookmanager->executeHooks('printFieldListTitle', |
642 | - $parameters); // Note that $action and $object may have been modified by hook |
|
642 | + $parameters); // Note that $action and $object may have been modified by hook |
|
643 | 643 | print $hookmanager->resPrint; |
644 | 644 | if (!empty($arrayfields['t.datec']['checked'])) { |
645 | 645 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, |
@@ -753,7 +753,7 @@ discard block |
||
753 | 753 | // Fields from hook |
754 | 754 | $parameters = array('arrayfields' => $arrayfields); |
755 | 755 | $reshook = $hookmanager->executeHooks('printFieldListOption', |
756 | - $parameters); // Note that $action and $object may have been modified by hook |
|
756 | + $parameters); // Note that $action and $object may have been modified by hook |
|
757 | 757 | print $hookmanager->resPrint; |
758 | 758 | if (!empty($arrayfields['t.datec']['checked'])) { |
759 | 759 | // Date creation |
@@ -794,116 +794,116 @@ discard block |
||
794 | 794 | // Show here line of result |
795 | 795 | print '<tr ' . $bc[$var] . '>'; |
796 | 796 | |
797 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) |
|
797 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) |
|
798 | 798 | { |
799 | - print '<td>'.$flight->getNomUrl(0).'</td>'; |
|
799 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; |
|
800 | 800 | |
801 | - if (! $i) $totalarray['nbfield']++; |
|
801 | + if (!$i) $totalarray['nbfield']++; |
|
802 | 802 | } |
803 | - if (! empty($arrayfields['t.date']['checked'])) |
|
803 | + if (!empty($arrayfields['t.date']['checked'])) |
|
804 | 804 | { |
805 | 805 | print '<td>'; |
806 | 806 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); |
807 | 807 | print '</td>'; |
808 | 808 | |
809 | - if (! $i) $totalarray['nbfield']++; |
|
809 | + if (!$i) $totalarray['nbfield']++; |
|
810 | 810 | } |
811 | - if (! empty($arrayfields['t.lieuD']['checked'])) |
|
811 | + if (!empty($arrayfields['t.lieuD']['checked'])) |
|
812 | 812 | { |
813 | - print '<td>'.$obj->lieuD.'</td>'; |
|
813 | + print '<td>' . $obj->lieuD . '</td>'; |
|
814 | 814 | |
815 | - if (! $i) $totalarray['nbfield']++; |
|
815 | + if (!$i) $totalarray['nbfield']++; |
|
816 | 816 | } |
817 | - if (! empty($arrayfields['t.lieuA']['checked'])) |
|
817 | + if (!empty($arrayfields['t.lieuA']['checked'])) |
|
818 | 818 | { |
819 | - print '<td>'.$obj->lieuA.'</td>'; |
|
819 | + print '<td>' . $obj->lieuA . '</td>'; |
|
820 | 820 | |
821 | - if (! $i) $totalarray['nbfield']++; |
|
821 | + if (!$i) $totalarray['nbfield']++; |
|
822 | 822 | } |
823 | - if (! empty($arrayfields['t.heureD']['checked'])) |
|
823 | + if (!empty($arrayfields['t.heureD']['checked'])) |
|
824 | 824 | { |
825 | - print '<td>'.$obj->heureD.'</td>'; |
|
825 | + print '<td>' . $obj->heureD . '</td>'; |
|
826 | 826 | |
827 | - if (! $i) $totalarray['nbfield']++; |
|
827 | + if (!$i) $totalarray['nbfield']++; |
|
828 | 828 | } |
829 | - if (! empty($arrayfields['t.heureA']['checked'])) |
|
829 | + if (!empty($arrayfields['t.heureA']['checked'])) |
|
830 | 830 | { |
831 | - print '<td>'.$obj->heureA.'</td>'; |
|
831 | + print '<td>' . $obj->heureA . '</td>'; |
|
832 | 832 | |
833 | - if (! $i) $totalarray['nbfield']++; |
|
833 | + if (!$i) $totalarray['nbfield']++; |
|
834 | 834 | } |
835 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
835 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) |
|
836 | 836 | { |
837 | - print '<td>'.$obj->bal.'</td>'; |
|
837 | + print '<td>' . $obj->bal . '</td>'; |
|
838 | 838 | |
839 | - if (! $i) $totalarray['nbfield']++; |
|
839 | + if (!$i) $totalarray['nbfield']++; |
|
840 | 840 | } |
841 | - if (! empty($arrayfields['t.nbrPax']['checked'])) |
|
841 | + if (!empty($arrayfields['t.nbrPax']['checked'])) |
|
842 | 842 | { |
843 | - print '<td>'.$obj->nbrPax.'</td>'; |
|
843 | + print '<td>' . $obj->nbrPax . '</td>'; |
|
844 | 844 | |
845 | - if (! $i) $totalarray['nbfield']++; |
|
845 | + if (!$i) $totalarray['nbfield']++; |
|
846 | 846 | } |
847 | - if (! empty($arrayfields['t.remarque']['checked'])) |
|
847 | + if (!empty($arrayfields['t.remarque']['checked'])) |
|
848 | 848 | { |
849 | - print '<td>'.$obj->remarque.'</td>'; |
|
849 | + print '<td>' . $obj->remarque . '</td>'; |
|
850 | 850 | |
851 | - if (! $i) $totalarray['nbfield']++; |
|
851 | + if (!$i) $totalarray['nbfield']++; |
|
852 | 852 | } |
853 | - if (! empty($arrayfields['t.incidents']['checked'])) |
|
853 | + if (!empty($arrayfields['t.incidents']['checked'])) |
|
854 | 854 | { |
855 | - print '<td>'.$obj->incidents.'</td>'; |
|
855 | + print '<td>' . $obj->incidents . '</td>'; |
|
856 | 856 | |
857 | - if (! $i) $totalarray['nbfield']++; |
|
857 | + if (!$i) $totalarray['nbfield']++; |
|
858 | 858 | } |
859 | - if (! empty($arrayfields['t.fk_type']['checked'])) |
|
859 | + if (!empty($arrayfields['t.fk_type']['checked'])) |
|
860 | 860 | { |
861 | - print '<td>'.$obj->flight_type.'</td>'; |
|
861 | + print '<td>' . $obj->flight_type . '</td>'; |
|
862 | 862 | |
863 | - if (! $i) $totalarray['nbfield']++; |
|
863 | + if (!$i) $totalarray['nbfield']++; |
|
864 | 864 | } |
865 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) |
|
865 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) |
|
866 | 866 | { |
867 | - print '<td>'.$obj->pilot.'</td>'; |
|
867 | + print '<td>' . $obj->pilot . '</td>'; |
|
868 | 868 | |
869 | - if (! $i) $totalarray['nbfield']++; |
|
869 | + if (!$i) $totalarray['nbfield']++; |
|
870 | 870 | } |
871 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) |
|
871 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) |
|
872 | 872 | { |
873 | - print '<td>'.$obj->organisator.'</td>'; |
|
873 | + print '<td>' . $obj->organisator . '</td>'; |
|
874 | 874 | |
875 | - if (! $i) $totalarray['nbfield']++; |
|
875 | + if (!$i) $totalarray['nbfield']++; |
|
876 | 876 | } |
877 | - if (! empty($arrayfields['t.is_facture']['checked'])) |
|
877 | + if (!empty($arrayfields['t.is_facture']['checked'])) |
|
878 | 878 | { |
879 | 879 | $flight->is_facture = $obj->is_facture; |
880 | - print '<td>'.$flight->getLibStatut(3).'</td>'; |
|
880 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; |
|
881 | 881 | |
882 | - if (! $i) $totalarray['nbfield']++; |
|
882 | + if (!$i) $totalarray['nbfield']++; |
|
883 | 883 | } |
884 | - if (! empty($arrayfields['t.kilometers']['checked'])) |
|
884 | + if (!empty($arrayfields['t.kilometers']['checked'])) |
|
885 | 885 | { |
886 | - print '<td>'.$obj->kilometers.'</td>'; |
|
886 | + print '<td>' . $obj->kilometers . '</td>'; |
|
887 | 887 | |
888 | - if (! $i) $totalarray['nbfield']++; |
|
888 | + if (!$i) $totalarray['nbfield']++; |
|
889 | 889 | } |
890 | - if (! empty($arrayfields['t.cost']['checked'])) |
|
890 | + if (!empty($arrayfields['t.cost']['checked'])) |
|
891 | 891 | { |
892 | - print '<td>'.$obj->cost.'</td>'; |
|
892 | + print '<td>' . $obj->cost . '</td>'; |
|
893 | 893 | |
894 | - if (! $i) $totalarray['nbfield']++; |
|
894 | + if (!$i) $totalarray['nbfield']++; |
|
895 | 895 | } |
896 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) |
|
896 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) |
|
897 | 897 | { |
898 | - print '<td>'.$obj->receiver.'</td>'; |
|
898 | + print '<td>' . $obj->receiver . '</td>'; |
|
899 | 899 | |
900 | - if (! $i) $totalarray['nbfield']++; |
|
900 | + if (!$i) $totalarray['nbfield']++; |
|
901 | 901 | } |
902 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) |
|
902 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) |
|
903 | 903 | { |
904 | - print '<td>'.$obj->justif_kilometers.'</td>'; |
|
904 | + print '<td>' . $obj->justif_kilometers . '</td>'; |
|
905 | 905 | |
906 | - if (! $i) $totalarray['nbfield']++; |
|
906 | + if (!$i) $totalarray['nbfield']++; |
|
907 | 907 | } |
908 | 908 | |
909 | 909 | // Extra fields |
@@ -928,7 +928,7 @@ discard block |
||
928 | 928 | // Fields from hook |
929 | 929 | $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); |
930 | 930 | $reshook = $hookmanager->executeHooks('printFieldListValue', |
931 | - $parameters); // Note that $action and $object may have been modified by hook |
|
931 | + $parameters); // Note that $action and $object may have been modified by hook |
|
932 | 932 | print $hookmanager->resPrint; |
933 | 933 | // Date creation |
934 | 934 | if (!empty($arrayfields['t.datec']['checked'])) { |
@@ -1005,7 +1005,7 @@ discard block |
||
1005 | 1005 | |
1006 | 1006 | $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); |
1007 | 1007 | $reshook = $hookmanager->executeHooks('printFieldListFooter', |
1008 | - $parameters); // Note that $action and $object may have been modified by hook |
|
1008 | + $parameters); // Note that $action and $object may have been modified by hook |
|
1009 | 1009 | print $hookmanager->resPrint; |
1010 | 1010 | |
1011 | 1011 | print '</table>' . "\n"; |
@@ -430,7 +430,7 @@ discard block |
||
430 | 430 | */ |
431 | 431 | private function initPermissions() |
432 | 432 | { |
433 | - $this->rights = array(); // Permission array used by this module |
|
433 | + $this->rights = array(); // Permission array used by this module |
|
434 | 434 | $r = 0; |
435 | 435 | |
436 | 436 | $this->rights[$r][0] = 9993; |
@@ -485,7 +485,7 @@ discard block |
||
485 | 485 | |
486 | 486 | private function initCronJobs() |
487 | 487 | { |
488 | - $this->cronjobs = array(); // List of cron jobs entries to add |
|
488 | + $this->cronjobs = array(); // List of cron jobs entries to add |
|
489 | 489 | // Example: $this->cronjobs=array(0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'test'=>true), |
490 | 490 | // 1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'test'=>true) |
491 | 491 | // ); |
@@ -152,7 +152,7 @@ |
||
152 | 152 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 1 : Sponsor") . '</td>'; |
153 | 153 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 2 : Baptême") . '</td>'; |
154 | 154 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Organisateur (T1/T2)") . '</td>'; |
155 | - print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
155 | + print '<td class="liste_titre" >' . $langs->trans("Total bonus") . '</td>'; |
|
156 | 156 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 3 : Privé") . '</td>'; |
157 | 157 | print '<td class="liste_titre" colspan="2">' . $langs->trans("Type 4: Meeting") . '</td>'; |
158 | 158 | print '<td class="liste_titre" colspan="1">' . $langs->trans("Type 5: Chambley") . '</td>'; |
@@ -149,9 +149,9 @@ |
||
149 | 149 | } |
150 | 150 | |
151 | 151 | /** |
152 | - * @param null $year |
|
153 | - * @param null $pilotId |
|
154 | - * @param null $quarter |
|
152 | + * @param integer $year |
|
153 | + * @param integer $pilotId |
|
154 | + * @param integer $quarter |
|
155 | 155 | * @param bool $groupBy |
156 | 156 | * |
157 | 157 | * @return string |