laudeco / bbc-dolibarr-flightlog

listFact.php

Spacing +2 added lines, -2 removed lines

@@ -61,8 +61,8 @@
 $form = new Form($db);
 print '<!-- debut cartouche rapport -->
 	<div class="tabs">
-	    <a  id="'.($viewSelection == 1 ? 'active' : '').'" class="tab" href="listFact.php?view=1">Facturation</a>
-	    <a  id="'.($viewSelection == 2 ? 'active' : '').'" class="tab" href="listFact.php?view=2">AVIABEL</a>
+	    <a  id="'.($viewSelection == 1 ? 'active' : '') . '" class="tab" href="listFact.php?view=1">Facturation</a>
+	    <a  id="'.($viewSelection == 2 ? 'active' : '') . '" class="tab" href="listFact.php?view=2">AVIABEL</a>
 	</div>';
 print '<div class="tabBar">';
 print "<form name='listFact' action=\"listFact.php\" method=\"get\">\n";

generateExpenseNote.php

Braces +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
 
         if ($result > 0) {
             dol_htmloutput_mesg("Notes de frais créées");
-        }else{
+        } else{
             dol_htmloutput_errors("Note de frais non créée");
         }
     } else {

Spacing +13 added lines, -13 removed lines

@@ -81,9 +81,9 @@ 
 
         $missions = bbcKilometersByQuartil($year);
 
-        foreach($missions as $currentMissionUserId => $currentMission){
+        foreach ($missions as $currentMissionUserId => $currentMission) {
 
-            if($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0){
+            if ($currentMission["quartil"][$quarter]["km"] == 0 && $currentMission["quartil"][$quarter]["flight"] == 0) {
                 continue;
             }
 
@@ -97,18 +97,18 @@ 
             $object->fk_statut = 1;
             $object->fk_user_validator = GETPOST("fk_user_validator", 'int');
             $object->note_public = GETPOST('public_note', 'alpha');
-            $object->note_private = GETPOST('private_note','alpha');
+            $object->note_private = GETPOST('private_note', 'alpha');
 
             $expenseNoteId = $object->create($expenseNoteUser);
-            if($expenseNoteId < 0){
-                dol_htmloutput_errors("Erreur lors de la création de la note de frais" , $object->errors);
+            if ($expenseNoteId < 0) {
+                dol_htmloutput_errors("Erreur lors de la création de la note de frais", $object->errors);
                 continue;
             }
 
 
             $flightsForQuarter = findFlightByPilotAndQuarter($currentMissionUserId, $year, $quarter);
 
-            foreach($flightsForQuarter as $currentFlightForQuarter) {
+            foreach ($flightsForQuarter as $currentFlightForQuarter) {
 
                 // Kilometers
                 $object_ligne = new ExpenseReportLine($db);
@@ -168,7 +168,7 @@ 
 
         if ($result > 0) {
             dol_htmloutput_mesg("Notes de frais créées");
-        }else{
+        } else {
             dol_htmloutput_errors("Note de frais non créée");
         }
     } else {
@@ -187,15 +187,15 @@ 
 $form = new Form($db);
 
 $tabLinks = [];
-foreach($flightYears as $currentFlightYear){
+foreach ($flightYears as $currentFlightYear) {
     $tabLinks[] = [
-        DOL_URL_ROOT."/flightlog/generateExpenseNote.php?year=".$currentFlightYear,
+        DOL_URL_ROOT . "/flightlog/generateExpenseNote.php?year=" . $currentFlightYear,
         $currentFlightYear,
-        "tab_".$currentFlightYear
+        "tab_" . $currentFlightYear
     ];
 }
 
-dol_fiche_head($tabLinks, "tab_".$year);
+dol_fiche_head($tabLinks, "tab_" . $year);
 
 ?>
     <form method="POST">
@@ -211,7 +211,7 @@ 
         <select name="quarter" id="field_quarter">
             <option value="1" <?= ($year == $currentYear && $currentQuarter <= 1) ? 'disabled="disabled"' : "" ?>>1</option>
             <option value="2" <?= ($year == $currentYear && $currentQuarter <= 2) ? 'disabled="disabled"' : "" ?>>2</option>
-            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"': "" ?>>3</option>
+            <option value="3" <?= ($year == $currentYear && $currentQuarter <= 3) ? 'disabled="disabled"' : "" ?>>3</option>
             <option value="4" <?= ($year == $currentYear && $currentQuarter <= 4) ? 'disabled="disabled"' : "" ?>>4</option>
         </select>
         <br/>
@@ -220,7 +220,7 @@ 
         <label><?= $langs->trans("Validateur de la note de frais")?></label><br/>
         <?php
             $include_users = $object->fetch_users_approver_expensereport();
-            print $form->select_dolusers($user->id,"fk_user_validator",1,"",0,$include_users);
+            print $form->select_dolusers($user->id, "fk_user_validator", 1, "", 0, $include_users);
         ?>
         <br/>
 

class/YearGraphicalData.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $result = [$this->year];
 
         foreach ($this->graphData as $typeId => $data) {
-            if(!in_array($typeId, [1,2,3,6])){
+            if (!in_array($typeId, [1, 2, 3, 6])) {
                 continue;
             }
 

class/GraphicalValueType.php

Spacing +2 added lines, -2 removed lines

@@ -36,14 +36,14 @@
     /**
      * @param GraphicalValue $value
      */
-    public function addValue(GraphicalValue $value){
+    public function addValue(GraphicalValue $value) {
         $this->counter = $this->counter->add($value);
     }
 
     /**
      * @return int
      */
-    public function getValue(){
+    public function getValue() {
         return $this->counter->getValue();
     }
 

class/GraphicalData.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      */
     public function addValue($year, GraphicalValue $value)
     {
-        if(!isset($this->data[$year])){
+        if (!isset($this->data[$year])) {
             throw new \Exception("Year is not defined");
         }
 
@@ -54,7 +54,7 @@ 
     {
         $result = [];
 
-        foreach($this->data as $year){
+        foreach ($this->data as $year) {
             $result[] = $year->export();
         }
 

list.php

Indentation +7 added lines, -7 removed lines

@@ -136,12 +136,12 @@ 
 
     //'t.entity'=>array('label'=>$langs->trans("Entity"), 'checked'=>1, 'enabled'=>(! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode))),
     't.datec'                     => array('label'    => $langs->trans("DateCreationShort"),
-                                           'checked'  => 0,
-                                           'position' => 500
+                                            'checked'  => 0,
+                                            'position' => 500
     ),
     't.tms'                       => array('label'    => $langs->trans("DateModificationShort"),
-                                           'checked'  => 0,
-                                           'position' => 500
+                                            'checked'  => 0,
+                                            'position' => 500
     ),
     //'t.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
 );
@@ -149,9 +149,9 @@ 
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
     foreach ($extrafields->attribute_label as $key => $val) {
         $arrayfields["ef." . $key] = array('label'    => $extrafields->attribute_label[$key],
-                                           'checked'  => $extrafields->attribute_list[$key],
-                                           'position' => $extrafields->attribute_pos[$key],
-                                           'enabled'  => $extrafields->attribute_perms[$key]
+                                            'checked'  => $extrafields->attribute_list[$key],
+                                            'position' => $extrafields->attribute_pos[$key],
+                                            'enabled'  => $extrafields->attribute_perms[$key]
         );
     }
 }

Spacing +89 added lines, -89 removed lines

@@ -50,7 +50,7 @@ 
 $search_fk_type = GETPOST('search_fk_type', 'int');
 $search_fk_pilot = GETPOST('search_fk_pilot', 'int') ?: ($user->admin ? '' : $user->id);
 $search_fk_organisateur = GETPOST('search_fk_organisateur', 'int');
-$search_is_facture = GETPOST('search_is_facture', 'int') === ''? -1 : (int)GETPOST('search_is_facture', 'int');
+$search_is_facture = GETPOST('search_is_facture', 'int') === '' ? -1 : (int) GETPOST('search_is_facture', 'int');
 $search_kilometers = GETPOST('search_kilometers', 'alpha');
 $search_cost = GETPOST('search_cost', 'alpha');
 $search_fk_receiver = GETPOST('search_fk_receiver', 'int');
@@ -178,7 +178,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object,
-    $action);    // Note that $action and $object may have been modified by some hooks
+    $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -275,7 +275,7 @@ 
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM " . MAIN_DB_PREFIX . "bbc_vols as t";
 if (is_array($extrafields->attribute_label) && count($extrafields->attribute_label)) {
@@ -289,8 +289,8 @@ 
 
 $sql .= " WHERE 1 = 1";
 
-if($search_all){
-    $sql .= natural_search(["idBBC_vols",  "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
+if ($search_all) {
+    $sql .= natural_search(["idBBC_vols", "lieuD", "lieuA", "pilot.lastname", "pilot.firstname", "balloon.immat"], $search_all);
 }
 
 if ($search_idBBC_vols) {
@@ -369,7 +369,7 @@ 
 // Add where from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= $db->order($sortfield, $sortorder);
 //$sql.= $db->plimit($conf->liste_limit+1, $offset);
@@ -411,58 +411,58 @@ 
 if ($limit > 0 && $limit != $conf->liste_limit) {
     $param .= '&limit=' . $limit;
 }
-if ($search_idBBC_vols  != '') {
+if ($search_idBBC_vols != '') {
     $param .= '&amp;search_idBBC_vols=' . urlencode($search_idBBC_vols);
 }
-if ($search_date  != '') {
+if ($search_date != '') {
     $param .= '&amp;search_date=' . urlencode($search_date);
 }
-if ($search_lieuD  != '') {
+if ($search_lieuD != '') {
     $param .= '&amp;search_lieuD=' . urlencode($search_lieuD);
 }
-if ($search_lieuA  != '') {
+if ($search_lieuA != '') {
     $param .= '&amp;search_lieuA=' . urlencode($search_lieuA);
 }
-if ($search_heureD  != '') {
+if ($search_heureD != '') {
     $param .= '&amp;search_heureD=' . urlencode($search_heureD);
 }
-if ($search_heureA  != '') {
+if ($search_heureA != '') {
     $param .= '&amp;search_heureA=' . urlencode($search_heureA);
 }
-if ($search_BBC_ballons_idBBC_ballons  != '') {
+if ($search_BBC_ballons_idBBC_ballons != '') {
     $param .= '&amp;search_BBC_ballons_idBBC_ballons=' . urlencode($search_BBC_ballons_idBBC_ballons);
 }
-if ($search_nbrPax  != '') {
+if ($search_nbrPax != '') {
     $param .= '&amp;search_nbrPax=' . urlencode($search_nbrPax);
 }
-if ($search_remarque  != '') {
+if ($search_remarque != '') {
     $param .= '&amp;search_remarque=' . urlencode($search_remarque);
 }
-if ($search_incidents  != '') {
+if ($search_incidents != '') {
     $param .= '&amp;search_incidents=' . urlencode($search_incidents);
 }
-if ($search_fk_type  != '') {
+if ($search_fk_type != '') {
     $param .= '&amp;search_fk_type=' . urlencode($search_fk_type);
 }
 if ($search_fk_pilot != '') {
     $param .= '&amp;search_fk_pilot=' . urlencode($search_fk_pilot);
 }
-if ($search_fk_organisateur  != '') {
+if ($search_fk_organisateur != '') {
     $param .= '&amp;search_fk_organisateur=' . urlencode($search_fk_organisateur);
 }
-if ($search_is_facture  != -1) {
+if ($search_is_facture != -1) {
     $param .= '&amp;search_is_facture=' . urlencode($search_is_facture);
 }
-if ($search_kilometers  != '') {
+if ($search_kilometers != '') {
     $param .= '&amp;search_kilometers=' . urlencode($search_kilometers);
 }
-if ($search_cost  != '') {
+if ($search_cost != '') {
     $param .= '&amp;search_cost=' . urlencode($search_cost);
 }
-if ($search_fk_receiver  != '') {
+if ($search_fk_receiver != '') {
     $param .= '&amp;search_fk_receiver=' . urlencode($search_fk_receiver);
 }
-if ($search_justif_kilometers  != '') {
+if ($search_justif_kilometers != '') {
     $param .= '&amp;search_justif_kilometers=' . urlencode($search_justif_kilometers);
 }
 if ($search_all != '') {
@@ -506,8 +506,8 @@ 
 
 
 $moreHtml = "";
-if($search_all !== ""){
-    $moreHtml = "<p>".$langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all))."</p>";
+if ($search_all !== "") {
+    $moreHtml = "<p>" . $langs->trans(sprintf("La liste est en recherche globale sur : l'identifiant du vol, le nom du pilote, l'immat du ballon, le lieu de Décollage et le lieu d'atterissage : %s", $search_all)) . "</p>";
 }
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords,
@@ -527,7 +527,7 @@ 
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     $moreforfilter .= $hookmanager->resPrint;
 } else {
@@ -542,7 +542,7 @@ 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields,
-    $varpage);    // This also change content of $arrayfields
+    $varpage); // This also change content of $arrayfields
 
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";
@@ -638,7 +638,7 @@ 
 // Hook fields
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListTitle',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param,
@@ -707,7 +707,7 @@ 
 
 if (!empty($arrayfields['t.is_facture']['checked'])) {
     print '<td class="liste_titre">';
-    print '<select name="search_is_facture"><option value="-1" '.($search_is_facture != 1 && $search_is_facture != 0 ? 'selected' : '' ).'></option><option value="1" '.($search_is_facture == 1 ? 'selected' : '' ).'>Facturé</option><option value="0" '.($search_is_facture == 0 ? 'selected' : '' ).'>Ouvert</option></select>';
+    print '<select name="search_is_facture"><option value="-1" ' . ($search_is_facture != 1 && $search_is_facture != 0 ? 'selected' : '') . '></option><option value="1" ' . ($search_is_facture == 1 ? 'selected' : '') . '>Facturé</option><option value="0" ' . ($search_is_facture == 0 ? 'selected' : '') . '>Ouvert</option></select>';
     print '</td>';
 }
 
@@ -752,7 +752,7 @@ 
 // Fields from hook
 $parameters = array('arrayfields' => $arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
     // Date creation
@@ -794,124 +794,124 @@ 
         // Show here line of result
         print '<tr ' . $bc[$var] . '>';
 
-        if (! empty($arrayfields['t.idBBC_vols']['checked']))
+        if (!empty($arrayfields['t.idBBC_vols']['checked']))
         {
-            print '<td>'.$flight->getNomUrl(0).'</td>';
+            print '<td>' . $flight->getNomUrl(0) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.date']['checked']))
+        if (!empty($arrayfields['t.date']['checked']))
         {
             print '<td>';
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
             print '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuD']['checked']))
+        if (!empty($arrayfields['t.lieuD']['checked']))
         {
-            print '<td>'.$obj->lieuD.'</td>';
+            print '<td>' . $obj->lieuD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.lieuA']['checked']))
+        if (!empty($arrayfields['t.lieuA']['checked']))
         {
-            print '<td>'.$obj->lieuA.'</td>';
+            print '<td>' . $obj->lieuA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureD']['checked']))
+        if (!empty($arrayfields['t.heureD']['checked']))
         {
-            print '<td>'.$obj->heureD.'</td>';
+            print '<td>' . $obj->heureD . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.heureA']['checked']))
+        if (!empty($arrayfields['t.heureA']['checked']))
         {
-            print '<td>'.$obj->heureA.'</td>';
+            print '<td>' . $obj->heureA . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
+        if (!empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
         {
-            print '<td>'.$obj->bal.'</td>';
+            print '<td>' . $obj->bal . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.nbrPax']['checked']))
+        if (!empty($arrayfields['t.nbrPax']['checked']))
         {
-            print '<td>'.$obj->nbrPax.'</td>';
+            print '<td>' . $obj->nbrPax . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.remarque']['checked']))
+        if (!empty($arrayfields['t.remarque']['checked']))
         {
-            print '<td>'.$obj->remarque.'</td>';
+            print '<td>' . $obj->remarque . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.incidents']['checked']))
+        if (!empty($arrayfields['t.incidents']['checked']))
         {
-            print '<td>'.$obj->incidents.'</td>';
+            print '<td>' . $obj->incidents . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_type']['checked']))
+        if (!empty($arrayfields['t.fk_type']['checked']))
         {
-            print '<td>'.$obj->flight_type.'</td>';
+            print '<td>' . $obj->flight_type . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_pilot']['checked']))
+        if (!empty($arrayfields['t.fk_pilot']['checked']))
         {
-            print '<td>'.$obj->pilot.'</td>';
+            print '<td>' . $obj->pilot . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_organisateur']['checked']))
+        if (!empty($arrayfields['t.fk_organisateur']['checked']))
         {
-            print '<td>'.$obj->organisator.'</td>';
+            print '<td>' . $obj->organisator . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.is_facture']['checked']))
+        if (!empty($arrayfields['t.is_facture']['checked']))
         {
             $flight->is_facture = $obj->is_facture;
-            print '<td>'.$flight->getLibStatut(3).'</td>';
+            print '<td>' . $flight->getLibStatut(3) . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.kilometers']['checked']))
+        if (!empty($arrayfields['t.kilometers']['checked']))
         {
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
-                print '<td>'.$obj->kilometers.' KM</td>';
-            }else{
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
+                print '<td>' . $obj->kilometers . ' KM</td>';
+            } else {
                 print '<td> - Km</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.cost']['checked']))
+        if (!empty($arrayfields['t.cost']['checked']))
         {
-            if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
-                print '<td>'.$obj->cost.'€</td>';
-            }else{
+            if ($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot) {
+                print '<td>' . $obj->cost . '€</td>';
+            } else {
                 print '<td> - €</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.fk_receiver']['checked']))
+        if (!empty($arrayfields['t.fk_receiver']['checked']))
         {
-            print '<td>'.$obj->receiver.'</td>';
+            print '<td>' . $obj->receiver . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
-        if (! empty($arrayfields['t.justif_kilometers']['checked']))
+        if (!empty($arrayfields['t.justif_kilometers']['checked']))
         {
-            print '<td>'.$obj->justif_kilometers.'</td>';
+            print '<td>' . $obj->justif_kilometers . '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (!$i) $totalarray['nbfield']++;
         }
 
         // Extra fields
@@ -936,7 +936,7 @@ 
         // Fields from hook
         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);
         $reshook = $hookmanager->executeHooks('printFieldListValue',
-            $parameters);    // Note that $action and $object may have been modified by hook
+            $parameters); // Note that $action and $object may have been modified by hook
         print $hookmanager->resPrint;
         // Date creation
         if (!empty($arrayfields['t.datec']['checked'])) {
@@ -1006,7 +1006,7 @@ 
 
 $parameters = array('arrayfields' => $arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter',
-    $parameters);    // Note that $action and $object may have been modified by hook
+    $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print '</table>' . "\n";

Braces +62 added lines, -22 removed lines

@@ -188,10 +188,12 @@ 
     include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
 
     // Purge search criteria
-    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) // All tests are required to be compatible with all browsers
+    if (GETPOST("button_removefilter_x") || GETPOST("button_removefilter.x") || GETPOST("button_removefilter")) {
+        // All tests are required to be compatible with all browsers
     {
 
         $search_idBBC_vols = '';
+    }
         $search_date = '';
         $search_lieuD = '';
         $search_lieuA = '';
@@ -798,7 +800,9 @@ 
         {
             print '<td>'.$flight->getNomUrl(0).'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.date']['checked']))
         {
@@ -806,112 +810,146 @@ 
                 print dol_print_date($db->jdate($obj->date), '%d-%m-%y');
             print '</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.lieuD']['checked']))
         {
             print '<td>'.$obj->lieuD.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.lieuA']['checked']))
         {
             print '<td>'.$obj->lieuA.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.heureD']['checked']))
         {
             print '<td>'.$obj->heureD.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.heureA']['checked']))
         {
             print '<td>'.$obj->heureA.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.BBC_ballons_idBBC_ballons']['checked']))
         {
             print '<td>'.$obj->bal.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.nbrPax']['checked']))
         {
             print '<td>'.$obj->nbrPax.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.remarque']['checked']))
         {
             print '<td>'.$obj->remarque.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.incidents']['checked']))
         {
             print '<td>'.$obj->incidents.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_type']['checked']))
         {
             print '<td>'.$obj->flight_type.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_pilot']['checked']))
         {
             print '<td>'.$obj->pilot.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_organisateur']['checked']))
         {
             print '<td>'.$obj->organisator.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.is_facture']['checked']))
         {
             $flight->is_facture = $obj->is_facture;
             print '<td>'.$flight->getLibStatut(3).'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.kilometers']['checked']))
         {
             if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
                 print '<td>'.$obj->kilometers.' KM</td>';
-            }else{
+            } else{
                 print '<td> - Km</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.cost']['checked']))
         {
             if($user->rights->flightlog->vol->financial || $user->id == $flight->fk_pilot){
                 print '<td>'.$obj->cost.'€</td>';
-            }else{
+            } else{
                 print '<td> - €</td>';
             }
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.fk_receiver']['checked']))
         {
             print '<td>'.$obj->receiver.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
         if (! empty($arrayfields['t.justif_kilometers']['checked']))
         {
             print '<td>'.$obj->justif_kilometers.'</td>';
 
-            if (! $i) $totalarray['nbfield']++;
+            if (! $i) {
+                $totalarray['nbfield']++;
+            }
         }
 
         // Extra fields
@@ -959,9 +997,11 @@ 
 
         // Action column
         print '<td class="nowrap" align="center">';
-        if ($massactionbutton || $massaction)   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+        if ($massactionbutton || $massaction) {
+            // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
         {
             $selected = 0;
+        }
             if (in_array($obj->idBBC_vols, $arrayofselected)) {
                 $selected = 1;
             }

lib/flightLog.lib.php

Doc Comments +3 added lines, -3 removed lines

@@ -149,9 +149,9 @@
 }
 
 /**
- * @param null $year
- * @param null $pilotId
- * @param null $quarter
+ * @param integer $year
+ * @param integer $pilotId
+ * @param integer $quarter
  * @param bool $groupBy
  *
  * @return string

Spacing +28 added lines, -28 removed lines

@@ -337,7 +337,7 @@ 
     $totalQ4 = 0;
 
     $curMonth = date("m", time());
-    $curQuarter = ceil($curMonth/3);
+    $curQuarter = ceil($curMonth / 3);
     $disableColor = 'style="background-color: lightyellow;" title="N/A" data-toggle="tooltip"';
 
     foreach ($kmByQuartil as $id => $rembKm) {
@@ -371,29 +371,29 @@ 
         print '<td>' . $name . '</td>';
         print '<td>' . $firstname . '</td>';
 
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1) . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($flightsQ1 * $unitPriceMission) . '€</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . $sumQ1 . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'>' . ($sumQ1 * $tauxRemb) . '</td>';
-        print '<td'.($curQuarter < 1 ? $disableColor: '').'><b>' . $amoutQ1 . '€</b></td>';
-
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2) . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($flightsQ2 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . $sumQ2 . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'>' . ($sumQ2 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 2 ? $disableColor: '').'><b>' . $amoutQ2 . '€</b></td>';
-
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3) . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($flightsQ3 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . $sumQ3 . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'>' . ($sumQ3 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 3 ? $disableColor: '').'><b>' . $amoutQ3 . '€</b></td>';
-
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4) . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($flightsQ4 * $unitPriceMission) . '€</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . $sumQ4 . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'>' . ($sumQ4 * $tauxRemb) . '</td>';
-        print '<td '.($curQuarter < 4 ? $disableColor: '').'><b>' . $amoutQ4 . '€</b></td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1) . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($flightsQ1 * $unitPriceMission) . '€</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . $sumQ1 . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '>' . ($sumQ1 * $tauxRemb) . '</td>';
+        print '<td' . ($curQuarter < 1 ? $disableColor : '') . '><b>' . $amoutQ1 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2) . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($flightsQ2 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . $sumQ2 . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '>' . ($sumQ2 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 2 ? $disableColor : '') . '><b>' . $amoutQ2 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3) . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($flightsQ3 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . $sumQ3 . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '>' . ($sumQ3 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 3 ? $disableColor : '') . '><b>' . $amoutQ3 . '€</b></td>';
+
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4) . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($flightsQ4 * $unitPriceMission) . '€</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . $sumQ4 . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '>' . ($sumQ4 * $tauxRemb) . '</td>';
+        print '<td ' . ($curQuarter < 4 ? $disableColor : '') . '><b>' . $amoutQ4 . '€</b></td>';
 
         print '<td>' . (($sumFlights * $unitPriceMission) + ($sumKm * $tauxRemb)) . '€</td>';
 
@@ -401,13 +401,13 @@ 
     }
 
     print "<td colspan='6'></td>";
-    print "<td>".price($totalQ1)."€</td>";
+    print "<td>" . price($totalQ1) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ2)."€</td>";
+    print "<td>" . price($totalQ2) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ3)."€</td>";
+    print "<td>" . price($totalQ3) . "€</td>";
     print "<td colspan='4'></td>";
-    print "<td>".price($totalQ4)."€</td>";
+    print "<td>" . price($totalQ4) . "€</td>";
     print "<td></td>";
 
     print '</table>';

class/bbctypes.class.php

Braces +39 added lines, -13 removed lines

@@ -501,7 +501,9 @@ 
         if ($withpicto)
         {
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+            if ($withpicto != 2) {
+                $result.=' ';
+            }
 		}
 		$result.= $link . $this->ref . $linkend;
 		return $result;
@@ -532,33 +534,57 @@ 
 		if ($mode == 0)
 		{
 			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
 		}
 		if ($mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 
 		return "";

Indentation +503 added lines, -503 removed lines

@@ -41,228 +41,228 @@ 
  */
 class Bbctypes extends CommonObject
 {
-	/**
-	 * @var string Id to identify managed objects
-	 */
-	public $element = 'bbctypes';
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'bbc_types';
-
-	/**
-	 * @var BbctypesLine[] Lines
-	 */
-	public $lines = array();
-
-	/**
-	 */
+    /**
+     * @var string Id to identify managed objects
+     */
+    public $element = 'bbctypes';
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'bbc_types';
+
+    /**
+     * @var BbctypesLine[] Lines
+     */
+    public $lines = array();
+
+    /**
+     */
 	
-	public $idType;
-	public $numero;
-	public $nom;
-	public $active;
-	public $fkService;
+    public $idType;
+    public $numero;
+    public $nom;
+    public $active;
+    public $fkService;
 
     /**
      * @var Product
      */
-	public $service;
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		// Clean parameters
+    public $service;
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        $this->db = $db;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        // Clean parameters
 		
-		if (isset($this->idType)) {
-			 $this->idType = trim($this->idType);
-		}
-		if (isset($this->numero)) {
-			 $this->numero = trim($this->numero);
-		}
-		if (isset($this->nom)) {
-			 $this->nom = trim($this->nom);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
-		if (isset($this->fkService)) {
-			 $this->fkService = trim($this->fkService);
-		}
-
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
-		// Insert request
-		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
+        if (isset($this->idType)) {
+                $this->idType = trim($this->idType);
+        }
+        if (isset($this->numero)) {
+                $this->numero = trim($this->numero);
+        }
+        if (isset($this->nom)) {
+                $this->nom = trim($this->nom);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
+        if (isset($this->fkService)) {
+                $this->fkService = trim($this->fkService);
+        }
+
+
+
+        // Check parameters
+        // Put here code to add control on parameters values
+
+        // Insert request
+        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		
-		$sql.= 'numero,';
-		$sql.= 'nom,';
-		$sql.= 'fkService,';
-		$sql.= 'active';
+        $sql.= 'numero,';
+        $sql.= 'nom,';
+        $sql.= 'fkService,';
+        $sql.= 'active';
 
 		
-		$sql .= ') VALUES (';
+        $sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
-		$sql .= ' '.(! isset($this->fkService)?'NULL':"'".$this->db->escape($this->fkService)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+        $sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
+        $sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
+        $sql .= ' '.(! isset($this->fkService)?'NULL':"'".$this->db->escape($this->fkService)."'").',';
+        $sql .= ' '.(! isset($this->active)?'NULL':$this->active);
 
 		
-		$sql .= ')';
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
-
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action to call a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) $error++;
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return $this->id;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id  Id object
-	 * @param string $ref Ref
-	 *
-	 * @return int <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= ' t.idType,';
+        $sql .= ')';
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        if (!$error) {
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+
+            if (!$notrigger) {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action to call a trigger.
+
+                //// Call triggers
+                //$result=$this->call_trigger('MYOBJECT_CREATE',$user);
+                //if ($result < 0) $error++;
+                //// End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return $this->id;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id  Id object
+     * @param string $ref Ref
+     *
+     * @return int <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= ' t.idType,';
 		
-		$sql .= " t.numero,";
-		$sql .= " t.nom,";
-		$sql .= " t.fkService,";
-		$sql .= " t.active";
+        $sql .= " t.numero,";
+        $sql .= " t.nom,";
+        $sql .= " t.fkService,";
+        $sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
-		if (null !== $ref) {
-			$sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
-		} else {
-			$sql .= ' WHERE t.idType = ' . $id;
-		}
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$numrows = $this->db->num_rows($resql);
-			if ($numrows) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->idType;
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
+        if (null !== $ref) {
+            $sql .= ' WHERE t.ref = ' . '\'' . $ref . '\'';
+        } else {
+            $sql .= ' WHERE t.idType = ' . $id;
+        }
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $numrows = $this->db->num_rows($resql);
+            if ($numrows) {
+                $obj = $this->db->fetch_object($resql);
+
+                $this->id = $obj->idType;
 				
-				$this->idType = $obj->idType;
-				$this->numero = $obj->numero;
-				$this->nom = $obj->nom;
-				$this->fkService = $obj->fkService;
-				$this->active = $obj->active;
+                $this->idType = $obj->idType;
+                $this->numero = $obj->numero;
+                $this->nom = $obj->nom;
+                $this->fkService = $obj->fkService;
+                $this->active = $obj->active;
 
-				if($this->fkService){
+                if($this->fkService){
                     $this->service = new Product($this->db);
                     $this->service->fetch($this->fkService);
                 }
-			}
-			$this->db->free($resql);
-
-			if ($numrows) {
-				return 1;
-			} else {
-				return 0;
-			}
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param string $sortorder Sort Order
-	 * @param string $sortfield Sort field
-	 * @param int    $limit     offset limit
-	 * @param int    $offset    offset limit
-	 * @param array  $filter    filter array
-	 * @param string $filtermode filter mode (AND or OR)
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$sql = 'SELECT';
-		$sql .= " t.idType,";
-		$sql .= " t.numero,";
-		$sql .= " t.nom,";
-		$sql .= " t.fkService,";
-		$sql .= " t.active";
+            }
+            $this->db->free($resql);
+
+            if ($numrows) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param string $sortorder Sort Order
+     * @param string $sortfield Sort field
+     * @param int    $limit     offset limit
+     * @param int    $offset    offset limit
+     * @param array  $filter    filter array
+     * @param string $filtermode filter mode (AND or OR)
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $sql = 'SELECT';
+        $sql .= " t.idType,";
+        $sql .= " t.numero,";
+        $sql .= " t.nom,";
+        $sql .= " t.fkService,";
+        $sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+        $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
 
-		// Manage filter
-		$sqlwhere = array();
+        // Manage filter
+        $sqlwhere = array();
 
-		foreach ($filter as $key => $value) {
-		    if(is_string($value)){
+        foreach ($filter as $key => $value) {
+            if(is_string($value)){
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
                 continue;
             }
@@ -273,237 +273,237 @@ 
             }
         }
 
-		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
-		}
+        if (count($sqlwhere) > 0) {
+            $sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+        }
 		
-		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
-		}
-		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
-		}
-		$this->lines = array();
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-
-			while ($obj = $this->db->fetch_object($resql)) {
-				$line = new BbctypesLine();
-
-				$line->id = $obj->idType;
-				$line->idType = $obj->idType;
-				$line->numero = $obj->numero;
-				$line->nom = $obj->nom;
-				$line->fkService = $obj->fkService;
-				$line->active = $obj->active;
-
-				$this->lines[$line->id] = $line;
-			}
-			$this->db->free($resql);
-
-			return $num;
-		} else {
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-
-			return - 1;
-		}
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		// Clean parameters
+        if (!empty($sortfield)) {
+            $sql .= $this->db->order($sortfield,$sortorder);
+        }
+        if (!empty($limit)) {
+            $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+        }
+        $this->lines = array();
+
+        $resql = $this->db->query($sql);
+        if ($resql) {
+            $num = $this->db->num_rows($resql);
+
+            while ($obj = $this->db->fetch_object($resql)) {
+                $line = new BbctypesLine();
+
+                $line->id = $obj->idType;
+                $line->idType = $obj->idType;
+                $line->numero = $obj->numero;
+                $line->nom = $obj->nom;
+                $line->fkService = $obj->fkService;
+                $line->active = $obj->active;
+
+                $this->lines[$line->id] = $line;
+            }
+            $this->db->free($resql);
+
+            return $num;
+        } else {
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+
+            return - 1;
+        }
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        // Clean parameters
 		
-		if (isset($this->idType)) {
-			 $this->idType = trim($this->idType);
-		}
-		if (isset($this->numero)) {
-			 $this->numero = trim($this->numero);
-		}
-		if (isset($this->nom)) {
-			 $this->nom = trim($this->nom);
-		}
-		if (isset($this->fkService)) {
-			 $this->fkService = trim($this->fkService);
-		}
-		if (isset($this->active)) {
-			 $this->active = trim($this->active);
-		}
+        if (isset($this->idType)) {
+                $this->idType = trim($this->idType);
+        }
+        if (isset($this->numero)) {
+                $this->numero = trim($this->numero);
+        }
+        if (isset($this->nom)) {
+                $this->nom = trim($this->nom);
+        }
+        if (isset($this->fkService)) {
+                $this->fkService = trim($this->fkService);
+        }
+        if (isset($this->active)) {
+                $this->active = trim($this->active);
+        }
 
 		
 
-		// Check parameters
-		// Put here code to add a control on parameters values
+        // Check parameters
+        // Put here code to add a control on parameters values
 
-		// Update request
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
+        // Update request
+        $sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
-		$sql .= ' fkService = '.(isset($this->fkService)?"'".$this->db->escape($this->fkService)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+        $sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
+        $sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
+        $sql .= ' fkService = '.(isset($this->fkService)?"'".$this->db->escape($this->fkService)."'":"null").',';
+        $sql .= ' active = '.(isset($this->active)?$this->active:"null");
 
         
-		$sql .= ' WHERE idType=' . $this->id;
-
-		$this->db->begin();
-
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error ++;
-			$this->errors[] = 'Error ' . $this->db->lasterror();
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		if (!$error && !$notrigger) {
-			// Uncomment this and change MYOBJECT to your own tag if you
-			// want this action calls a trigger.
-
-			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-			//// End call triggers
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
-	 *
-	 * @return int <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$error = 0;
-
-		$this->db->begin();
-
-		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' WHERE idType=' . $this->id;
-
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error ++;
-				$this->errors[] = 'Error ' . $this->db->lasterror();
-				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-			}
-		}
-
-		// Commit or rollback
-		if ($error) {
-			$this->db->rollback();
-
-			return - 1 * $error;
-		} else {
-			$this->db->commit();
-
-			return 1;
-		}
-	}
-
-	/**
-	 * Load an object from its id and create a new one in database
-	 *
-	 * @param int $fromid Id of object to clone
-	 *
-	 * @return int New id of clone
-	 */
-	public function createFromClone($fromid)
-	{
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		global $user;
-		$error = 0;
-		$object = new Bbctypes($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetch($fromid);
-		// Reset object
-		$object->id = 0;
-
-		// Clear fields
-		// ...
-
-		// Create clone
-		$result = $object->create($user);
-
-		// Other options
-		if ($result < 0) {
-			$error ++;
-			$this->errors = $object->errors;
-			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-
-			return $object->id;
-		} else {
-			$this->db->rollback();
-
-			return - 1;
-		}
-	}
-
-	/**
-	 *  Return a link to the user card (with optionaly the picto)
-	 * 	Use this->id,this->lastname, this->firstname
-	 *
-	 *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@param	string	$option				On what the link point to
+        $sql .= ' WHERE idType=' . $this->id;
+
+        $this->db->begin();
+
+        $resql = $this->db->query($sql);
+        if (!$resql) {
+            $error ++;
+            $this->errors[] = 'Error ' . $this->db->lasterror();
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        if (!$error && !$notrigger) {
+            // Uncomment this and change MYOBJECT to your own tag if you
+            // want this action calls a trigger.
+
+            //// Call triggers
+            //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+            //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+            //// End call triggers
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user      User that deletes
+     * @param bool $notrigger false=launch triggers after, true=disable triggers
+     *
+     * @return int <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $error = 0;
+
+        $this->db->begin();
+
+        if (!$error) {
+            if (!$notrigger) {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action calls a trigger.
+
+                //// Call triggers
+                //$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+                //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+                //// End call triggers
+            }
+        }
+
+        if (!$error) {
+            $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element;
+            $sql .= ' WHERE idType=' . $this->id;
+
+            $resql = $this->db->query($sql);
+            if (!$resql) {
+                $error ++;
+                $this->errors[] = 'Error ' . $this->db->lasterror();
+                dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+            }
+        }
+
+        // Commit or rollback
+        if ($error) {
+            $this->db->rollback();
+
+            return - 1 * $error;
+        } else {
+            $this->db->commit();
+
+            return 1;
+        }
+    }
+
+    /**
+     * Load an object from its id and create a new one in database
+     *
+     * @param int $fromid Id of object to clone
+     *
+     * @return int New id of clone
+     */
+    public function createFromClone($fromid)
+    {
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        global $user;
+        $error = 0;
+        $object = new Bbctypes($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetch($fromid);
+        // Reset object
+        $object->id = 0;
+
+        // Clear fields
+        // ...
+
+        // Create clone
+        $result = $object->create($user);
+
+        // Other options
+        if ($result < 0) {
+            $error ++;
+            $this->errors = $object->errors;
+            dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+
+            return $object->id;
+        } else {
+            $this->db->rollback();
+
+            return - 1;
+        }
+    }
+
+    /**
+     *  Return a link to the user card (with optionaly the picto)
+     * 	Use this->id,this->lastname, this->firstname
+     *
+     *	@param	int		$withpicto			Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@param	string	$option				On what the link point to
      *  @param	integer	$notooltip			1=Disable tooltip
      *  @param	int		$maxlen				Max length of visible user name
      *  @param  string  $morecss            Add more css on link
-	 *	@return	string						String with URL
-	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
-	{
-		global $langs, $conf, $db;
+     *	@return	string						String with URL
+     */
+    function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+    {
+        global $langs, $conf, $db;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
         global $menumanager;
 
@@ -518,93 +518,93 @@ 
         $link = '<a href="'.DOL_URL_ROOT.'/flightlog/card.php?id='.$this->id.'"';
         $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
         $link.= '>';
-		$linkend='</a>';
+        $linkend='</a>';
 
         if ($withpicto)
         {
             $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
             if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $link . $this->ref . $linkend;
-		return $result;
-	}
+        }
+        $result.= $link . $this->ref . $linkend;
+        return $result;
+    }
 	
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
-
-	/**
-	 *  Renvoi le libelle d'un status donne
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string 			       	Label of status
-	 */
-	function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0)
-		{
-			$prefix='';
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-
-		return "";
-	}
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
+
+    /**
+     *  Renvoi le libelle d'un status donne
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return string 			       	Label of status
+     */
+    function LibStatut($status,$mode=0)
+    {
+        global $langs;
+
+        if ($mode == 0)
+        {
+            $prefix='';
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        if ($mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        if ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        if ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        if ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        if ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+
+        return "";
+    }
 	
 	
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->id = 0;
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->id = 0;
 		
-		$this->idType = '';
-		$this->numero = '';
-		$this->nom = '';
-		$this->fkService = null;
-		$this->active = '';
+        $this->idType = '';
+        $this->numero = '';
+        $this->nom = '';
+        $this->fkService = null;
+        $this->active = '';
 
 		
-	}
+    }
 
     /**
      * @return boolean
@@ -637,14 +637,14 @@ 
  */
 class BbctypesLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
-
-	public $idType;
-	public $numero;
-	public $nom;
-	public $fkService;
-	public $active;
+    /**
+     * @var int ID
+     */
+    public $id;
+
+    public $idType;
+    public $numero;
+    public $nom;
+    public $fkService;
+    public $active;
 }

Spacing +55 added lines, -55 removed lines

@@ -119,18 +119,18 @@ 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		
-		$sql.= 'numero,';
-		$sql.= 'nom,';
-		$sql.= 'fkService,';
-		$sql.= 'active';
+		$sql .= 'numero,';
+		$sql .= 'nom,';
+		$sql .= 'fkService,';
+		$sql .= 'active';
 
 		
 		$sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
-		$sql .= ' '.(! isset($this->fkService)?'NULL':"'".$this->db->escape($this->fkService)."'").',';
-		$sql .= ' '.(! isset($this->active)?'NULL':$this->active);
+		$sql .= ' ' . (!isset($this->numero) ? 'NULL' : $this->numero) . ',';
+		$sql .= ' ' . (!isset($this->nom) ? 'NULL' : "'" . $this->db->escape($this->nom) . "'") . ',';
+		$sql .= ' ' . (!isset($this->fkService) ? 'NULL' : "'" . $this->db->escape($this->fkService) . "'") . ',';
+		$sql .= ' ' . (!isset($this->active) ? 'NULL' : $this->active);
 
 		
 		$sql .= ')';
@@ -139,7 +139,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -162,7 +162,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -212,7 +212,7 @@ 
 				$this->fkService = $obj->fkService;
 				$this->active = $obj->active;
 
-				if($this->fkService){
+				if ($this->fkService) {
                     $this->service = new Product($this->db);
                     $this->service->fetch($this->fkService);
                 }
@@ -228,7 +228,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -244,7 +244,7 @@ 
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
-	public function fetchAll($sortorder='', $sortfield='', $limit=0, $offset=0, array $filter = array(), $filtermode='AND')
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
 	{
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
@@ -256,32 +256,32 @@ 
 		$sql .= " t.active";
 
 		
-		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element. ' as t';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as t';
 
 		// Manage filter
 		$sqlwhere = array();
 
 		foreach ($filter as $key => $value) {
-		    if(is_string($value)){
+		    if (is_string($value)) {
                 $sqlwhere [] = $key . ' LIKE \'%' . $this->db->escape($value) . '%\'';
                 continue;
             }
 
-            if(is_int($value)){
-                $sqlwhere [] = $key . ' = ' .(int)$value;
+            if (is_int($value)) {
+                $sqlwhere [] = $key . ' = ' . (int) $value;
                 continue;
             }
         }
 
 		if (count($sqlwhere) > 0) {
-			$sql .= ' WHERE ' . implode(' '.$filtermode.' ', $sqlwhere);
+			$sql .= ' WHERE ' . implode(' ' . $filtermode . ' ', $sqlwhere);
 		}
 		
 		if (!empty($sortfield)) {
-			$sql .= $this->db->order($sortfield,$sortorder);
+			$sql .= $this->db->order($sortfield, $sortorder);
 		}
 		if (!empty($limit)) {
-		 $sql .=  ' ' . $this->db->plimit($limit + 1, $offset);
+		 $sql .= ' ' . $this->db->plimit($limit + 1, $offset);
 		}
 		$this->lines = array();
 
@@ -308,7 +308,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -352,10 +352,10 @@ 
 		// Update request
 		$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element . ' SET';
 		
-		$sql .= ' numero = '.(isset($this->numero)?$this->numero:"null").',';
-		$sql .= ' nom = '.(isset($this->nom)?"'".$this->db->escape($this->nom)."'":"null").',';
-		$sql .= ' fkService = '.(isset($this->fkService)?"'".$this->db->escape($this->fkService)."'":"null").',';
-		$sql .= ' active = '.(isset($this->active)?$this->active:"null");
+		$sql .= ' numero = ' . (isset($this->numero) ? $this->numero : "null") . ',';
+		$sql .= ' nom = ' . (isset($this->nom) ? "'" . $this->db->escape($this->nom) . "'" : "null") . ',';
+		$sql .= ' fkService = ' . (isset($this->fkService) ? "'" . $this->db->escape($this->fkService) . "'" : "null") . ',';
+		$sql .= ' active = ' . (isset($this->active) ? $this->active : "null");
 
         
 		$sql .= ' WHERE idType=' . $this->id;
@@ -364,7 +364,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -383,7 +383,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -425,7 +425,7 @@ 
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
+				$error++;
 				$this->errors[] = 'Error ' . $this->db->lasterror();
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
@@ -435,7 +435,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -473,7 +473,7 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -486,7 +486,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -501,7 +501,7 @@ 
      *  @param  string  $morecss            Add more css on link
 	 *	@return	string						String with URL
 	 */
-	function getNomUrl($withpicto=0, $option='', $notooltip=0, $maxlen=24, $morecss='')
+	function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $maxlen = 24, $morecss = '')
 	{
 		global $langs, $conf, $db;
         global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -512,20 +512,20 @@ 
         $companylink = '';
 
         $label = '<u>' . $langs->trans("MyModule") . '</u>';
-        $label.= '<div width="100%">';
-        $label.= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+        $label .= '<div width="100%">';
+        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
 
-        $link = '<a href="'.DOL_URL_ROOT.'/flightlog/card.php?id='.$this->id.'"';
-        $link.= ($notooltip?'':' title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip'.($morecss?' '.$morecss:'').'"');
-        $link.= '>';
-		$linkend='</a>';
+        $link = '<a href="' . DOL_URL_ROOT . '/flightlog/card.php?id=' . $this->id . '"';
+        $link .= ($notooltip ? '' : ' title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"');
+        $link .= '>';
+		$linkend = '</a>';
 
         if ($withpicto)
         {
-            $result.=($link.img_object(($notooltip?'':$label), 'label', ($notooltip?'':'class="classfortooltip"')).$linkend);
-            if ($withpicto != 2) $result.=' ';
+            $result .= ($link . img_object(($notooltip ? '' : $label), 'label', ($notooltip ? '' : 'class="classfortooltip"')) . $linkend);
+            if ($withpicto != 2) $result .= ' ';
 		}
-		$result.= $link . $this->ref . $linkend;
+		$result .= $link . $this->ref . $linkend;
 		return $result;
 	}
 	
@@ -535,9 +535,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
 	/**
@@ -547,13 +547,13 @@ 
 	 *  @param  int		$mode          	0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return string 			       	Label of status
 	 */
-	function LibStatut($status,$mode=0)
+	function LibStatut($status, $mode = 0)
 	{
 		global $langs;
 
 		if ($mode == 0)
 		{
-			$prefix='';
+			$prefix = '';
 			if ($status == 1) return $langs->trans('Enabled');
 			if ($status == 0) return $langs->trans('Disabled');
 		}
@@ -564,23 +564,23 @@ 
 		}
 		if ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
 		}
 		if ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		if ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4') . ' ' . $langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5') . ' ' . $langs->trans('Disabled');
 		}
 		if ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled') . ' ' . img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled') . ' ' . img_picto($langs->trans('Disabled'), 'statut5');
 		}
 
 		return "";
@@ -611,7 +611,7 @@ 
      */
     public function isPaxRequired()
     {
-        switch((int)$this->idType){
+        switch ((int) $this->idType) {
             case 1:
             case 2:
                 return true;
@@ -627,7 +627,7 @@ 
      */
     public function isBillingRequired()
     {
-        return (int)$this->idType === 2;
+        return (int) $this->idType === 2;
     }
 
 }

class/card/TabCollection.php

Spacing +3 added lines, -3 removed lines

@@ -45,17 +45,17 @@
      *
      * @return TabCollection
      */
-    public function addTab(Tab $tab){
+    public function addTab(Tab $tab) {
         $this->tabs[] = $tab;
     }
 
     /**
      * @return array
      */
-    public function toArray(){
+    public function toArray() {
         $tabAsArray = [];
 
-        foreach ($this->tabs as $tab){
+        foreach ($this->tabs as $tab) {
             $tabAsArray[] = $tab->toArray();
         }