alxarafe / alixar

public/htdocs/expensereport/card.php

Spacing +2 added lines, -2 removed lines

@@ -153,7 +153,7 @@ 
 }
 $result = restrictedArea($user, 'expensereport', $object->id, 'expensereport');
 
-$permissiontoadd = $user->hasRight('expensereport', 'creer');   // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*
@@ -2384,7 +2384,7 @@ 
 
                         // Quantity
                         print '<td class="right">';
-                        print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="' . dol_escape_htmltag($line->qty) . '" />';  // We must be able to enter decimal qty
+                        print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="' . dol_escape_htmltag($line->qty) . '" />'; // We must be able to enter decimal qty
                         print '</td>';
 
                         //print '<td class="right">'.$langs->trans('AmountHT').'</td>';

public/htdocs/expensereport/payment/list.php

Spacing +3 added lines, -3 removed lines

@@ -67,7 +67,7 @@ 
 $search_date_endday     = GETPOSTINT('search_date_endday');
 $search_date_endmonth   = GETPOSTINT('search_date_endmonth');
 $search_date_endyear    = GETPOSTINT('search_date_endyear');
-$search_date_start      = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);  // Use tzserver
+$search_date_start      = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end        = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_user            = GETPOST('search_user', 'alpha');
 $search_payment_type    = GETPOST('search_payment_type');
@@ -114,7 +114,7 @@ 
     'pndf.amount'           => array('label' => "Amount", 'checked' => 1, 'position' => 70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentexpensereportlist'));
@@ -420,7 +420,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

public/htdocs/expensereport/list.php

Spacing +4 added lines, -4 removed lines

@@ -117,7 +117,7 @@ 
 $search_date_startendday    = GETPOSTINT('search_date_startendday');
 $search_date_startendmonth  = GETPOSTINT('search_date_startendmonth');
 $search_date_startendyear   = GETPOSTINT('search_date_startendyear');
-$search_date_start          = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);  // Use tzserver
+$search_date_start          = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_startend       = dol_mktime(23, 59, 59, $search_date_startendmonth, $search_date_startendday, $search_date_startendyear);
 
 $search_date_endday         = GETPOSTINT('search_date_endday');
@@ -126,10 +126,10 @@ 
 $search_date_endendday      = GETPOSTINT('search_date_endendday');
 $search_date_endendmonth    = GETPOSTINT('search_date_endendmonth');
 $search_date_endendyear     = GETPOSTINT('search_date_endendyear');
-$search_date_end            = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear);    // Use tzserver
+$search_date_end            = dol_mktime(0, 0, 0, $search_date_endmonth, $search_date_endday, $search_date_endyear); // Use tzserver
 $search_date_endend         = dol_mktime(23, 59, 59, $search_date_endendmonth, $search_date_endendday, $search_date_endendyear);
 
-$optioncss    = GETPOST('optioncss', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 if ($search_status == '') {
     $search_status = -1;
@@ -588,7 +588,7 @@ 
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN'));  // This also change content of $arrayfields with user setup
+$htmlofselectarray = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')); // This also change content of $arrayfields with user setup
 $selectedfields = ($mode != 'kanban' ? $htmlofselectarray : '');
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 

public/htdocs/expensereport/document.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
     }
 }
 
-$permissiontoadd = $user->hasRight('expensereport', 'creer');   // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->hasRight('expensereport', 'creer'); // Used by the include of actions_dellink.inc.php
 
 
 /*

public/htdocs/expensereport/class/api_expensereports.class.php

Indentation +2 added lines, -2 removed lines

@@ -717,7 +717,7 @@ 
 
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      * Clean sensible object datas
      *
@@ -726,7 +726,7 @@ 
      */
     protected function _cleanObjectDatas($object)
     {
-		// phpcs:enable
+        // phpcs:enable
         $object = parent::_cleanObjectDatas($object);
 
         unset($object->fk_statut);

public/htdocs/expensereport/class/expensereport.class.php

Indentation +22 added lines, -22 removed lines

@@ -767,7 +767,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Classify the expense report as paid
      *
@@ -780,7 +780,7 @@ 
      */
     public function set_paid($id, $fuser, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_paid is deprecated, use setPaid instead", LOG_NOTICE);
         return $this->setPaid($id, $fuser, $notrigger);
     }
@@ -846,7 +846,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the label of a status
      *
@@ -856,7 +856,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $labelStatus = $langs->transnoentitiesnoconv($this->labelStatus[$status]);
@@ -986,7 +986,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * fetch_line_by_project
      *
@@ -996,7 +996,7 @@ 
      */
     public function fetch_line_by_project($projectid, $user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         $langs->load('trips');
@@ -1088,7 +1088,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * fetch_lines
      *
@@ -1096,7 +1096,7 @@ 
      */
     public function fetch_lines()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->lines = array();
 
         $sql = ' SELECT de.rowid, de.comments, de.qty, de.value_unit, de.date, de.rang,';
@@ -1426,7 +1426,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * set_save_from_refuse
      *
@@ -1435,7 +1435,7 @@ 
      */
     public function set_save_from_refuse($fuser)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Sélection de la date de début de la NDF
         $sql = 'SELECT date_debut';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element;
@@ -1577,7 +1577,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * set_unpaid
      *
@@ -1589,7 +1589,7 @@ 
      */
     public function set_unpaid($fuser, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_unpaid is deprecated, use setUnpaid instead", LOG_NOTICE);
         return $this->setUnpaid($fuser, $notrigger);
     }
@@ -1645,7 +1645,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * set_cancel
      *
@@ -1656,7 +1656,7 @@ 
      */
     public function set_cancel($fuser, $detail, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
         $this->date_cancel = $this->db->idate(dol_now());
         if ($this->status != self::STATUS_CANCELED) {
@@ -1879,7 +1879,7 @@ 
         return $result;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update total of an expense report when you add a line.
      *
@@ -1889,7 +1889,7 @@ 
      */
     public function update_totaux_add($ligne_total_ht, $ligne_total_tva)
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->total_ht += (float) $ligne_total_ht;
         $this->total_tva += (float) $ligne_total_tva;
         $this->total_ttc += $this->total_tva;
@@ -2375,7 +2375,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * periode_existe
      *
@@ -2388,7 +2388,7 @@ 
     {
         global $conf;
 
-		// phpcs:enable
+        // phpcs:enable
         $sql = "SELECT rowid, date_debut, date_fin";
         $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
         $sql .= " WHERE entity = " . ((int) $conf->entity); // not shared, only for the current entity
@@ -2429,7 +2429,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return list of people with permission to validate expense reports.
      * Search for permission "approve expense report"
@@ -2438,7 +2438,7 @@ 
      */
     public function fetch_users_approver_expensereport()
     {
-		// phpcs:enable
+        // phpcs:enable
         $users_validator = array();
 
         $sql = "SELECT DISTINCT ur.fk_user";
@@ -2564,7 +2564,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2574,7 +2574,7 @@ 
      */
     public function load_board($user, $option = 'topay')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         if ($user->socid) {

Spacing +18 added lines, -18 removed lines

@@ -247,8 +247,8 @@ 
      */
     public $fk_user_approve;
 
-    public $localtax1;  // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
-    public $localtax2;  // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
+    public $localtax1; // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
+    public $localtax2; // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
     /**
      * Draft status
@@ -339,8 +339,8 @@ 
         $this->total_tva = 0;
         $this->total_localtax1 = 0;
         $this->total_localtax2 = 0;
-        $this->localtax1 = 0;   // For backward compatibility
-        $this->localtax2 = 0;   // For backward compatibility
+        $this->localtax1 = 0; // For backward compatibility
+        $this->localtax2 = 0; // For backward compatibility
         $this->modepaymentid = 0;
 
         // List of language codes for status
@@ -697,8 +697,8 @@ 
                 $this->total_ht     = $obj->total_ht;
                 $this->total_tva    = $obj->total_tva;
                 $this->total_ttc    = $obj->total_ttc;
-                $this->localtax1    = $obj->total_localtax1;        // For backward compatibility
-                $this->localtax2    = $obj->total_localtax2;        // For backward compatibility
+                $this->localtax1    = $obj->total_localtax1; // For backward compatibility
+                $this->localtax2    = $obj->total_localtax2; // For backward compatibility
                 $this->total_localtax1 = $obj->total_localtax1;
                 $this->total_localtax2 = $obj->total_localtax2;
 
@@ -1165,7 +1165,7 @@ 
 
                 $deplig->rule_warning_message = $objp->rule_warning_message;
 
-                $deplig->rang               = $objp->rang;
+                $deplig->rang = $objp->rang;
 
                 $this->lines[$i] = $deplig;
 
@@ -1961,8 +1961,8 @@ 
             $this->line = new ExpenseReportLine($this->db);
 
             // We don't know seller and buyer for expense reports
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
             $buyer = new Societe($this->db);
 
             $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2044,8 +2044,8 @@ 
 
         // We don't know seller and buyer for expense reports
         if (!is_object($seller)) {
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
         }
 
         $expensereportrule = new ExpenseReportRule($db);
@@ -2129,8 +2129,8 @@ 
 
         // We don't know seller and buyer for expense reports
         if (!is_object($seller)) {
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
         }
 
         $expenseik = new ExpenseReportIk($this->db);
@@ -2224,10 +2224,10 @@ 
             $type = 0; // TODO What if type is service ?
 
             // We don't know seller and buyer for expense reports
-            $seller = $mysoc;           // We use same than current company (expense report are often done in same country)
-            $seller->tva_assuj = 1;     // Most seller uses vat
-            $seller->localtax1_assuj = $mysoc->localtax1_assuj;     // We don't know, we reuse the state of company
-            $seller->localtax2_assuj = $mysoc->localtax1_assuj;     // We don't know, we reuse the state of company
+            $seller = $mysoc; // We use same than current company (expense report are often done in same country)
+            $seller->tva_assuj = 1; // Most seller uses vat
+            $seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
+            $seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
             $buyer = new Societe($this->db);
 
             $localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -3165,7 +3165,7 @@ 
         } elseif ($mode == 'mon' || $mode == 'EX_MON') {
             $sql .= " AND DATE_FORMAT(d.date, '%Y-%m') = '" . dol_print_date($this->date, '%Y-%m') . "'"; // @todo DATE_FORMAT is forbidden
         } elseif ($mode == 'year' || $mode == 'EX_YEA') {
-            $sql .= " AND DATE_FORMAT(d.date, '%Y') = '" . dol_print_date($this->date, '%Y') . "'";     // @todo DATE_FORMAT is forbidden
+            $sql .= " AND DATE_FORMAT(d.date, '%Y') = '" . dol_print_date($this->date, '%Y') . "'"; // @todo DATE_FORMAT is forbidden
         }
 
         dol_syslog('ExpenseReportLine::getExpAmount');

public/htdocs/expensereport/class/expensereport_ik.class.php

Spacing +1 added lines, -1 removed lines

@@ -199,7 +199,7 @@
         $default_range = (int) $userauthor->default_range; // if not defined, then 0
         $ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
         // prevent out of range -1 indice
-        $indice = $default_range  - 1;
+        $indice = $default_range - 1;
         // subtract 1 because array start from 0
         if (empty($ranges) || $indice < 0 || !isset($ranges[$indice])) {
             return false;

public/htdocs/expensereport/class/paymentexpensereport.class.php

Indentation +8 added lines, -8 removed lines

@@ -297,7 +297,7 @@ 
         }
     }
 
-	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
     /**
      *  Update database
      *
@@ -307,7 +307,7 @@ 
      */
     public function update($user = null, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         // Clean parameters
@@ -375,7 +375,7 @@ 
         }
     }
 
-	// phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
+    // phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter
     /**
      *  Delete object in database
      *
@@ -385,7 +385,7 @@ 
      */
     public function delete($user, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         $this->db->begin();
@@ -487,7 +487,7 @@ 
         return '';
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the label of a given status
      *
@@ -497,7 +497,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         //global $langs;
 
         return '';
@@ -635,7 +635,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update link between the expense report payment and the generated line in llx_bank
      *
@@ -644,7 +644,7 @@ 
      */
     public function update_fk_bank($id_bank)
     {
-		// phpcs:enable
+        // phpcs:enable
         $sql = "UPDATE " . MAIN_DB_PREFIX . "payment_expensereport SET fk_bank = " . ((int) $id_bank) . " WHERE rowid = " . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::update_fk_bank", LOG_DEBUG);

Spacing +1 added lines, -1 removed lines

@@ -211,7 +211,7 @@
             $sql .= " '" . $this->db->idate($this->datep) . "',";
             $sql .= " " . price2num($totalamount) . ",";
             $sql .= " " . ((int) $this->fk_typepayment) . ", '" . $this->db->escape($this->num_payment) . "', '" . $this->db->escape($this->note_public) . "', " . ((int) $user->id) . ",";
-            $sql .= " 0)";  // fk_bank is ID of transaction into ll_bank
+            $sql .= " 0)"; // fk_bank is ID of transaction into ll_bank
 
             dol_syslog(get_class($this) . "::create", LOG_DEBUG);
             $resql = $this->db->query($sql);

public/htdocs/expensereport/index.php

Spacing +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
 $dataseries = dol_sort_array($dataseries, 1, 'desc');
 
 // Merge all entries after the $KEEPNFIRST one into one entry called "Other..." (to avoid to have too much entries in graphic).
-$KEEPNFIRST = 7;    // Keep first $KEEPNFIRST one + 1 with the remain
+$KEEPNFIRST = 7; // Keep first $KEEPNFIRST one + 1 with the remain
 $i = 0;
 if (count($dataseries) > ($KEEPNFIRST + 1)) {
     foreach ($dataseries as $key => $val) {