| @@ -73,7 +73,7 @@ discard block | ||
| 73 | 73 | public $justif_kilometers; | 
| 74 | 74 | |
| 75 | 75 | /** | 
| 76 | - * @return int | |
| 76 | + * @return string | |
| 77 | 77 | */ | 
| 78 | 78 | public function getIdBBCVols() | 
| 79 | 79 |      { | 
| @@ -81,7 +81,7 @@ discard block | ||
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 | /** | 
| 84 | - * @return int | |
| 84 | + * @return string | |
| 85 | 85 | */ | 
| 86 | 86 | public function getId() | 
| 87 | 87 |      { | 
| @@ -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 | |
| @@ -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"; | 
| @@ -45,8 +45,8 @@ discard block | ||
| 45 | 45 | //il est titulaire d'un ballon | 
| 46 | 46 | $query = 'SELECT * FROM llx_bbc_ballons'; | 
| 47 | 47 |      if (!$user->rights->flightLog->vol->detail) { | 
| 48 | - $query.= ' WHERE `fk_responsable` = ' . $user->id; | |
| 49 | - $query.= ' OR `fk_co_responsable` = ' . $user->id; | |
| 48 | + $query .= ' WHERE `fk_responsable` = ' . $user->id; | |
| 49 | + $query .= ' OR `fk_co_responsable` = ' . $user->id; | |
| 50 | 50 | } | 
| 51 | 51 | $resql = $db->query($query); | 
| 52 | 52 |      if ($resql) { | 
| @@ -85,15 +85,15 @@ discard block | ||
| 85 | 85 | $titulaire->fetch($ballon->fk_responsable); | 
| 86 | 86 | //flight with balloon ID | 
| 87 | 87 | $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols'; | 
| 88 | - $query.= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id; | |
| 88 | + $query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id; | |
| 89 | 89 |      if ($datep) { | 
| 90 | - $query.= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\''; | |
| 90 | + $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\''; | |
| 91 | 91 | } | 
| 92 | 92 |      if ($datef) { | 
| 93 | - $query.= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\''; | |
| 93 | + $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\''; | |
| 94 | 94 | } | 
| 95 | 95 | |
| 96 | - $query.= ' ORDER BY date'; | |
| 96 | + $query .= ' ORDER BY date'; | |
| 97 | 97 | |
| 98 | 98 | $resql = $db->query($query); | 
| 99 | 99 | } | 
| @@ -126,8 +126,8 @@ discard block | ||
| 126 | 126 | select_balloons($idBallon); | 
| 127 | 127 |      } else { | 
| 128 | 128 | $query2 = 'SELECT * FROM llx_bbc_ballons'; | 
| 129 | - $query2.= ' WHERE `fk_responsable` = ' . $user->id; | |
| 130 | - $query2.= ' OR `fk_co_responsable` = ' . $user->id; | |
| 129 | + $query2 .= ' WHERE `fk_responsable` = ' . $user->id; | |
| 130 | + $query2 .= ' OR `fk_co_responsable` = ' . $user->id; | |
| 131 | 131 | $resql2 = $db->query($query2); | 
| 132 | 132 |          if ($resql2) { | 
| 133 | 133 | $num = $db->num_rows($resql2); | 
| @@ -217,7 +217,7 @@ discard block | ||
| 217 | 217 | print '<td>' . $obj->fk_type . '</td>'; | 
| 218 | 218 | print '<td>' . $obj->date . '</td>'; | 
| 219 | 219 | print '<td>' . $ballon->immat . '</td>'; | 
| 220 | - print '<td>' . $pilot->getNomUrl(). '</td>'; | |
| 220 | + print '<td>' . $pilot->getNomUrl() . '</td>'; | |
| 221 | 221 | print '<td>' . $obj->lieuD . '</td>'; | 
| 222 | 222 | print '<td>' . $obj->lieuA . '</td>'; | 
| 223 | 223 | print '<td>' . $obj->heureD . '</td>'; | 
| @@ -231,7 +231,7 @@ discard block | ||
| 231 | 231 |                  if ($user->rights->flightLog->vol->status) { | 
| 232 | 232 | $vol = new Bbcvols($db); | 
| 233 | 233 | $vol->fetch($obj->idBBC_vols); | 
| 234 | - print '<td>' . $vol->getStatus().'</td>'; | |
| 234 | + print '<td>' . $vol->getStatus() . '</td>'; | |
| 235 | 235 | } | 
| 236 | 236 | } | 
| 237 | 237 | print'</tr>'; | 
| @@ -169,15 +169,17 @@ | ||
| 169 | 169 | print '</tr>'; | 
| 170 | 170 | } | 
| 171 | 171 | // Date start | 
| 172 | -    if (GETPOST('datep', 'int', 1)) | |
| 173 | -        $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0); | |
| 172 | +    if (GETPOST('datep', 'int', 1)) { | |
| 173 | +            $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0); | |
| 174 | + } | |
| 174 | 175 | print '<tr><td width="30%" nowrap="nowrap"><span>Debut</span></td><td>'; | 
| 175 | 176 | $form->select_date($datep, 'ap', 0, 0, 1, "readBalloon", 1, 1, 0, 0); | 
| 176 | 177 | print '</td></tr>'; | 
| 177 | 178 | |
| 178 | 179 | // Date end | 
| 179 | -    if (GETPOST('datef', 'int', 1)) | |
| 180 | -        $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0); | |
| 180 | +    if (GETPOST('datef', 'int', 1)) { | |
| 181 | +            $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0); | |
| 182 | + } | |
| 181 | 183 | print '<tr><td>Fin</span></td><td>'; | 
| 182 | 184 | $form->select_date($datef, 'p2', 0, 0, 1, "readBalloon", 1, 1, 0, 0); | 
| 183 | 185 | print '</td></tr>'; | 
| @@ -60,10 +60,10 @@ | ||
| 60 | 60 | $query = 'SELECT *,TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols WHERE 1=1'; | 
| 61 | 61 | |
| 62 | 62 |  if ($datep) { | 
| 63 | - $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc'). '\''; | |
| 63 | + $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\''; | |
| 64 | 64 | } | 
| 65 | 65 |  if ($datef) { | 
| 66 | - $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc'). '\''; | |
| 66 | + $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\''; | |
| 67 | 67 | } | 
| 68 | 68 | |
| 69 | 69 | $query .= ' AND `fk_pilot` = ' . $bbcUser->id; | 
| @@ -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 | } | 
| @@ -179,7 +179,7 @@ discard block | ||
| 179 | 179 | |
| 180 | 180 | $parameters = array(); | 
| 181 | 181 |  $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, | 
| 182 | - $action); // Note that $action and $object may have been modified by some hooks | |
| 182 | + $action); // Note that $action and $object may have been modified by some hooks | |
| 183 | 183 |  if ($reshook < 0) { | 
| 184 | 184 | setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); | 
| 185 | 185 | } | 
| @@ -291,7 +291,7 @@ discard block | ||
| 291 | 291 | // Add fields from hooks | 
| 292 | 292 | $parameters = array(); | 
| 293 | 293 |  $reshook = $hookmanager->executeHooks('printFieldListSelect', | 
| 294 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 294 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 295 | 295 | $sql .= $hookmanager->resPrint; | 
| 296 | 296 | $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t"; | 
| 297 | 297 |  if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) { | 
| @@ -381,7 +381,7 @@ discard block | ||
| 381 | 381 | // Add where from hooks | 
| 382 | 382 | $parameters = array(); | 
| 383 | 383 |  $reshook = $hookmanager->executeHooks('printFieldListWhere', | 
| 384 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 384 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 385 | 385 | $sql .= $hookmanager->resPrint; | 
| 386 | 386 | $sql .= $db->order($sortfield, $sortorder); | 
| 387 | 387 | //$sql.= $db->plimit($conf->liste_limit+1, $offset); | 
| @@ -481,7 +481,7 @@ discard block | ||
| 481 | 481 | |
| 482 | 482 | $parameters = array(); | 
| 483 | 483 |  $reshook = $hookmanager->executeHooks('printFieldPreListTitle', | 
| 484 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 484 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 485 | 485 |  if (empty($reshook)) { | 
| 486 | 486 | $moreforfilter .= $hookmanager->resPrint; | 
| 487 | 487 |  } else { | 
| @@ -496,7 +496,7 @@ discard block | ||
| 496 | 496 | |
| 497 | 497 | $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage; | 
| 498 | 498 |  $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, | 
| 499 | - $varpage); // This also change content of $arrayfields | |
| 499 | + $varpage); // This also change content of $arrayfields | |
| 500 | 500 | |
| 501 | 501 | print '<div class="div-table-responsive">'; | 
| 502 | 502 | print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n"; | 
| @@ -593,7 +593,7 @@ discard block | ||
| 593 | 593 | // Hook fields | 
| 594 | 594 |  $parameters = array('arrayfields' => $arrayfields); | 
| 595 | 595 |  $reshook = $hookmanager->executeHooks('printFieldListTitle', | 
| 596 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 596 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 597 | 597 | print $hookmanager->resPrint; | 
| 598 | 598 |  if (!empty($arrayfields['t.datec']['checked'])) { | 
| 599 | 599 | print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, | 
| @@ -711,7 +711,7 @@ discard block | ||
| 711 | 711 | // Fields from hook | 
| 712 | 712 |  $parameters = array('arrayfields' => $arrayfields); | 
| 713 | 713 |  $reshook = $hookmanager->executeHooks('printFieldListOption', | 
| 714 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 714 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 715 | 715 | print $hookmanager->resPrint; | 
| 716 | 716 |  if (!empty($arrayfields['t.datec']['checked'])) { | 
| 717 | 717 | // Date creation | 
| @@ -752,116 +752,116 @@ discard block | ||
| 752 | 752 | // Show here line of result | 
| 753 | 753 | print '<tr ' . $bc[$var] . '>'; | 
| 754 | 754 | |
| 755 | - if (! empty($arrayfields['t.idBBC_vols']['checked'])) | |
| 755 | + if (!empty($arrayfields['t.idBBC_vols']['checked'])) | |
| 756 | 756 |          { | 
| 757 | - print '<td>'.$flight->getNomUrl(0).'</td>'; | |
| 757 | + print '<td>' . $flight->getNomUrl(0) . '</td>'; | |
| 758 | 758 | |
| 759 | - if (! $i) $totalarray['nbfield']++; | |
| 759 | + if (!$i) $totalarray['nbfield']++; | |
| 760 | 760 | } | 
| 761 | - if (! empty($arrayfields['t.date']['checked'])) | |
| 761 | + if (!empty($arrayfields['t.date']['checked'])) | |
| 762 | 762 |          { | 
| 763 | 763 | print '<td>'; | 
| 764 | 764 | print dol_print_date($db->jdate($obj->date), '%d-%m-%y'); | 
| 765 | 765 | print '</td>'; | 
| 766 | 766 | |
| 767 | - if (! $i) $totalarray['nbfield']++; | |
| 767 | + if (!$i) $totalarray['nbfield']++; | |
| 768 | 768 | } | 
| 769 | - if (! empty($arrayfields['t.lieuD']['checked'])) | |
| 769 | + if (!empty($arrayfields['t.lieuD']['checked'])) | |
| 770 | 770 |          { | 
| 771 | - print '<td>'.$obj->lieuD.'</td>'; | |
| 771 | + print '<td>' . $obj->lieuD . '</td>'; | |
| 772 | 772 | |
| 773 | - if (! $i) $totalarray['nbfield']++; | |
| 773 | + if (!$i) $totalarray['nbfield']++; | |
| 774 | 774 | } | 
| 775 | - if (! empty($arrayfields['t.lieuA']['checked'])) | |
| 775 | + if (!empty($arrayfields['t.lieuA']['checked'])) | |
| 776 | 776 |          { | 
| 777 | - print '<td>'.$obj->lieuA.'</td>'; | |
| 777 | + print '<td>' . $obj->lieuA . '</td>'; | |
| 778 | 778 | |
| 779 | - if (! $i) $totalarray['nbfield']++; | |
| 779 | + if (!$i) $totalarray['nbfield']++; | |
| 780 | 780 | } | 
| 781 | - if (! empty($arrayfields['t.heureD']['checked'])) | |
| 781 | + if (!empty($arrayfields['t.heureD']['checked'])) | |
| 782 | 782 |          { | 
| 783 | - print '<td>'.$obj->heureD.'</td>'; | |
| 783 | + print '<td>' . $obj->heureD . '</td>'; | |
| 784 | 784 | |
| 785 | - if (! $i) $totalarray['nbfield']++; | |
| 785 | + if (!$i) $totalarray['nbfield']++; | |
| 786 | 786 | } | 
| 787 | - if (! empty($arrayfields['t.heureA']['checked'])) | |
| 787 | + if (!empty($arrayfields['t.heureA']['checked'])) | |
| 788 | 788 |          { | 
| 789 | - print '<td>'.$obj->heureA.'</td>'; | |
| 789 | + print '<td>' . $obj->heureA . '</td>'; | |
| 790 | 790 | |
| 791 | - if (! $i) $totalarray['nbfield']++; | |
| 791 | + if (!$i) $totalarray['nbfield']++; | |
| 792 | 792 | } | 
| 793 | - if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) | |
| 793 | + if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked'])) | |
| 794 | 794 |          { | 
| 795 | - print '<td>'.$obj->bal.'</td>'; | |
| 795 | + print '<td>' . $obj->bal . '</td>'; | |
| 796 | 796 | |
| 797 | - if (! $i) $totalarray['nbfield']++; | |
| 797 | + if (!$i) $totalarray['nbfield']++; | |
| 798 | 798 | } | 
| 799 | - if (! empty($arrayfields['t.nbrPax']['checked'])) | |
| 799 | + if (!empty($arrayfields['t.nbrPax']['checked'])) | |
| 800 | 800 |          { | 
| 801 | - print '<td>'.$obj->nbrPax.'</td>'; | |
| 801 | + print '<td>' . $obj->nbrPax . '</td>'; | |
| 802 | 802 | |
| 803 | - if (! $i) $totalarray['nbfield']++; | |
| 803 | + if (!$i) $totalarray['nbfield']++; | |
| 804 | 804 | } | 
| 805 | - if (! empty($arrayfields['t.remarque']['checked'])) | |
| 805 | + if (!empty($arrayfields['t.remarque']['checked'])) | |
| 806 | 806 |          { | 
| 807 | - print '<td>'.$obj->remarque.'</td>'; | |
| 807 | + print '<td>' . $obj->remarque . '</td>'; | |
| 808 | 808 | |
| 809 | - if (! $i) $totalarray['nbfield']++; | |
| 809 | + if (!$i) $totalarray['nbfield']++; | |
| 810 | 810 | } | 
| 811 | - if (! empty($arrayfields['t.incidents']['checked'])) | |
| 811 | + if (!empty($arrayfields['t.incidents']['checked'])) | |
| 812 | 812 |          { | 
| 813 | - print '<td>'.$obj->incidents.'</td>'; | |
| 813 | + print '<td>' . $obj->incidents . '</td>'; | |
| 814 | 814 | |
| 815 | - if (! $i) $totalarray['nbfield']++; | |
| 815 | + if (!$i) $totalarray['nbfield']++; | |
| 816 | 816 | } | 
| 817 | - if (! empty($arrayfields['t.fk_type']['checked'])) | |
| 817 | + if (!empty($arrayfields['t.fk_type']['checked'])) | |
| 818 | 818 |          { | 
| 819 | - print '<td>'.$obj->flight_type.'</td>'; | |
| 819 | + print '<td>' . $obj->flight_type . '</td>'; | |
| 820 | 820 | |
| 821 | - if (! $i) $totalarray['nbfield']++; | |
| 821 | + if (!$i) $totalarray['nbfield']++; | |
| 822 | 822 | } | 
| 823 | - if (! empty($arrayfields['t.fk_pilot']['checked'])) | |
| 823 | + if (!empty($arrayfields['t.fk_pilot']['checked'])) | |
| 824 | 824 |          { | 
| 825 | - print '<td>'.$obj->pilot.'</td>'; | |
| 825 | + print '<td>' . $obj->pilot . '</td>'; | |
| 826 | 826 | |
| 827 | - if (! $i) $totalarray['nbfield']++; | |
| 827 | + if (!$i) $totalarray['nbfield']++; | |
| 828 | 828 | } | 
| 829 | - if (! empty($arrayfields['t.fk_organisateur']['checked'])) | |
| 829 | + if (!empty($arrayfields['t.fk_organisateur']['checked'])) | |
| 830 | 830 |          { | 
| 831 | - print '<td>'.$obj->organisator.'</td>'; | |
| 831 | + print '<td>' . $obj->organisator . '</td>'; | |
| 832 | 832 | |
| 833 | - if (! $i) $totalarray['nbfield']++; | |
| 833 | + if (!$i) $totalarray['nbfield']++; | |
| 834 | 834 | } | 
| 835 | - if (! empty($arrayfields['t.is_facture']['checked'])) | |
| 835 | + if (!empty($arrayfields['t.is_facture']['checked'])) | |
| 836 | 836 |          { | 
| 837 | 837 | $flight->is_facture = $obj->is_facture; | 
| 838 | - print '<td>'.$flight->getLibStatut(3).'</td>'; | |
| 838 | + print '<td>' . $flight->getLibStatut(3) . '</td>'; | |
| 839 | 839 | |
| 840 | - if (! $i) $totalarray['nbfield']++; | |
| 840 | + if (!$i) $totalarray['nbfield']++; | |
| 841 | 841 | } | 
| 842 | - if (! empty($arrayfields['t.kilometers']['checked'])) | |
| 842 | + if (!empty($arrayfields['t.kilometers']['checked'])) | |
| 843 | 843 |          { | 
| 844 | - print '<td>'.$obj->kilometers.'</td>'; | |
| 844 | + print '<td>' . $obj->kilometers . '</td>'; | |
| 845 | 845 | |
| 846 | - if (! $i) $totalarray['nbfield']++; | |
| 846 | + if (!$i) $totalarray['nbfield']++; | |
| 847 | 847 | } | 
| 848 | - if (! empty($arrayfields['t.cost']['checked'])) | |
| 848 | + if (!empty($arrayfields['t.cost']['checked'])) | |
| 849 | 849 |          { | 
| 850 | - print '<td>'.$obj->cost.'</td>'; | |
| 850 | + print '<td>' . $obj->cost . '</td>'; | |
| 851 | 851 | |
| 852 | - if (! $i) $totalarray['nbfield']++; | |
| 852 | + if (!$i) $totalarray['nbfield']++; | |
| 853 | 853 | } | 
| 854 | - if (! empty($arrayfields['t.fk_receiver']['checked'])) | |
| 854 | + if (!empty($arrayfields['t.fk_receiver']['checked'])) | |
| 855 | 855 |          { | 
| 856 | - print '<td>'.$obj->receiver.'</td>'; | |
| 856 | + print '<td>' . $obj->receiver . '</td>'; | |
| 857 | 857 | |
| 858 | - if (! $i) $totalarray['nbfield']++; | |
| 858 | + if (!$i) $totalarray['nbfield']++; | |
| 859 | 859 | } | 
| 860 | - if (! empty($arrayfields['t.justif_kilometers']['checked'])) | |
| 860 | + if (!empty($arrayfields['t.justif_kilometers']['checked'])) | |
| 861 | 861 |          { | 
| 862 | - print '<td>'.$obj->justif_kilometers.'</td>'; | |
| 862 | + print '<td>' . $obj->justif_kilometers . '</td>'; | |
| 863 | 863 | |
| 864 | - if (! $i) $totalarray['nbfield']++; | |
| 864 | + if (!$i) $totalarray['nbfield']++; | |
| 865 | 865 | } | 
| 866 | 866 | |
| 867 | 867 | // Extra fields | 
| @@ -886,7 +886,7 @@ discard block | ||
| 886 | 886 | // Fields from hook | 
| 887 | 887 |          $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj); | 
| 888 | 888 |          $reshook = $hookmanager->executeHooks('printFieldListValue', | 
| 889 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 889 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 890 | 890 | print $hookmanager->resPrint; | 
| 891 | 891 | // Date creation | 
| 892 | 892 |          if (!empty($arrayfields['t.datec']['checked'])) { | 
| @@ -963,7 +963,7 @@ discard block | ||
| 963 | 963 | |
| 964 | 964 |  $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql); | 
| 965 | 965 |  $reshook = $hookmanager->executeHooks('printFieldListFooter', | 
| 966 | - $parameters); // Note that $action and $object may have been modified by hook | |
| 966 | + $parameters); // Note that $action and $object may have been modified by hook | |
| 967 | 967 | print $hookmanager->resPrint; | 
| 968 | 968 | |
| 969 | 969 | print '</table>' . "\n"; | 
| @@ -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 | } |