alxarafe / alixar

public/htdocs/ticket/class/ticket.class.php

Spacing +13 added lines, -13 removed lines

@@ -263,14 +263,14 @@ 
     /**
      * Status
      */
-    const STATUS_NOT_READ = 0;          // Draft. Not take into account yet.
-    const STATUS_READ = 1;              // Ticket was read.
-    const STATUS_ASSIGNED = 2;          // Ticket was just assigned to someone. Not in progress yet.
-    const STATUS_IN_PROGRESS = 3;       // In progress
-    const STATUS_NEED_MORE_INFO = 5;    // Waiting requester feedback
-    const STATUS_WAITING = 7;           // On hold
-    const STATUS_CLOSED = 8;            // Closed - Solved
-    const STATUS_CANCELED = 9;          // Closed - Not solved
+    const STATUS_NOT_READ = 0; // Draft. Not take into account yet.
+    const STATUS_READ = 1; // Ticket was read.
+    const STATUS_ASSIGNED = 2; // Ticket was just assigned to someone. Not in progress yet.
+    const STATUS_IN_PROGRESS = 3; // In progress
+    const STATUS_NEED_MORE_INFO = 5; // Waiting requester feedback
+    const STATUS_WAITING = 7; // On hold
+    const STATUS_CLOSED = 8; // Closed - Solved
+    const STATUS_CANCELED = 9; // Closed - Not solved
 
 
     /**
@@ -1854,7 +1854,7 @@ 
         $actioncomm->socid = $this->socid;
         $actioncomm->label = $this->subject;
         $actioncomm->note_private = $this->message;
-        $actioncomm->userassigned = array($user->id => array('id' => $user->id,'transparency' => 0));
+        $actioncomm->userassigned = array($user->id => array('id' => $user->id, 'transparency' => 0));
         $actioncomm->userownerid = $user->id;
         $actioncomm->datep = $now;
         $actioncomm->percentage = -1; // percentage is not relevant for punctual events
@@ -2429,7 +2429,7 @@ 
                         'email' => $obj->email,
                         'rowid' => $obj->rowid,
                         'code' => $obj->code,
-                        'libelle' => $labelType,        // deprecated, replaced with labeltype
+                        'libelle' => $labelType, // deprecated, replaced with labeltype
                         'labeltype' => $labelType,
                         'status' => $obj->statuslink,
                         'statuscontact' => $obj->statuscontact,
@@ -2514,7 +2514,7 @@ 
             if (is_resource($handle)) {
                 while (($file = readdir($handle)) !== false) {
                     if (!utf8_check($file)) {
-                        $file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1');  // To be sure data is stored in UTF8 in memory
+                        $file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
                     }
                     if (dol_is_file($dir . $file)) {
                         return true;
@@ -2552,7 +2552,7 @@ 
         $formmail->trackid = (is_null($forcetrackid) ? 'tic' . $this->id : '');
         $attachedfiles = $formmail->get_attached_files();
 
-        $filepath = $attachedfiles['paths'];    // path is for example user->dir_temp.'/'.$user->id.'/'...
+        $filepath = $attachedfiles['paths']; // path is for example user->dir_temp.'/'.$user->id.'/'...
         $filename = $attachedfiles['names'];
         $mimetype = $attachedfiles['mimes'];
 
@@ -2980,7 +2980,7 @@ 
                                     if ($result) {
                                         // update last_msg_sent date (for last message sent to external users)
                                         $this->date_last_msg_sent = dol_now();
-                                        $this->update($user, 1);    // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
+                                        $this->update($user, 1); // disable trigger when updating date_last_msg_sent. sendTicketMessageByEmail already create an event in actioncomm table.
                                     }
                                 }
                             }

public/htdocs/expensereport/ajax/ajaxik.php

Spacing +4 added lines, -4 removed lines

@@ -69,21 +69,21 @@
 
 
 if (empty($fk_expense) || $fk_expense < 0) {
-    $rep->errorMessage =   $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
+    $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
 } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
-    $rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
+    $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
 
     $rep->response_status = 'error';
 } else {
     // @see ndfp.class.php:3576 (method: compute_total_km)
     $expense = new ExpenseReport($db);
     if ($expense->fetch($fk_expense) <= 0) {
-        $rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+        $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
         $rep->response_status = 'error';
     } else {
         $userauthor = new User($db);
         if ($userauthor->fetch($expense->fk_user_author) <= 0) {
-            $rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+            $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorRecordNotFound');
             $rep->response_status = 'error';
         } else {
             $expense = new ExpenseReport($db);

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

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

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