alxarafe / alixar

htdocs/bom/class/bom.class.php

Indentation +4 added lines, -5 removed lines

@@ -437,7 +437,6 @@ 
      * Load object lines in memory from the database by type of product
      *
      *  @param int    $typeproduct   0 type product, 1 type service
-
      * @return int         Return integer <0 if KO, 0 if not found, >0 if OK
      */
     public function fetchLinesbytypeproduct($typeproduct = 0)
@@ -1206,7 +1205,7 @@ 
         return $this->LibStatut($this->status, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return the status
      *
@@ -1216,7 +1215,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if (empty($this->labelStatus)) {
             global $langs;
             //$langs->load("mrp");
@@ -1325,7 +1324,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return if at least one photo is available
      *
@@ -1334,7 +1333,7 @@ 
      */
     public function is_photo_available($sdir)
     {
-		// phpcs:enable
+        // phpcs:enable
         include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
         include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
 

htdocs/commande/class/orderline.class.php

Indentation +2 added lines, -2 removed lines

@@ -624,7 +624,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update DB line fields total_xxx
      *  Used by migration
@@ -633,7 +633,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->db->begin();
 
         // Clean parameters

htdocs/commande/class/commande.class.php

Indentation +28 added lines, -28 removed lines

@@ -607,7 +607,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set draft status
      *
@@ -617,7 +617,7 @@ 
      */
     public function setDraft($user, $idwarehouse = -1)
     {
-		//phpcs:enable
+        //phpcs:enable
         global $conf, $langs;
 
         $error = 0;
@@ -697,7 +697,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Tag the order as validated (opened)
      *  Function used when order is reopend after being closed.
@@ -707,7 +707,7 @@ 
      */
     public function set_reopen($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         $error = 0;
 
         if ($this->statut != self::STATUS_CANCELED && $this->statut != self::STATUS_CLOSED) {
@@ -1737,7 +1737,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add line into array
      *  $this->client must be loaded
@@ -1753,7 +1753,7 @@ 
      */
     public function add_product($idproduct, $qty, $remise_percent = 0.0, $date_start = '', $date_end = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         if (!$qty) {
@@ -1989,7 +1989,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Add line of fixed discount in the order in DB
      *
@@ -1998,7 +1998,7 @@ 
      */
     public function insert_discount($idremise)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         include_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
@@ -2058,7 +2058,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load array lines
      *
@@ -2068,7 +2068,7 @@ 
      */
     public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $conf;
 
         $this->lines = array();
@@ -2335,7 +2335,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return a array with the pending stock by product
      *
@@ -2426,7 +2426,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Applique une remise relative
      *
@@ -2439,7 +2439,7 @@ 
      */
     public function set_remise($user, $remise, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         dol_syslog(get_class($this) . "::set_remise is deprecated, use setDiscount instead", LOG_NOTICE);
         // @phan-suppress-next-line PhanDeprecatedFunction
         return $this->setDiscount($user, $remise, $notrigger);
@@ -2507,7 +2507,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Set a fixed amount discount
      *
@@ -2574,7 +2574,7 @@ 
     }
     */
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set the order date
      *
@@ -2585,7 +2585,7 @@ 
      */
     public function set_date($user, $date, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('commande', 'creer')) {
             $error = 0;
 
@@ -2632,7 +2632,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set delivery date
      *
@@ -2644,7 +2644,7 @@ 
      */
     public function set_date_livraison($user, $delivery_date, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return $this->setDeliveryDate($user, $delivery_date, $notrigger);
     }
 
@@ -2704,7 +2704,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of orders (eventuelly filtered on a user) into an array
      *
@@ -2720,7 +2720,7 @@ 
      */
     public function liste_array($shortlist = 0, $draft = 0, $excluser = null, $socid = 0, $limit = 0, $offset = 0, $sortfield = 'c.date_commande', $sortorder = 'DESC')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user;
 
         $ga = array();
@@ -2840,7 +2840,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update order demand_reason
      *
@@ -2850,7 +2850,7 @@ 
      */
     public function demand_reason($demand_reason_id, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user;
 
         dol_syslog('Commande::demand_reason(' . $demand_reason_id . ')');
@@ -2904,7 +2904,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Set customer ref
      *
@@ -2915,7 +2915,7 @@ 
      */
     public function set_ref_client($user, $ref_client, $notrigger = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('commande', 'creer')) {
             $error = 0;
 
@@ -3546,7 +3546,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -3556,7 +3556,7 @@ 
      */
     public function load_board($user, $mode)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $clause = " WHERE";
@@ -3665,7 +3665,7 @@ 
         return $this->LibStatut($this->statut, $this->billed, $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return label of status
      *
@@ -3677,7 +3677,7 @@ 
      */
     public function LibStatut($status, $billed, $mode, $donotshowbilled = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs, $hookmanager;
 
         $billedtext = '';

htdocs/main.inc.php

Spacing +7 added lines, -7 removed lines

@@ -131,7 +131,7 @@ 
         //print "before decoding $val\n";
         do {
             $oldval = $val;
-            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5);    // Decode ':', ''', '	', '&NewLine', ...
+            $val = html_entity_decode($val, ENT_QUOTES | ENT_HTML5); // Decode ':', ''', '	', '&NewLine', ...
             // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
             $val = preg_replace_callback(
                 '/&#(x?[0-9][0-9a-f]+;?)/i',
@@ -140,7 +140,7 @@ 
                  *
                  * @return string
                  */
-                static function ($m) {
+                static function($m) {
                     // Decode 'n', ...
                     return realCharForNumericEntities($m);
                 },
@@ -181,7 +181,7 @@ 
             $inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
             $inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
             $inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
-            $inj += preg_match('/update[^&=\w].*set.+=/i', $val);   // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
+            $inj += preg_match('/update[^&=\w].*set.+=/i', $val); // the [^&=\w] test is to avoid error when request is like action=update&...set... or &updatemodule=...set...
             $inj += preg_match('/union.+select/i', $val);
         }
         if ($type == 3) {
@@ -431,7 +431,7 @@ 
         session_set_cookie_params($sessioncookieparams);
     }
     session_name($sessionname);
-    session_start();    // This call the open and read of session handler
+    session_start(); // This call the open and read of session handler
     //exit; // this exist generates a call to write and close
 }
 
@@ -702,7 +702,7 @@ 
         unset($_GET['action']);
         unset($_GET['confirmmassaction']);
         unset($_GET['massaction']);
-        unset($_GET['token']);          // TODO Make a redirect if we have a token in url to remove it ?
+        unset($_GET['token']); // TODO Make a redirect if we have a token in url to remove it ?
         if (isset($savid)) {
             $_POST['id'] = ((int) $savid);
         }
@@ -1009,7 +1009,7 @@ 
                 if (!empty($_SERVER["HTTP_USER_AGENT"]) && $_SERVER["HTTP_USER_AGENT"] == 'securitytest') {
                     http_response_code(401); // It makes easier to understand if session was broken during security tests
                 }
-                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : ''));   // This include http headers
+                dol_loginfunction($langs, $conf, (!empty($mysoc) ? $mysoc : '')); // This include http headers
             }
             exit;
         }
@@ -1357,7 +1357,7 @@ 
 } else {
     // We may have NOLOGIN set, but NOREQUIREUSER not
     if (!empty($user) && method_exists($user, 'loadDefaultValues') && !defined('NODEFAULTVALUES')) {
-        $user->loadDefaultValues();     // Load default values for everybody (works even if $user->id = 0
+        $user->loadDefaultValues(); // Load default values for everybody (works even if $user->id = 0
     }
 }
 

htdocs/fichinter/class/fichinter.class.php

Indentation +10 added lines, -10 removed lines

@@ -834,7 +834,7 @@ 
         return $this->LibStatut((isset($this->statut) ? $this->statut : $this->status), $mode);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the label of a status
      *
@@ -844,7 +844,7 @@ 
      */
     public function LibStatut($status, $mode = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         // Init/load array of translation of status
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
             global $langs;
@@ -1198,7 +1198,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Defines a delivery date of intervention
      *
@@ -1208,7 +1208,7 @@ 
      */
     public function set_date_delivery($user, $date_delivery)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('ficheinter', 'creer')) {
             $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter ";
             $sql .= " SET datei = '" . $this->db->idate($date_delivery) . "'";
@@ -1228,7 +1228,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define the label of the intervention
      *
@@ -1238,7 +1238,7 @@ 
      */
     public function set_description($user, $description)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('ficheinter', 'creer')) {
             $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter ";
             $sql .= " SET description = '" . $this->db->escape($description) . "',";
@@ -1259,7 +1259,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Link intervention to a contract
      *
@@ -1269,7 +1269,7 @@ 
      */
     public function set_contrat($user, $contractid)
     {
-		// phpcs:enable
+        // phpcs:enable
         if ($user->hasRight('ficheinter', 'creer')) {
             $sql = "UPDATE " . MAIN_DB_PREFIX . "fichinter ";
             $sql .= " SET fk_contrat = " . ((int) $contractid);
@@ -1466,7 +1466,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Load array lines ->lines
      *
@@ -1474,7 +1474,7 @@ 
      */
     public function fetch_lines()
     {
-		// phpcs:enable
+        // phpcs:enable
         $this->lines = array();
 
         $sql = "SELECT rowid, fk_fichinter, description, duree, date, rang";

Spacing +5 added lines, -5 removed lines

@@ -196,12 +196,12 @@ 
     /*
      * No signature
      */
-    const STATUS_NO_SIGNATURE    = 0;
+    const STATUS_NO_SIGNATURE = 0;
 
     /*
      * Signed by sender
      */
-    const STATUS_SIGNED_SENDER   = 1;
+    const STATUS_SIGNED_SENDER = 1;
 
     /*
      * Signed by receiver
@@ -211,7 +211,7 @@ 
     /*
      * Signed by all
      */
-    const STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+    const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
 
     /**
      * Date delivery
@@ -1402,7 +1402,7 @@ 
             $line->fk_fichinter = $fichinterid;
             $line->desc         = $desc;
             $line->date         = $date_intervention;
-            $line->datei        = $date_intervention;   // For backward compatibility
+            $line->datei        = $date_intervention; // For backward compatibility
             $line->duration     = $duration;
 
             if (is_array($array_options) && count($array_options) > 0) {
@@ -1499,7 +1499,7 @@ 
                 //For invoicing we calculing hours
                 $line->qty = round($objp->duree / 3600, 2);
                 $line->date = $this->db->jdate($objp->date);
-                $line->datei = $this->db->jdate($objp->date);   // For backward compatibility
+                $line->datei = $this->db->jdate($objp->date); // For backward compatibility
                 $line->rang = $objp->rang;
                 $line->product_type = 1;
                 $line->fetch_optionals();

htdocs/fichinter/class/fichinterligne.class.php

Indentation +2 added lines, -2 removed lines

@@ -283,7 +283,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Update total duration into llx_fichinter
      *
@@ -291,7 +291,7 @@ 
      */
     public function update_total()
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         $this->db->begin();

Spacing +5 added lines, -5 removed lines

@@ -51,19 +51,19 @@ 
      */
     public $fk_fichinter;
 
-    public $desc;       // Description ligne
+    public $desc; // Description ligne
 
     /**
      * @var int Date of intervention
      */
-    public $date;       // Date intervention
+    public $date; // Date intervention
     /**
      * @var int Date of intervention
      * @deprecated
      */
-    public $datei;      // Date intervention
+    public $datei; // Date intervention
 
-    public $duration;   // Duration of intervention
+    public $duration; // Duration of intervention
     public $rang = 0;
     public $tva_tx;
     public $subprice;
@@ -116,7 +116,7 @@ 
             $this->id               = $objp->rowid;
             $this->fk_fichinter     = $objp->fk_fichinter;
             $this->date = $this->db->jdate($objp->date);
-            $this->datei = $this->db->jdate($objp->date);   // For backward compatibility
+            $this->datei = $this->db->jdate($objp->date); // For backward compatibility
             $this->desc             = $objp->description;
             $this->duration         = $objp->duree;
             $this->rang             = $objp->rang;

Deprecated/Modules/Install/Controller/InstallController.php

Indentation +22 added lines, -22 removed lines

@@ -1202,14 +1202,14 @@ 
                                id="db_pass" autocomplete="off"
                                name="db_pass"
                                value="<?php
-                               // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
-                               // @phan-suppress-next-line PhanParamSuspiciousOrder
-                               $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
-                               if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) {    // So value can't be found if install page still accessible
+                                // If $force_install_databasepass is on, we don't want to set password, we just show '***'. Real value will be extracted from the forced install file at step1.
+                                // @phan-suppress-next-line PhanParamSuspiciousOrder
+                                $autofill = ((!empty($_SESSION['dol_save_pass'])) ? $_SESSION['dol_save_pass'] : str_pad('', strlen($force_install_databasepass), '*'));
+                                if (!empty($dolibarr_main_prod) && empty($_SESSION['dol_save_pass'])) {    // So value can't be found if install page still accessible
                                     $autofill = '';
-                               }
-                               print dol_escape_htmltag($autofill);
-                               ?>"
+                                }
+                                print dol_escape_htmltag($autofill);
+                                ?>"
                             <?php if ($force_install_noedit == 2 && $force_install_databasepass !== null) {
                                 print ' disabled';
                             } ?>
@@ -1291,23 +1291,23 @@ 
                                name="db_pass_root"
                                class="needroot text-security"
                                value="<?php
-                               // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
-                               // @phan-suppress-next-line PhanParamSuspiciousOrder
-                               $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
-                               if (!empty($dolibarr_main_prod)) {
+                                // If $force_install_databaserootpass is on, we don't want to set password here, we just show '***'. Real value will be extracted from the forced install file at step1.
+                                // @phan-suppress-next-line PhanParamSuspiciousOrder
+                                $autofill = ((!empty($force_install_databaserootpass)) ? str_pad('', strlen($force_install_databaserootpass), '*') : (isset($db_pass_root) ? $db_pass_root : ''));
+                                if (!empty($dolibarr_main_prod)) {
                                     $autofill = '';
-                               }
-                               // Do not autofill password if instance is a production instance
-                               if (
-                                   !empty($_SERVER["SERVER_NAME"]) && !in_array(
-                                       $_SERVER["SERVER_NAME"],
-                                       ['127.0.0.1', 'localhost', 'localhostgit']
-                                   )
-                               ) {
+                                }
+                                // Do not autofill password if instance is a production instance
+                                if (
+                                    !empty($_SERVER["SERVER_NAME"]) && !in_array(
+                                        $_SERVER["SERVER_NAME"],
+                                        ['127.0.0.1', 'localhost', 'localhostgit']
+                                    )
+                                ) {
                                     $autofill = '';
-                               }    // Do not autofill password for remote access
-                               print dol_escape_htmltag($autofill);
-                               ?>"
+                                }    // Do not autofill password for remote access
+                                print dol_escape_htmltag($autofill);
+                                ?>"
                             <?php if ($force_install_noedit > 0 && !empty($force_install_databaserootpass)) {
                                 print ' disabled'; /* May be removed by javascript*/
                             } ?>

Spacing +19 added lines, -19 removed lines

@@ -550,7 +550,7 @@ 
                     $allowupgrade = true;
                 }
 
-                $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/";   // We use mysql migration scripts whatever is database driver
+                $dir = DOL_DOCUMENT_ROOT . "/install/mysql/migration/"; // We use mysql migration scripts whatever is database driver
                 dolibarr_install_syslog("Scan sql files for migration files in " . $dir);
 
                 // Get files list of migration file x.y.z-a.b.c.sql into /install/mysql/migration
@@ -2045,67 +2045,67 @@ 
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_FPDF_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_FPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_FPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_FPDF_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDF_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_TCPDF_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_TCPDF_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_TCPDF_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_TCPDF_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDF_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_FPDI_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_FPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_FPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_FPDI_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_FPDI_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_TCPDI_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_TCPDI_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_TCPDI_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_TCPDI_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_TCPDI_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_GEOIP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_GEOIP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_GEOIP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_GEOIP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_GEOIP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_NUSOAP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_NUSOAP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_NUSOAP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_NUSOAP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_NUSOAP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_ODTPHP_PATH)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_ODTPHP_PATH = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_ODTPHP_PATH = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_ODTPHP_PATH="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATH)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_lib_ODTPHP_PATHTOPCLZIP = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_lib_ODTPHP_PATHTOPCLZIP="' . dol_escape_php(dol_sanitizePathName($force_dolibarr_lib_ODTPHP_PATHTOPCLZIP)) . '";');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_CKEDITOR)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_CKEDITOR = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_CKEDITOR = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_CKEDITOR=\'' . dol_escape_php($force_dolibarr_js_CKEDITOR, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_JQUERY)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_JQUERY = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_JQUERY = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_JQUERY=\'' . dol_escape_php($force_dolibarr_js_JQUERY, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_js_JQUERY_UI)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_js_JQUERY_UI = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_js_JQUERY_UI = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_js_JQUERY_UI=\'' . dol_escape_php($force_dolibarr_js_JQUERY_UI, 1) . '\';');
                     fwrite($fp, "\n");
@@ -2114,13 +2114,13 @@ 
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_font_DOL_DEFAULT_TTF)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_font_DOL_DEFAULT_TTF = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_font_DOL_DEFAULT_TTF = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF=\'' . dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF, 1) . '\';');
                     fwrite($fp, "\n");
                     if (empty($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD)) {
                         fwrite($fp, '//');
-                        $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = '';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                        $force_dolibarr_font_DOL_DEFAULT_TTF_BOLD = ''; // @phan-suppress-current-line PhanPluginRedundantAssignment
                     }
                     fwrite($fp, '$dolibarr_font_DOL_DEFAULT_TTF_BOLD=\'' . dol_escape_php($force_dolibarr_font_DOL_DEFAULT_TTF_BOLD, 1) . '\';');
                     fwrite($fp, "\n");
@@ -2440,9 +2440,9 @@ 
 // Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
 
         $err = error_reporting();
-        error_reporting(0);      // Disable all errors
+        error_reporting(0); // Disable all errors
 //error_reporting(E_ALL);
-        @set_time_limit(1800);   // Need 1800 on some very slow OS like Windows 7/64
+        @set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
         error_reporting($err);
 
         $action = GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : (empty($argv[1]) ? '' : $argv[1]);
@@ -2996,7 +2996,7 @@ 
 
         $conf->file->instance_unique_id = (empty($dolibarr_main_instance_unique_id) ? (empty($dolibarr_main_cookie_cryptkey) ? '' : $dolibarr_main_cookie_cryptkey) : $dolibarr_main_instance_unique_id); // Unique id of instance
 
-        $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256');   // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
+        $hash_unique_id = dol_hash('dolibarr' . $conf->file->instance_unique_id, 'sha256'); // Note: if the global salt changes, this hash changes too so ping may be counted twice. We don't mind. It is for statistics purpose only.
 
         $out = '<input type="checkbox" name="dolibarrpingno" id="dolibarrpingno"' . ((getDolGlobalString('MAIN_FIRST_PING_OK_ID') == 'disabled') ? '' : ' value="checked" checked="true"') . '> ';
         $out .= '<label for="dolibarrpingno">' . $langs->trans("MakeAnonymousPing") . '</label>';
@@ -3331,8 +3331,8 @@ 
                     $newuser->admin = 1;
                     $newuser->entity = 0;
 
-                    $conf->global->USER_MAIL_REQUIRED = 0;          // Force global option to be sure to create a new user with no email
-                    $conf->global->USER_PASSWORD_GENERATED = '';    // To not use any rule for password validation
+                    $conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+                    $conf->global->USER_PASSWORD_GENERATED = ''; // To not use any rule for password validation
 
                     $result = $newuser->create($createuser, 1);
                     if ($result > 0) {

Deprecated/Modules/Billing/Model/CommonInvoice.php

Spacing +32 added lines, -32 removed lines

@@ -99,9 +99,9 @@ 
      */
     public $revenuestamp;
 
-    public $totalpaid;          // duplicate with sumpayed
-    public $totaldeposits;      // duplicate with sumdeposit
-    public $totalcreditnotes;   // duplicate with sumcreditnote
+    public $totalpaid; // duplicate with sumpayed
+    public $totaldeposits; // duplicate with sumdeposit
+    public $totalcreditnotes; // duplicate with sumcreditnote
 
     public $sumpayed;
     public $sumpayed_multicurrency;
@@ -1167,7 +1167,7 @@ 
         if ($this->status > self::STATUS_DRAFT && $this->paye == 0) {
             // Get the default payment mode for BAN payment of the third party
             require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-            $bac = new CompanyBankAccount($this->db);   // table societe_rib
+            $bac = new CompanyBankAccount($this->db); // table societe_rib
             $result = $bac->fetch(0, $this->socid, 1, 'ban');
             if ($result <= 0 || empty($bac->id)) {
                 $this->error = $langs->trans("ThirdpartyHasNoDefaultBanAccount");
@@ -1181,16 +1181,16 @@ 
             $sql .= " FROM " . $this->db->prefix() . "prelevement_demande";
             $sql .= " WHERE rowid = " . ((int) $did);
             if ($type != 'bank-transfer' && $type != 'credit-transfer') {
-                $sql .= " AND fk_facture = " . ((int) $this->id);             // Add a protection to not pay another invoice than current one
+                $sql .= " AND fk_facture = " . ((int) $this->id); // Add a protection to not pay another invoice than current one
             }
             if ($type != 'direct-debit') {
                 if ($sourcetype == 'salary') {
-                    $sql .= " AND fk_salary = " . ((int) $this->id);          // Add a protection to not pay another salary than current one
+                    $sql .= " AND fk_salary = " . ((int) $this->id); // Add a protection to not pay another salary than current one
                 } else {
-                    $sql .= " AND fk_facture_fourn = " . ((int) $this->id);   // Add a protection to not pay another invoice than current one
+                    $sql .= " AND fk_facture_fourn = " . ((int) $this->id); // Add a protection to not pay another invoice than current one
                 }
             }
-            $sql .= " AND traite = 0";  // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
+            $sql .= " AND traite = 0"; // To not process payment request that were already converted into a direct debit or credit transfer order (Note: fk_prelevement_bons is also empty when traite = 0)
 
             dol_syslog(get_class($this) . "::makeStripeSepaRequest load requests to process", LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -1206,7 +1206,7 @@ 
 
                 if (is_numeric($amount) && $amount != 0) {
                     require_once DOL_DOCUMENT_ROOT . '/societe/class/companypaymentmode.class.php';
-                    $companypaymentmode = new CompanyPaymentMode($this->db);    // table societe_rib
+                    $companypaymentmode = new CompanyPaymentMode($this->db); // table societe_rib
                     $companypaymentmode->fetch($bac->id);
 
                     $this->stripechargedone = 0;
@@ -1216,7 +1216,7 @@ 
 
                     $currency = $conf->currency;
 
-                    $errorforinvoice = 0;     // We reset the $errorforinvoice at each invoice loop
+                    $errorforinvoice = 0; // We reset the $errorforinvoice at each invoice loop
 
                     $this->fetch_thirdparty();
 
@@ -1235,7 +1235,7 @@ 
                         $amountstripe = $amountstripe * 100;
                     }
 
-                    $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS');     // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
+                    $fk_bank_account = getDolGlobalInt('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'); // Bank account used for SEPA direct debit or credit transfer. Must be the Stripe account in Dolibarr.
                     if (!($fk_bank_account > 0)) {
                         $error++;
                         $errorforinvoice++;
@@ -1296,7 +1296,7 @@ 
                                 $thirdparty = new Societe($this->db);
                                 $resultthirdparty = $thirdparty->fetch($this->socid);
 
-                                include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php';        // This include the include of htdocs/stripe/config.php
+                                include_once DOL_DOCUMENT_ROOT . '/stripe/class/stripe.class.php'; // This include the include of htdocs/stripe/config.php
                                 // So it inits or erases the $stripearrayofkeysbyenv
                                 $stripe = new Stripe($this->db);
 
@@ -1322,7 +1322,7 @@ 
                                             $stripearrayofkeys = $stripearrayofkeysbyenv[$servicestatus];
                                             \Stripe\Stripe::setApiKey($stripearrayofkeys['secret_key']);
 
-                                            $foundalternativestripeaccount = $tmparray[0];    // Store the customer id
+                                            $foundalternativestripeaccount = $tmparray[0]; // Store the customer id
 
                                             dol_syslog("makeStripeSepaRequest We use now customer=" . $foundalternativestripeaccount . " publishable_key=" . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
                                         }
@@ -1343,7 +1343,7 @@ 
                                     dol_syslog("makeStripeSepaRequest No dedicated Stripe Account requested, so we use global one, so " . $stripearrayofkeys['publishable_key'], LOG_DEBUG);
                                 }
 
-                                $stripeacc = $stripe->getStripeAccount($service, $this->socid);                             // Get Stripe OAuth connect account if it exists (no network access here)
+                                $stripeacc = $stripe->getStripeAccount($service, $this->socid); // Get Stripe OAuth connect account if it exists (no network access here)
 
                                 if ($foundalternativestripeaccount) {
                                     if (empty($stripeacc)) {                // If the Stripe connect account not set, we use common API usage
@@ -1409,7 +1409,7 @@ 
                                                 $charge->failure_message = $stripe->error;
                                                 $charge->failure_declinecode = $stripe->declinecode;
                                                 $stripefailurecode = $stripe->code;
-                                                $stripefailuremessage = 'Action required. Contact the support at ';// . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
+                                                $stripefailuremessage = 'Action required. Contact the support at '; // . $conf->global->SELLYOURSAAS_MAIN_EMAIL;
                                                 $stripefailuredeclinecode = $stripe->declinecode;
                                             } else {
                                                 dol_syslog(var_export($paymentintent, true), LOG_DEBUG);
@@ -1535,7 +1535,7 @@ 
                                     $description = 'Failed to find or use your payment mode (no payment mode for this customer id)';
                                     $stripefailurecode = 'BADPAYMENTMODE';
                                     $stripefailuremessage = 'Failed to find or use your payment mode (no payment mode for this customer id)';
-                                    $postactionmessages = [];  // @phan-suppress-current-line PhanPluginRedundantAssignment
+                                    $postactionmessages = []; // @phan-suppress-current-line PhanPluginRedundantAssignment
 
                                     $object = $this;
 
@@ -1550,18 +1550,18 @@ 
                                     // Insert record of payment (success or error)
                                     $actioncomm = new ActionComm($this->db);
 
-                                    $actioncomm->type_code = 'AC_OTH_AUTO';     // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+                                    $actioncomm->type_code = 'AC_OTH_AUTO'; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
                                     $actioncomm->code = 'AC_' . $actioncode;
                                     $actioncomm->label = $description;
                                     $actioncomm->note_private = implode(",\n", $postactionmessages);
                                     $actioncomm->fk_project = $this->fk_project;
                                     $actioncomm->datep = $now;
                                     $actioncomm->datef = $now;
-                                    $actioncomm->percentage = -1;   // Not applicable
+                                    $actioncomm->percentage = -1; // Not applicable
                                     $actioncomm->socid = $thirdparty->id;
                                     $actioncomm->contactid = 0;
-                                    $actioncomm->authorid = $user->id;   // User saving action
-                                    $actioncomm->userownerid = $user->id;   // Owner of action
+                                    $actioncomm->authorid = $user->id; // User saving action
+                                    $actioncomm->userownerid = $user->id; // Owner of action
                                     // Fields when action is a real email (content is already into note)
                                     /*$actioncomm->email_msgid = $object->email_msgid;
                                      $actioncomm->email_from  = $object->email_from;
@@ -1732,10 +1732,10 @@ 
         $s .= pack('C1', 3) . pack('C1', strlen($datestring)) . $datestring;
         $s .= pack('C1', 4) . pack('C1', strlen($pricewithtaxstring)) . $pricewithtaxstring;
         $s .= pack('C1', 5) . pack('C1', strlen($pricetaxstring)) . $pricetaxstring;
-        $s .= '';                   // Hash of xml invoice
-        $s .= '';                   // ecda signature
-        $s .= '';                   // ecda public key
-        $s .= '';                   // ecda signature of public key stamp
+        $s .= ''; // Hash of xml invoice
+        $s .= ''; // ecda signature
+        $s .= ''; // ecda public key
+        $s .= ''; // ecda signature of public key stamp
 
         $s = base64_encode($s);
 
@@ -1803,8 +1803,8 @@ 
             $s .= "S\n";
             $s .= dol_trunc($bankaccount->proprio, 70, 'right', 'UTF-8', 1) . "\n";
             $addresslinearray = explode("\n", $bankaccount->owner_address);
-            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
             /*$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";
             $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";
             $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";*/
@@ -1812,8 +1812,8 @@ 
             $s .= "S\n";
             $s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1) . "\n";
             $addresslinearray = explode("\n", $mysoc->address);
-            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+            $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+            $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
             $s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1) . "\n";
             $s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1) . "\n";
             $s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1) . "\n";
@@ -1833,14 +1833,14 @@ 
         $s .= "S\n";
         $s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1) . "\n";
         $addresslinearray = explode("\n", $this->thirdparty->address);
-        $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n";     // address line 1
-        $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n";     // address line 2
+        $s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1) . "\n"; // address line 1
+        $s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1) . "\n"; // address line 2
         $s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1) . "\n";
         $s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1) . "\n";
         $s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1) . "\n";
         // ID of payment
-        $s .= "NON\n";          // NON or QRR
-        $s .= "\n";             // QR Code reference if previous field is QRR
+        $s .= "NON\n"; // NON or QRR
+        $s .= "\n"; // QR Code reference if previous field is QRR
         // Free text
         if ($complementaryinfo) {
             $s .= $complementaryinfo . "\n";

Deprecated/Modules/Accounting/Controller/AccountingCustomerController.php

Spacing +10 added lines, -10 removed lines

@@ -339,9 +339,9 @@ 
             $sql .= " co.code as country_code, co.label as country_label,";
             $sql .= " s.tva_intra,";
             if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-                $sql .= " spe.accountancy_code_sell as company_code_sell";  // accounting code for product but stored on thirdparty
+                $sql .= " spe.accountancy_code_sell as company_code_sell"; // accounting code for product but stored on thirdparty
             } else {
-                $sql .= " s.accountancy_code_sell as company_code_sell";    // accounting code for product but stored on thirdparty
+                $sql .= " s.accountancy_code_sell as company_code_sell"; // accounting code for product but stored on thirdparty
             }
             $sql .= " FROM " . $db->prefix() . "facture as f";
             $sql .= " INNER JOIN " . $db->prefix() . "societe as s ON s.rowid = f.fk_soc";
@@ -349,7 +349,7 @@ 
                 $sql .= " LEFT JOIN " . $db->prefix() . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
             }
             $sql .= " LEFT JOIN " . $db->prefix() . "c_country as co ON co.rowid = s.fk_pays ";
-            $sql .= " INNER JOIN " . $db->prefix() . "facturedet as l ON f.rowid = l.fk_facture";   // the main table
+            $sql .= " INNER JOIN " . $db->prefix() . "facturedet as l ON f.rowid = l.fk_facture"; // the main table
             $sql .= " LEFT JOIN " . $db->prefix() . "product as p ON p.rowid = l.fk_product";
             if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
                 $sql .= " LEFT JOIN " . $db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
@@ -403,7 +403,7 @@ 
                     $thirdpartystatic->email = !empty($objp->email) ? $objp->email : "";
                     $thirdpartystatic->country_code = !empty($objp->country_code) ? $objp->country_code : "";
                     $thirdpartystatic->tva_intra = !empty($objp->tva_intra) ? $objp->tva_intra : "";
-                    $thirdpartystatic->code_compta_product = !empty($objp->company_code_sell) ? $objp->company_code_sell : "";      // The accounting account for product stored on thirdparty object (for level3 suggestion)
+                    $thirdpartystatic->code_compta_product = !empty($objp->company_code_sell) ? $objp->company_code_sell : ""; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
                     $product_static->ref = $objp->product_ref;
                     $product_static->id = $objp->product_id;
@@ -871,7 +871,7 @@ 
                                 "MONTH(f.datef) = " . ((int) $j),
                                 " (" . $db->ifsql(
                                     "fd.total_ht < 0",
-                                    " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",   // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+                                    " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))", // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
                                     "  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
                                 ) . ")",
                                 0
@@ -879,7 +879,7 @@ 
                     }
                     $sql .= "  SUM(" . $db->ifsql(
                             "fd.total_ht < 0",
-                            " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))",   // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
+                            " (-1 * (abs(fd.total_ht) - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100))))", // TODO This is bugged, we must use the percent for the invoice and fd.situation_percent is cumulated percent !
                             "  (fd.total_ht - (fd.buy_price_ht * fd.qty * (fd.situation_percent / 100)))"
                         ) . ") as total";
                 } else {
@@ -987,7 +987,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_country = GETPOST('search_country', 'alpha');
         $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -1561,7 +1561,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_country = GETPOST('search_country', 'alpha');
         $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
@@ -2058,14 +2058,14 @@ 
                 $thirdpartystatic->client = $objp->client;
                 $thirdpartystatic->fournisseur = $objp->fournisseur;
                 $thirdpartystatic->code_client = $objp->code_client;
-                $thirdpartystatic->code_compta = $objp->code_compta_client;     // For backward compatibility
+                $thirdpartystatic->code_compta = $objp->code_compta_client; // For backward compatibility
                 $thirdpartystatic->code_compta_client = $objp->code_compta_client;
                 $thirdpartystatic->code_fournisseur = $objp->code_fournisseur;
                 $thirdpartystatic->code_compta_fournisseur = $objp->code_compta_fournisseur;
                 $thirdpartystatic->email = $objp->email;
                 $thirdpartystatic->country_code = $objp->country_code;
                 $thirdpartystatic->tva_intra = $objp->tva_intra;
-                $thirdpartystatic->code_compta_product = $objp->company_code_sell;      // The accounting account for product stored on thirdparty object (for level3 suggestion)
+                $thirdpartystatic->code_compta_product = $objp->company_code_sell; // The accounting account for product stored on thirdparty object (for level3 suggestion)
 
                 $product_static->ref = $objp->product_ref;
                 $product_static->id = $objp->product_id;