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();
         }
 

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

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();
         }
 

lib/flightLog.lib.php

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

generateBilling.php

Braces +5 added lines, -2 removed lines

@@ -613,9 +613,12 @@
 
         <?php if ($year >= $currentYear || !$t1->service || !$t2->service || !$t3->service || !$t4->service || !$t5->service || !$t6->service || !$t7->service) : ?>
             <a class="butActionRefused" href="#">Générer</a>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <button class="butAction" type="submit">Générer</button>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
 
     </form>
 

Spacing +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
                 $adherent = new Adherent($db);
                 $adherent->fetch($expenseNoteUser->fk_member);
 
-                $addBonus = (int)$additionalBonus[$currentMissionUserId];
+                $addBonus = (int) $additionalBonus[$currentMissionUserId];
                 if ($addBonus < 0) {
                     dol_htmloutput_mesg("Facture ignorée " . $adherent->getFullName($langs), '', 'warning');
                     continue;
@@ -350,7 +350,7 @@ 
                 $object->insert_discount($discountid);
 
                 //Instructeur / examinateur
-                if($value['orga_T6']['count'] > 0){
+                if ($value['orga_T6']['count'] > 0) {
                     $pu_ht = price2num($value['orga_T6']['count'] * 50, 'MU');
                     $desc = $year . " - Vols dont vous êtes instructeur/examinateur - (" . $value['orga_T6']['count'] . " * 50)";
 
@@ -359,7 +359,7 @@ 
                 }
 
                 //Additional bonus
-                if ((int)$addBonus > 0) {
+                if ((int) $addBonus > 0) {
 
                     $pu_ht = price2num($addBonus, 'MU');