@@ -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 |
@@ -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 |
@@ -701,7 +701,7 @@ |
||
701 | 701 | |
702 | 702 | $label = '<u>' . $langs->trans("MyModule") . '</u>'; |
703 | 703 | $label .= '<div width="100%">'; |
704 | - $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref.'<br>'; |
|
704 | + $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref . '<br>'; |
|
705 | 705 | $label .= '<b>' . $langs->trans('Date') . ':</b> ' . $this->date; |
706 | 706 | $label .= '</div>'; |
707 | 707 |
@@ -33,9 +33,9 @@ discard block |
||
33 | 33 | if ($_GET['vol']) { |
34 | 34 | $tmp = New Bbcvols($db); |
35 | 35 | $tmp->fetch($_GET['vol']); |
36 | - if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin)) { |
|
36 | + if ($tmp->getId() && (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin)) { |
|
37 | 37 | if ($tmp->delete($user) > 0) { |
38 | - dol_syslog("FLIGHT_DELETE : ".$tmp->toString().' BY : '.$user->id,LOG_WARNING); |
|
38 | + dol_syslog("FLIGHT_DELETE : " . $tmp->toString() . ' BY : ' . $user->id, LOG_WARNING); |
|
39 | 39 | Header("Location: readFlights.php"); |
40 | 40 | } |
41 | 41 | } |
@@ -79,11 +79,11 @@ discard block |
||
79 | 79 | $vol->justif_kilometers = $_POST['justif_kilometers']; |
80 | 80 | |
81 | 81 | if ($vol->update($user) < 0) { |
82 | - dol_syslog("Error during update a flight ".$vol->error, LOG_ERR); |
|
82 | + dol_syslog("Error during update a flight " . $vol->error, LOG_ERR); |
|
83 | 83 | $msg = '<div class="error">Erreur lors de la MAJ </div>'; |
84 | 84 | $error++; |
85 | 85 | } else { |
86 | - Header("Location: fiche.php?vol=".$_POST['vol']); |
|
86 | + Header("Location: fiche.php?vol=" . $_POST['vol']); |
|
87 | 87 | } |
88 | 88 | } |
89 | 89 | |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | |
100 | 100 | llxHeader('', 'Carnet de vol', ''); |
101 | 101 | //delete |
102 | -if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) && $_GET["action"] == 'delete') { |
|
102 | +if ((($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) && $_GET["action"] == 'delete') { |
|
103 | 103 | $html = New Form($db); |
104 | 104 | print $html->formconfirm("fiche.php?vol=" . $_GET['vol'], "Delete vol", "Etes vous sure de vouloir supprimer ce vol?", 'deleteconfirm'); |
105 | 105 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | //Pilote |
156 | 156 | print "<tr>"; |
157 | 157 | print '<td class="fieldrequired"> Pilote</td><td>'; |
158 | - print $html->select_dolusers($vol->fk_pilot,'pilot',0); |
|
158 | + print $html->select_dolusers($vol->fk_pilot, 'pilot', 0); |
|
159 | 159 | print '</td></tr>'; |
160 | 160 | //organisateur |
161 | 161 | print "<tr>"; |
@@ -197,7 +197,7 @@ discard block |
||
197 | 197 | //Justif KIlometers |
198 | 198 | print "<tr>"; |
199 | 199 | print '<td width="25%" class="fieldrequired">Justificatif des KM</td><td>'; |
200 | - print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers. '</textarea> '; |
|
200 | + print '<textarea rows="2" cols="60" class="flat" name="justif_kilometers" >' . $vol->justif_kilometers . '</textarea> '; |
|
201 | 201 | print '</td></tr>'; |
202 | 202 | //NBR pax |
203 | 203 | print "<tr>"; |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | //Flight cost |
208 | 208 | print "<tr>"; |
209 | 209 | print '<td width="25%" class="fieldrequired">Montant perçu</td><td>'; |
210 | - print '<input type="text" name="cost" calss="flat" value="' .$vol->cost . '"/>'; |
|
210 | + print '<input type="text" name="cost" calss="flat" value="' . $vol->cost . '"/>'; |
|
211 | 211 | print "€"; |
212 | 212 | print '</td></tr>'; |
213 | 213 | //Money receiver |
@@ -255,7 +255,7 @@ discard block |
||
255 | 255 | |
256 | 256 | if (!isset($_GET['action'])) { |
257 | 257 | //delete - if user has right |
258 | - if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id ) || $user->admin) { |
|
258 | + if (($user->rights->flightLog->vol->delete && $user->id == $pilot->id) || $user->admin) { |
|
259 | 259 | print '<a class="butActionDelete" href="fiche.php?action=delete&vol=' . $vol->getId() . '">' . $langs->trans('Delete') . '</a>'; |
260 | 260 | } else { |
261 | 261 | print '<a class="butActionRefused" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">' . $langs->trans('Delete') . '</a>'; |
@@ -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>'; |