@@ -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 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
60 | 60 | |
61 | 61 | // Load object |
62 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
62 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
63 | 63 | |
64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | print '<tr><td class="fieldrequired">' . $langs->trans("Fielddate") . '</td><td>' . dol_print_date($object->date) . '</td></tr>'; |
90 | 90 | |
91 | 91 | if ($user->rights->flightlog->vol->financial) { |
92 | - print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5). '</td></tr>'; |
|
92 | + print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->getLibStatut(5) . '</td></tr>'; |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>'; |
@@ -103,13 +103,13 @@ discard block |
||
103 | 103 | // Buttons |
104 | 104 | print '<div class="tabsAction">' . "\n"; |
105 | 105 | |
106 | -if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
107 | - print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
106 | +if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
107 | + print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | print '</div>' . "\n"; |
111 | 111 | |
112 | -if($user->rights->flightlog->vol->financial){ |
|
112 | +if ($user->rights->flightlog->vol->financial) { |
|
113 | 113 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
114 | 114 | $form->showLinkedObjectBlock($object); |
115 | 115 | print '</div></div>'; |
@@ -119,18 +119,18 @@ discard block |
||
119 | 119 | // Insert request |
120 | 120 | $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '('; |
121 | 121 | |
122 | - $sql.= 'numero,'; |
|
123 | - $sql.= 'nom,'; |
|
124 | - $sql.= 'fkService,'; |
|
125 | - $sql.= 'active'; |
|
122 | + $sql .= 'numero,'; |
|
123 | + $sql .= 'nom,'; |
|
124 | + $sql .= 'fkService,'; |
|
125 | + $sql .= 'active'; |
|
126 | 126 | |
127 | 127 | |
128 | 128 | $sql .= ') VALUES ('; |
129 | 129 | |
130 | - $sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).','; |
|
131 | - $sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").','; |
|
132 | - $sql .= ' '.(! isset($this->fkService)?'NULL':"'".$this->db->escape($this->fkService)."'").','; |
|
133 | - $sql .= ' '.(! isset($this->active)?'NULL':$this->active); |
|
130 | + $sql .= ' ' . (!isset($this->numero) ? 'NULL' : $this->numero) . ','; |
|
131 | + $sql .= ' ' . (!isset($this->nom) ? 'NULL' : "'" . $this->db->escape($this->nom) . "'") . ','; |
|
132 | + $sql .= ' ' . (!isset($this->fkService) ? 'NULL' : "'" . $this->db->escape($this->fkService) . "'") . ','; |
|
133 | + $sql .= ' ' . (!isset($this->active) ? 'NULL' : $this->active); |
|
134 | 134 | |
135 | 135 | |
136 | 136 | $sql .= ')'; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | $resql = $this->db->query($sql); |
141 | 141 | if (!$resql) { |
142 | - $error ++; |
|
142 | + $error++; |
|
143 | 143 | $this->errors[] = 'Error ' . $this->db->lasterror(); |
144 | 144 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
145 | 145 | } |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | if ($error) { |
163 | 163 | $this->db->rollback(); |
164 | 164 | |
165 | - return - 1 * $error; |
|
165 | + return -1 * $error; |
|
166 | 166 | } else { |
167 | 167 | $this->db->commit(); |
168 | 168 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $this->fkService = $obj->fkService; |
213 | 213 | $this->active = $obj->active; |
214 | 214 | |
215 | - if($this->fkService){ |
|
215 | + if ($this->fkService) { |
|
216 | 216 | $this->service = new Product($this->db); |
217 | 217 | $this->service->fetch($this->fkService); |
218 | 218 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $this->errors[] = 'Error ' . $this->db->lasterror(); |
229 | 229 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
230 | 230 | |
231 | - return - 1; |
|
231 | + return -1; |
|
232 | 232 | } |
233 | 233 | } |
234 | 234 | |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * |
245 | 245 | * @return int <0 if KO, >0 if OK |
246 | 246 | */ |
247 | - public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND') |
|
247 | + public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND') |
|
248 | 248 | { |
249 | 249 | dol_syslog(__METHOD__, LOG_DEBUG); |
250 | 250 | |
@@ -256,32 +256,32 @@ discard block |
||
256 | 256 | $sql .= " t.active"; |
257 | 257 | |
258 | 258 | |
259 | - $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t'; |
|
259 | + $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t'; |
|
260 | 260 | |
261 | 261 | // Manage filter |
262 | 262 | $sqlwhere = array(); |
263 | 263 | |
264 | 264 | foreach ($filter as $key => $value) { |
265 | - if(is_string($value)){ |
|
265 | + if (is_string($value)) { |
|
266 | 266 | $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\''; |
267 | 267 | continue; |
268 | 268 | } |
269 | 269 | |
270 | - if(is_int($value)){ |
|
271 | - $sqlwhere [] = $key . ' = ' .(int)$value; |
|
270 | + if (is_int($value)) { |
|
271 | + $sqlwhere [] = $key . ' = ' . (int) $value; |
|
272 | 272 | continue; |
273 | 273 | } |
274 | 274 | } |
275 | 275 | |
276 | 276 | if (count($sqlwhere) > 0) { |
277 | - $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere); |
|
277 | + $sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere); |
|
278 | 278 | } |
279 | 279 | |
280 | 280 | if (!empty($sortfield)) { |
281 | - $sql .= $this->db->order($sortfield,$sortorder); |
|
281 | + $sql .= $this->db->order($sortfield, $sortorder); |
|
282 | 282 | } |
283 | 283 | if (!empty($limit)) { |
284 | - $sql .= ' ' . $this->db->plimit($limit + 1, $offset); |
|
284 | + $sql .= ' ' . $this->db->plimit($limit + 1, $offset); |
|
285 | 285 | } |
286 | 286 | $this->lines = array(); |
287 | 287 | |
@@ -308,7 +308,7 @@ discard block |
||
308 | 308 | $this->errors[] = 'Error ' . $this->db->lasterror(); |
309 | 309 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
310 | 310 | |
311 | - return - 1; |
|
311 | + return -1; |
|
312 | 312 | } |
313 | 313 | } |
314 | 314 | |
@@ -352,10 +352,10 @@ discard block |
||
352 | 352 | // Update request |
353 | 353 | $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET'; |
354 | 354 | |
355 | - $sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").','; |
|
356 | - $sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").','; |
|
357 | - $sql .= ' fkService = '.(isset($this->fkService)?"'".$this->db->escape($this->fkService)."'":"null").','; |
|
358 | - $sql .= ' active = '.(isset($this->active)?$this->active:"null"); |
|
355 | + $sql .= ' numero = ' . (isset($this->numero) ? $this->numero : "null") . ','; |
|
356 | + $sql .= ' nom = ' . (isset($this->nom) ? "'" . $this->db->escape($this->nom) . "'" : "null") . ','; |
|
357 | + $sql .= ' fkService = ' . (isset($this->fkService) ? "'" . $this->db->escape($this->fkService) . "'" : "null") . ','; |
|
358 | + $sql .= ' active = ' . (isset($this->active) ? $this->active : "null"); |
|
359 | 359 | |
360 | 360 | |
361 | 361 | $sql .= ' WHERE idType=' . $this->id; |
@@ -364,7 +364,7 @@ discard block |
||
364 | 364 | |
365 | 365 | $resql = $this->db->query($sql); |
366 | 366 | if (!$resql) { |
367 | - $error ++; |
|
367 | + $error++; |
|
368 | 368 | $this->errors[] = 'Error ' . $this->db->lasterror(); |
369 | 369 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
370 | 370 | } |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | if ($error) { |
384 | 384 | $this->db->rollback(); |
385 | 385 | |
386 | - return - 1 * $error; |
|
386 | + return -1 * $error; |
|
387 | 387 | } else { |
388 | 388 | $this->db->commit(); |
389 | 389 | |
@@ -425,7 +425,7 @@ discard block |
||
425 | 425 | |
426 | 426 | $resql = $this->db->query($sql); |
427 | 427 | if (!$resql) { |
428 | - $error ++; |
|
428 | + $error++; |
|
429 | 429 | $this->errors[] = 'Error ' . $this->db->lasterror(); |
430 | 430 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
431 | 431 | } |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | if ($error) { |
436 | 436 | $this->db->rollback(); |
437 | 437 | |
438 | - return - 1 * $error; |
|
438 | + return -1 * $error; |
|
439 | 439 | } else { |
440 | 440 | $this->db->commit(); |
441 | 441 | |
@@ -473,7 +473,7 @@ discard block |
||
473 | 473 | |
474 | 474 | // Other options |
475 | 475 | if ($result < 0) { |
476 | - $error ++; |
|
476 | + $error++; |
|
477 | 477 | $this->errors = $object->errors; |
478 | 478 | dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR); |
479 | 479 | } |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | } else { |
487 | 487 | $this->db->rollback(); |
488 | 488 | |
489 | - return - 1; |
|
489 | + return -1; |
|
490 | 490 | } |
491 | 491 | } |
492 | 492 | |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | * @param string $morecss Add more css on link |
502 | 502 | * @return string String with URL |
503 | 503 | */ |
504 | - function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='') |
|
504 | + function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '') |
|
505 | 505 | { |
506 | 506 | global $langs, $conf, $db; |
507 | 507 | global $dolibarr_main_authentication, $dolibarr_main_demo; |
@@ -512,20 +512,20 @@ discard block |
||
512 | 512 | $companylink = ''; |
513 | 513 | |
514 | 514 | $label = '<u>' . $langs->trans("MyModule") . '</u>'; |
515 | - $label.= '<div width="100%">'; |
|
516 | - $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref; |
|
515 | + $label .= '<div width="100%">'; |
|
516 | + $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref; |
|
517 | 517 | |
518 | - $link = '<a href="'.DOL_URL_ROOT.'/flightlog/card.php?id='.$this->id.'"'; |
|
519 | - $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"'); |
|
520 | - $link.= '>'; |
|
521 | - $linkend='</a>'; |
|
518 | + $link = '<a href="' . DOL_URL_ROOT . '/flightlog/card.php?id=' . $this->id . '"'; |
|
519 | + $link .= ($notooltip ? '' : ' title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"'); |
|
520 | + $link .= '>'; |
|
521 | + $linkend = '</a>'; |
|
522 | 522 | |
523 | 523 | if ($withpicto) |
524 | 524 | { |
525 | - $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend); |
|
526 | - if ($withpicto != 2) $result.=' '; |
|
525 | + $result .= ($link . img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')) . $linkend); |
|
526 | + if ($withpicto != 2) $result .= ' '; |
|
527 | 527 | } |
528 | - $result.= $link . $this->ref . $linkend; |
|
528 | + $result .= $link . $this->ref . $linkend; |
|
529 | 529 | return $result; |
530 | 530 | } |
531 | 531 | |
@@ -535,9 +535,9 @@ discard block |
||
535 | 535 | * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto |
536 | 536 | * @return string Label of status |
537 | 537 | */ |
538 | - function getLibStatut($mode=0) |
|
538 | + function getLibStatut($mode = 0) |
|
539 | 539 | { |
540 | - return $this->LibStatut($this->status,$mode); |
|
540 | + return $this->LibStatut($this->status, $mode); |
|
541 | 541 | } |
542 | 542 | |
543 | 543 | /** |
@@ -547,13 +547,13 @@ discard block |
||
547 | 547 | * @param int $mode 0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto |
548 | 548 | * @return string Label of status |
549 | 549 | */ |
550 | - function LibStatut($status,$mode=0) |
|
550 | + function LibStatut($status, $mode = 0) |
|
551 | 551 | { |
552 | 552 | global $langs; |
553 | 553 | |
554 | 554 | if ($mode == 0) |
555 | 555 | { |
556 | - $prefix=''; |
|
556 | + $prefix = ''; |
|
557 | 557 | if ($status == 1) return $langs->trans('Enabled'); |
558 | 558 | if ($status == 0) return $langs->trans('Disabled'); |
559 | 559 | } |
@@ -564,23 +564,23 @@ discard block |
||
564 | 564 | } |
565 | 565 | if ($mode == 2) |
566 | 566 | { |
567 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
568 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
567 | + if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled'); |
|
568 | + if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled'); |
|
569 | 569 | } |
570 | 570 | if ($mode == 3) |
571 | 571 | { |
572 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4'); |
|
573 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5'); |
|
572 | + if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4'); |
|
573 | + if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5'); |
|
574 | 574 | } |
575 | 575 | if ($mode == 4) |
576 | 576 | { |
577 | - if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled'); |
|
578 | - if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled'); |
|
577 | + if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled'); |
|
578 | + if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled'); |
|
579 | 579 | } |
580 | 580 | if ($mode == 5) |
581 | 581 | { |
582 | - if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4'); |
|
583 | - if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5'); |
|
582 | + if ($status == 1) return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4'); |
|
583 | + if ($status == 0) return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5'); |
|
584 | 584 | } |
585 | 585 | |
586 | 586 | return ""; |
@@ -873,7 +873,7 @@ |
||
873 | 873 | /** |
874 | 874 | * @return boolean |
875 | 875 | */ |
876 | - public function hasFacture(){ |
|
876 | + public function hasFacture() { |
|
877 | 877 | return count($this->linkedObjectsIds) > 0; |
878 | 878 | } |
879 | 879 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | $this->results["flightlog"] = [ |
30 | 30 | 'label' => $langs->trans("Search flight"), |
31 | 31 | 'text' => $langs->trans("Search flight"), |
32 | - 'url' => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall='.$searchInfo['search_boxvalue'] |
|
32 | + 'url' => DOL_URL_ROOT . '/flightlog/list.php?mainmenu=flightlog&sall=' . $searchInfo['search_boxvalue'] |
|
33 | 33 | ]; |
34 | 34 | } |
35 | 35 | |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | * @param $object |
39 | 39 | * @param $action |
40 | 40 | */ |
41 | - public function showLinkToObjectBlock($parameter, $object, $action){ |
|
42 | - $this->results["flightlog_bbcvols"]= array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM ".MAIN_DB_PREFIX."bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC"); |
|
41 | + public function showLinkToObjectBlock($parameter, $object, $action) { |
|
42 | + $this->results["flightlog_bbcvols"] = array('enabled'=>1, 'perms'=>1, 'label'=>'LinkToFlight', 'sql'=>"SELECT f.idBBC_vols as rowid, CONCAT('(ID : ',f.idBBC_vols, ') -',f.date, '-',f.lieuD, ' ; ', f.lieuA) as ref FROM " . MAIN_DB_PREFIX . "bbc_vols as f WHERE YEAR(f.date) = (YEAR(NOW())) ORDER BY date DESC"); |
|
43 | 43 | |
44 | 44 | } |
45 | 45 | } |
46 | 46 | \ No newline at end of file |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
60 | 60 | |
61 | 61 | // Load object |
62 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
62 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
63 | 63 | |
64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | print '<div class="tabsAction">' . "\n"; |
96 | 96 | print '</div>' . "\n"; |
97 | 97 | |
98 | -if($user->rights->flightlog->vol->financial){ |
|
98 | +if ($user->rights->flightlog->vol->financial) { |
|
99 | 99 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
100 | 100 | $form->showLinkedObjectBlock($object); |
101 | 101 | print '</div></div>'; |
@@ -25,10 +25,10 @@ discard block |
||
25 | 25 | * Actions |
26 | 26 | */ |
27 | 27 | // Save |
28 | -if($action === ACTION_SAVE){ |
|
29 | - foreach($services as $flightTypeId => $serviceId){ |
|
28 | +if ($action === ACTION_SAVE) { |
|
29 | + foreach ($services as $flightTypeId => $serviceId) { |
|
30 | 30 | $res = $flightType->fetch($flightTypeId); |
31 | - if($res > 0 ){ |
|
31 | + if ($res > 0) { |
|
32 | 32 | $flightType->fkService = $serviceId; |
33 | 33 | $flightType->update($user); |
34 | 34 | } |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | <tr class="<?= $flightTypeLine->id % 2 == 0 ? "pair" : "impair" ?>"> |
67 | 67 | <td>(T<?= $flightTypeLine->numero ?>) - <?= $flightTypeLine->nom ?></td> |
68 | 68 | <td> |
69 | - <?php $form->select_produits($flightTypeLine->fkService, 'idprod['.$flightTypeLine->id.']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?> |
|
69 | + <?php $form->select_produits($flightTypeLine->fkService, 'idprod[' . $flightTypeLine->id . ']', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?> |
|
70 | 70 | </td> |
71 | 71 | </tr> |
72 | 72 | <?php endforeach; ?> |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | Vol client |
78 | 78 | </td> |
79 | 79 | <td> |
80 | - <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(),$buyer->id); ?> |
|
80 | + <?php $form->select_produits($conf->global->BBC_FLIGHT_TYPE_CUSTOMER, 'customer_product', $filtertype, $conf->product->limit_size, $buyer->price_level, 1, 2, '', 1, array(), $buyer->id); ?> |
|
81 | 81 | </td> |
82 | 82 | </tr> |
83 | 83 |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
60 | 60 | |
61 | 61 | // Load object |
62 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
62 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
63 | 63 | |
64 | 64 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
65 | 65 | $hookmanager->initHooks(array('bbcvols')); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | print '<div class="tabsAction">' . "\n"; |
95 | 95 | print '</div>' . "\n"; |
96 | 96 | |
97 | -if($user->rights->flightlog->vol->financial){ |
|
97 | +if ($user->rights->flightlog->vol->financial) { |
|
98 | 98 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
99 | 99 | $form->showLinkedObjectBlock($object); |
100 | 100 | print '</div></div>'; |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | $extralabels = $extrafields->fetch_name_optionals_label($object->table_element); |
112 | 112 | |
113 | 113 | // Load object |
114 | -include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
114 | +include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals |
|
115 | 115 | |
116 | 116 | // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array |
117 | 117 | $hookmanager->initHooks(array('bbcvols')); |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | $parameters = array(); |
138 | 138 | $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, |
139 | - $action); // Note that $action and $object may have been modified by some hooks |
|
139 | + $action); // Note that $action and $object may have been modified by some hooks |
|
140 | 140 | if ($reshook < 0) { |
141 | 141 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
142 | 142 | } |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | print '<div class="tabsAction">' . "\n"; |
475 | 475 | $parameters = array(); |
476 | 476 | $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, |
477 | - $action); // Note that $action and $object may have been modified by hook |
|
477 | + $action); // Note that $action and $object may have been modified by hook |
|
478 | 478 | if ($reshook < 0) { |
479 | 479 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); |
480 | 480 | } |
@@ -487,13 +487,13 @@ discard block |
||
487 | 487 | print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=delete">' . $langs->trans('Delete') . '</a></div>' . "\n"; |
488 | 488 | } |
489 | 489 | |
490 | - if($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()){ |
|
491 | - print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id.'">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
490 | + if ($user->rights->flightlog->vol->financial && $object->fk_type == 2 && !$object->hasFacture()) { |
|
491 | + print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/flightlog/facture.php?id=' . $object->id . '">' . $langs->trans("Facturer") . '</a></div>' . "\n"; |
|
492 | 492 | } |
493 | 493 | |
494 | 494 | print '</div>' . "\n"; |
495 | 495 | |
496 | - if($user->rights->flightlog->vol->financial){ |
|
496 | + if ($user->rights->flightlog->vol->financial) { |
|
497 | 497 | print '<div class="fichecenter"><div class="fichehalfleft">'; |
498 | 498 | $form->showLinkedObjectBlock($object); |
499 | 499 | print '</div></div>'; |