laudeco / bbc-dolibarr-flightlog

class/bbcvols.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -73,7 +73,7 @@ 
     public $justif_kilometers;
 
     /**
-     * @return int
+     * @return string
      */
     public function getIdBBCVols()
     {
@@ -81,7 +81,7 @@ 
     }
 
     /**
-     * @return int
+     * @return string
      */
     public function getId()
     {

Spacing +1 added lines, -1 removed lines

@@ -701,7 +701,7 @@
 
         $label = '<u>' . $langs->trans("MyModule") . '</u>';
         $label .= '<div width="100%">';
-        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref.'<br>';
+        $label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref . '<br>';
         $label .= '<b>' . $langs->trans('Date') . ':</b> ' . $this->date;
         $label .= '</div>';
 

lib/flightLog.lib.php

Doc Comments +4 added lines, -4 removed lines

@@ -100,9 +100,9 @@ 
  *
  * @param int|string $selected  Preselected Balloon
  * @param string     $htmlname  Name of field in form
- * @param bool       $showempty Add an empty field
- * @param bool       $showimmat
- * @param bool       $showDeclasse
+ * @param integer       $showempty Add an empty field
+ * @param integer       $showimmat
+ * @param integer       $showDeclasse
  */
 function select_balloons($selected = '', $htmlname = 'ballon', $showempty = 0, $showimmat = 0, $showDeclasse = 1)
 {
@@ -158,7 +158,7 @@ 
  *
  * @param int  $quarter
  *
- * @param bool $goupBy
+ * @param bool $groupBy
  *
  * @return string
  */

Spacing +19 added lines, -19 removed lines

@@ -54,7 +54,7 @@ 
 
     $bbcTypes = new Bbctypes($db);
 
-    $bbcTypes->fetchAll('','',0,0, [
+    $bbcTypes->fetchAll('', '', 0, 0, [
         "active" => $active
     ]);
 
@@ -78,7 +78,7 @@ 
 
     print '<select class="flat" name="' . $htmlname . '">';
 
-    if($showempty){
+    if ($showempty) {
         print sprintf('<option selected="%s" value=""></option>', (($selected == "" || $selected = 0 || $selected == -1) ? "selected" : ""));
     }
 
@@ -88,7 +88,7 @@ 
             print ' selected="selected"';
         }
         print '>';
-        echo "T".$flightType->numero . '-' . $flightType->nom;
+        echo "T" . $flightType->numero . '-' . $flightType->nom;
         print "</option>";
     }
 
@@ -113,7 +113,7 @@ 
     print '<select class="flat" name="' . $htmlname . '">';
 
     print '<option value=""';
-    if ($selected == -1 || $selected == ''|| $selected == 0) {
+    if ($selected == -1 || $selected == '' || $selected == 0) {
         print ' selected="selected"';
     }
     print '>&nbsp;</option>';
@@ -162,17 +162,17 @@ 
  *
  * @return string
  */
-function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true){
+function generateQuarterQuery($year = null, $pilotId = null, $quarter = null, $groupBy = true) {
 
     global $db;
 
     $sql = "SELECT USR.rowid, USR.lastname, USR.firstname, QUARTER(VOL.date) as quartil ";
 
-    if($groupBy){
-        $sql.= " , SUM(VOL.kilometers) as SUM";
-        $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight";
-    }else{
-        $sql.= " , VOL.*";
+    if ($groupBy) {
+        $sql .= " , SUM(VOL.kilometers) as SUM";
+        $sql .= " , COUNT(VOL.idBBC_vols) as nbrFlight";
+    } else {
+        $sql .= " , VOL.*";
     }
 
     $sql .= " FROM llx_bbc_vols as VOL";
@@ -182,15 +182,15 @@ 
     $sql .= " AND YEAR(VOL.date) = " . ($year ?: 'YEAR(NOW())');
     $sql .= " AND ( VOL.fk_type = 1 OR VOL.fk_type = 2 ) ";
 
-    if($pilotId){
-        $sql .= " AND USR.rowid = ".$pilotId;
+    if ($pilotId) {
+        $sql .= " AND USR.rowid = " . $pilotId;
     }
 
-    if($quarter){
-        $sql .= " AND QUARTER(VOL.date) = ".$quarter;
+    if ($quarter) {
+        $sql .= " AND QUARTER(VOL.date) = " . $quarter;
     }
 
-    if($groupBy){
+    if ($groupBy) {
         $sql .= " GROUP BY QUARTER(VOL.date), VOL.fk_pilot";
     }
     $sql .= " ORDER BY QUARTER(VOL.date), VOL.fk_pilot";
@@ -205,7 +205,7 @@ 
  *
  * @return array
  */
-function findFlightByPilotAndQuarter($pilotId, $year, $quarter){
+function findFlightByPilotAndQuarter($pilotId, $year, $quarter) {
     global $db;
 
     $sql = generateQuarterQuery($year, $pilotId, $quarter, false);
@@ -329,7 +329,7 @@ 
     print '</tr>';
 
     foreach ($kmByQuartil as $id => $rembKm) {
-        if(!$user->rights->flightLog->vol->detail && $id != $user->id){
+        if (!$user->rights->flightLog->vol->detail && $id != $user->id) {
             continue;
         }
 
@@ -481,10 +481,10 @@ 
 
     $graphData = new GraphicalData();
 
-    foreach(getFlightYears() as $flightYear){
+    foreach (getFlightYears() as $flightYear) {
         $pieceData = new YearGraphicalData($flightYear);
 
-        foreach($flightTypes as $flightType){
+        foreach ($flightTypes as $flightType) {
             $pieceData->addType(new GraphicalType($flightType->id, $flightType->nom));
         }
 

Braces +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
     if($groupBy){
         $sql.= " , SUM(VOL.kilometers) as SUM";
         $sql.= " , COUNT(VOL.idBBC_vols) as nbrFlight";
-    }else{
+    } else{
         $sql.= " , VOL.*";
     }
 

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";

readFlightsBalloon.php

Spacing +10 added lines, -10 removed lines

@@ -45,8 +45,8 @@ 
     //il est titulaire d'un ballon
     $query = 'SELECT * FROM llx_bbc_ballons';
     if (!$user->rights->flightLog->vol->detail) {
-        $query.= ' WHERE `fk_responsable` = ' . $user->id;
-        $query.= ' OR `fk_co_responsable` = ' . $user->id;
+        $query .= ' WHERE `fk_responsable` = ' . $user->id;
+        $query .= ' OR `fk_co_responsable` = ' . $user->id;
     }
     $resql = $db->query($query);
     if ($resql) {
@@ -85,15 +85,15 @@ 
     $titulaire->fetch($ballon->fk_responsable);
     //flight with balloon ID
     $query = 'SELECT *, TIMEDIFF(heureA,heureD) AS time FROM llx_bbc_vols';
-    $query.= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
+    $query .= ' WHERE `BBC_ballons_idBBC_ballons` = ' . $ballon->id;
     if ($datep) {
-        $query.= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
+        $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
     }
     if ($datef) {
-        $query.= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
+        $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
     }
 
-    $query.= ' ORDER BY date';
+    $query .= ' ORDER BY date';
 
     $resql = $db->query($query);
 }
@@ -126,8 +126,8 @@ 
         select_balloons($idBallon);
     } else {
         $query2 = 'SELECT * FROM llx_bbc_ballons';
-        $query2.= ' WHERE `fk_responsable` = ' . $user->id;
-        $query2.= ' OR `fk_co_responsable` = ' . $user->id;
+        $query2 .= ' WHERE `fk_responsable` = ' . $user->id;
+        $query2 .= ' OR `fk_co_responsable` = ' . $user->id;
         $resql2 = $db->query($query2);
         if ($resql2) {
             $num = $db->num_rows($resql2);
@@ -217,7 +217,7 @@ 
                 print '<td>' . $obj->fk_type . '</td>';
                 print '<td>' . $obj->date . '</td>';
                 print '<td>' . $ballon->immat . '</td>';
-                print '<td>' . $pilot->getNomUrl(). '</td>';
+                print '<td>' . $pilot->getNomUrl() . '</td>';
                 print '<td>' . $obj->lieuD . '</td>';
                 print '<td>' . $obj->lieuA . '</td>';
                 print '<td>' . $obj->heureD . '</td>';
@@ -231,7 +231,7 @@ 
                 if ($user->rights->flightLog->vol->status) {
                     $vol = new Bbcvols($db);
                     $vol->fetch($obj->idBBC_vols);
-                    print '<td>' . $vol->getStatus().'</td>';
+                    print '<td>' . $vol->getStatus() . '</td>';
                 }
             }
             print'</tr>';

Braces +6 added lines, -4 removed lines

@@ -169,15 +169,17 @@
         print '</tr>';
     }
     // Date start
-    if (GETPOST('datep', 'int', 1))
-        $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+    if (GETPOST('datep', 'int', 1)) {
+            $datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+    }
     print '<tr><td width="30%" nowrap="nowrap"><span>Debut</span></td><td>';
     $form->select_date($datep, 'ap', 0, 0, 1, "readBalloon", 1, 1, 0, 0);
     print '</td></tr>';
 
     // Date end
-    if (GETPOST('datef', 'int', 1))
-        $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+    if (GETPOST('datef', 'int', 1)) {
+            $datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+    }
     print '<tr><td>Fin</span></td><td>';
     $form->select_date($datef, 'p2', 0, 0, 1, "readBalloon", 1, 1, 0, 0);
     print '</td></tr>';

readFlightsPilot.php

Spacing +2 added lines, -2 removed lines

@@ -60,10 +60,10 @@
 $query = 'SELECT *,TIMEDIFF(heureA,heureD) AS time  FROM llx_bbc_vols WHERE 1=1';
 
 if ($datep) {
-    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc'). '\'';
+    $query .= ' AND date >= \'' . dol_print_date($datep, 'dayrfc') . '\'';
 }
 if ($datef) {
-    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc'). '\'';
+    $query .= ' AND date <= \'' . dol_print_date($datef, 'dayrfc') . '\'';
 }
 
 $query .= ' AND `fk_pilot` = ' . $bbcUser->id;

card.php

Spacing +20 added lines, -20 removed lines

@@ -68,7 +68,7 @@ 
 $langs->load("other");
 
 // Get parameters
-$id = GETPOST('id', 'int')?: GETPOST('idBBC_vols', 'int');
+$id = GETPOST('id', 'int') ?: GETPOST('idBBC_vols', 'int');
 $action = GETPOST('action', 'alpha');
 $cancel = GETPOST('cancel');
 $backtopage = GETPOST('backtopage');
@@ -123,7 +123,7 @@ 
 $extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
-include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php';  // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
 $hookmanager->initHooks(array('bbcvols'));
@@ -142,7 +142,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');
 }
@@ -231,8 +231,8 @@ 
         $object->id = $object->idBBC_vols;
         $object->lieuD = GETPOST('lieuD', 'alpha');
         $object->lieuA = GETPOST('lieuA', 'alpha');
-        $object->heureD = GETPOST('heureD_h', 'int').":".GETPOST('heureD_m', 'int').":00";
-        $object->heureA = GETPOST('heureA_h', 'int').":".GETPOST('heureA_m', 'int').":00";
+        $object->heureD = GETPOST('heureD_h', 'int') . ":" . GETPOST('heureD_m', 'int') . ":00";
+        $object->heureA = GETPOST('heureA_h', 'int') . ":" . GETPOST('heureA_m', 'int') . ":00";
         $object->BBC_ballons_idBBC_ballons = GETPOST('BBC_ballons_idBBC_ballons', 'int');
         $object->nbrPax = GETPOST('nbrPax', 'alpha');
         $object->remarque = GETPOST('remarque', 'alpha');
@@ -254,12 +254,12 @@ 
                 null, 'errors');
         }
 
-        if(!dol_validElement($object->lieuD)){
+        if (!dol_validElement($object->lieuD)) {
             $error++;
             setEventMessage("Erreur le champ : lieu de décollage", 'errors');
         }
 
-        if(!dol_validElement($object->lieuA)){
+        if (!dol_validElement($object->lieuA)) {
             $error++;
             setEventMessage("Erreur le champ : lieu d'atterissage", 'errors');
         }
@@ -271,12 +271,12 @@ 
             setEventMessage("Erreur avec les heures de vol", 'errors');
         }
 
-        if(!is_numeric($object->nbrPax) || $object->nbrPax < 0 ){
+        if (!is_numeric($object->nbrPax) || $object->nbrPax < 0) {
             $error++;
             setEventMessage("Erreur le champ : nombre de passagers", 'errors');
         }
 
-        if(!$pilotService->isPilot($object->fk_pilot)){
+        if (!$pilotService->isPilot($object->fk_pilot)) {
             $error++;
             setEventMessage("Le pilote selectionne n'est pas pilote", 'errors');
         }
@@ -420,18 +420,18 @@ 
         select_balloons($object->BBC_ballons_idBBC_ballons, "BBC_ballons_idBBC_ballons");
     print "</td></tr>";
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("FieldnbrPax") . "</td><td><input class=\"flat\" type=\"number\" name=\"nbrPax\" value=\"" . $object->nbrPax . "\"></td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">".$object->remarque."</textarea></td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">".$object->incidents."</textarea></td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldremarque") . "</td><td><textarea class=\"flat\" name=\"remarque\">" . $object->remarque . "</textarea></td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldincidents") . "</td><td><textarea class=\"flat\" name=\"incidents\">" . $object->incidents . "</textarea></td></tr>";
     print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_type") . "</td><td>";
         select_flight_type($object->fk_type, "fk_type");
     print "</td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>".$form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1)."</td></tr>";
-    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>".$form->select_dolusers($object->fk_organisateur, "fk_organisateur")."</td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_pilot") . "</td><td>" . $form->select_dolusers($object->fk_pilot, "fk_pilot", 0, '', 0, '', '', 0, 0, 0, '', 0, '', '', 1) . "</td></tr>";
+    print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_organisateur") . "</td><td>" . $form->select_dolusers($object->fk_organisateur, "fk_organisateur") . "</td></tr>";
 
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldkilometers") . "</td><td><input class=\"flat\" type=\"number\" name=\"kilometers\" value=\"" . $object->kilometers . "\"></td></tr>";
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldcost") . "</td><td><input class=\"flat\" type=\"number\" name=\"cost\" value=\"" . $object->cost . "\"></td></tr>";
-        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver,"fk_receiver", true ) . "</td></tr>";
+        print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldfk_receiver") . "</td><td>" . $form->select_dolusers($object->fk_receiver, "fk_receiver", true) . "</td></tr>";
         print "<tr><td class=\"fieldrequired\">" . $langs->trans("Fieldjustif_kilometers") . "</td><td><textarea class=\"flat\" name=\"justif_kilometers\">" . $object->justif_kilometers . "</textarea></td></tr>";
     }
     print '</table>';
@@ -453,7 +453,7 @@ 
 
     print load_fiche_titre($langs->trans($pageTitle));
 
-    $linkback = '<a href="'.DOL_URL_ROOT.'/flightLog/list.php">'.$langs->trans("BackToList").'</a>';
+    $linkback = '<a href="' . DOL_URL_ROOT . '/flightLog/list.php">' . $langs->trans("BackToList") . '</a>';
     //dol_banner_tab($object, 'idBBC_vols', $linkback);
     print $form->showrefnav($object, "idBBC_vols", $linkback, true, "idBBC_vols");
     dol_fiche_head();
@@ -481,13 +481,13 @@ 
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_pilot") . '</td><td>' . $pilot->getNomUrl(1) . '</td></tr>';
     print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_organisateur") . '</td><td>' . $organisator->getNomUrl(1) . '</td></tr>';
 
-    if($user->rights->flightLog->vol->financial){
+    if ($user->rights->flightLog->vol->financial) {
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldis_facture") . '</td><td>' . $object->is_facture . '</td></tr>';
     }
 
-    if($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
+    if ($user->rights->flightLog->vol->financial || $user->id == $object->fk_pilot) {
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldkilometers") . '</td><td>' . $object->kilometers . ' KM</td></tr>';
-        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost ." ". $langs->getCurrencySymbol($conf->currency).'</td></tr>';
+        print '<tr><td class="fieldrequired">' . $langs->trans("Fieldcost") . '</td><td>' . $object->cost . " " . $langs->getCurrencySymbol($conf->currency) . '</td></tr>';
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldfk_receiver") . '</td><td>' . $receiver->getNomUrl(1) . '</td></tr>';
         print '<tr><td class="fieldrequired">' . $langs->trans("Fieldjustif_kilometers") . '</td><td>' . $object->justif_kilometers . '</td></tr>';
     }
@@ -500,7 +500,7 @@ 
     print '<div class="tabsAction">' . "\n";
     $parameters = array();
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object,
-        $action);    // Note that $action and $object may have been modified by hook
+        $action); // Note that $action and $object may have been modified by hook
     if ($reshook < 0) {
         setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
     }

generateExpenseNote.php

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/>
 

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 {

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/bbctypes.class.php

Indentation +489 added lines, -489 removed lines

@@ -41,211 +41,211 @@ 
  */
 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;
-
-	/**
-	 * 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 $idType;
+    public $numero;
+    public $nom;
+    public $active;
+
+    /**
+     * 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);
-		}
-
-
-
-		// 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);
+        }
+
+
+
+        // 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.= 'active';
+        $sql.= 'numero,';
+        $sql.= 'nom';
+        $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->active)?'NULL':$this->active);
+        $sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
+        $sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
+        $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.active";
+        $sql .= " t.numero,";
+        $sql .= " t.nom,";
+        $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->active = $obj->active;
+                $this->idType = $obj->idType;
+                $this->numero = $obj->numero;
+                $this->nom = $obj->nom;
+                $this->active = $obj->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.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.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;
             }
@@ -256,232 +256,232 @@ 
             }
         }
 
-		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->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->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->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->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 .= ' 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 .= ' 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;
 
@@ -496,90 +496,90 @@ 
         $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');
-		}
-	}
+    /**
+     *  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');
+        }
+    }
 	
 	
-	/**
-	 * 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->active = '';
+        $this->idType = '';
+        $this->numero = '';
+        $this->nom = '';
+        $this->active = '';
 
 		
-	}
+    }
 
 }
 
@@ -588,21 +588,21 @@ 
  */
 class BbctypesLine
 {
-	/**
-	 * @var int ID
-	 */
-	public $id;
-	/**
-	 * @var mixed Sample line property 1
-	 */
+    /**
+     * @var int ID
+     */
+    public $id;
+    /**
+     * @var mixed Sample line property 1
+     */
 	
-	public $idType;
-	public $numero;
-	public $nom;
-	public $active;
-
-	/**
-	 * @var mixed Sample line property 2
-	 */
+    public $idType;
+    public $numero;
+    public $nom;
+    public $active;
+
+    /**
+     * @var mixed Sample line property 2
+     */
 	
 }

Spacing +49 added lines, -49 removed lines

@@ -110,16 +110,16 @@ 
 		// Insert request
 		$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . $this->table_element . '(';
 		
-		$sql.= 'numero,';
-		$sql.= 'nom';
-		$sql.= 'active';
+		$sql .= 'numero,';
+		$sql .= 'nom';
+		$sql .= 'active';
 
 		
 		$sql .= ') VALUES (';
 		
-		$sql .= ' '.(! isset($this->numero)?'NULL':$this->numero).',';
-		$sql .= ' '.(! isset($this->nom)?'NULL':"'".$this->db->escape($this->nom)."'").',';
-		$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->active) ? 'NULL' : $this->active);
 
 		
 		$sql .= ')';
@@ -128,7 +128,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -151,7 +151,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -212,7 +212,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -228,7 +228,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);
 
@@ -239,32 +239,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();
 
@@ -290,7 +290,7 @@ 
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -331,9 +331,9 @@ 
 		// 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 .= ' 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 .= ' active = ' . (isset($this->active) ? $this->active : "null");
 
         
 		$sql .= ' WHERE idType=' . $this->id;
@@ -342,7 +342,7 @@ 
 
 		$resql = $this->db->query($sql);
 		if (!$resql) {
-			$error ++;
+			$error++;
 			$this->errors[] = 'Error ' . $this->db->lasterror();
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -361,7 +361,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -403,7 +403,7 @@ 
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
-				$error ++;
+				$error++;
 				$this->errors[] = 'Error ' . $this->db->lasterror();
 				dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 			}
@@ -413,7 +413,7 @@ 
 		if ($error) {
 			$this->db->rollback();
 
-			return - 1 * $error;
+			return -1 * $error;
 		} else {
 			$this->db->commit();
 
@@ -451,7 +451,7 @@ 
 
 		// Other options
 		if ($result < 0) {
-			$error ++;
+			$error++;
 			$this->errors = $object->errors;
 			dol_syslog(__METHOD__ . ' ' . join(',', $this->errors), LOG_ERR);
 		}
@@ -464,7 +464,7 @@ 
 		} else {
 			$this->db->rollback();
 
-			return - 1;
+			return -1;
 		}
 	}
 
@@ -479,7 +479,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;
@@ -490,20 +490,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;
 	}
 	
@@ -513,9 +513,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);
 	}
 
 	/**
@@ -525,13 +525,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');
 		}
@@ -542,23 +542,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');
 		}
 	}
 	

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');
+			}
 		}
 	}