alxarafe / alixar

Dolibarr/Code/SupplierProposal/Api/SupplierProposals.php

Indentation +2 added lines, -2 removed lines

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

public/htdocs/index.php

Spacing +11 added lines, -11 removed lines

@@ -228,7 +228,7 @@ 
     }
 
     // Number of supplier proposals open (expired)
-    if (isModEnabled('supplier_proposal')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
+    if (isModEnabled('supplier_proposal') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('supplier_proposal', 'lire')) {
         $langs->load("supplier_proposal");
         $board = new SupplierProposal($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
@@ -237,7 +237,7 @@ 
     }
 
     // Number of sales orders
-    if (isModEnabled('order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
+    if (isModEnabled('order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CUSTOMER') && $user->hasRight('commande', 'lire')) {
         $board = new Commande($db);
         // Number of customer orders to be shipped (validated and in progress)
         $dashboardlines[$board->element . '_toship'] = $board->load_board($user, 'toship');
@@ -250,14 +250,14 @@ 
     }
 
     // Number of suppliers orders
-    if (isModEnabled('supplier_order')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
+    if (isModEnabled('supplier_order') && !getDolGlobalString('MAIN_DISABLE_BLOCK_SUPPLIER') && $user->hasRight('fournisseur', 'commande', 'lire')) {
         $board = new CommandeFournisseur($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
         $dashboardlines[$board->element . '_awaiting'] = $board->load_board($user, 'awaiting');
     }
 
     // Number of contract / services enabled (delayed)
-    if (isModEnabled('contract')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
+    if (isModEnabled('contract') && !getDolGlobalString('MAIN_DISABLE_BLOCK_CONTRACT') && $user->hasRight('contrat', 'lire')) {
         $board = new Contrat($db);
         $dashboardlines[$board->element . '_inactive'] = $board->load_board($user, "inactive");
         // Number of active services (expired)
@@ -265,7 +265,7 @@ 
     }
 
     // Number of tickets open
-    if (isModEnabled('ticket')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
+    if (isModEnabled('ticket') && !getDolGlobalString('MAIN_DISABLE_BLOCK_TICKET') && $user->hasRight('ticket', 'read')) {
         $board = new Ticket($db);
         $dashboardlines[$board->element . '_opened'] = $board->load_board($user, "opened");
         // Number of active services (expired)
@@ -285,7 +285,7 @@ 
     }
 
     // Number of transactions to conciliate
-    if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+    if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
         $board = new Account($db);
         $nb = $board->countAccountToReconcile(); // Get nb of account to reconciliate
         if ($nb > 0) {
@@ -295,7 +295,7 @@ 
 
 
     // Number of cheque to send
-    if (isModEnabled('bank')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
+    if (isModEnabled('bank') && !getDolGlobalString('MAIN_DISABLE_BLOCK_BANK') && $user->hasRight('banque', 'lire') && !$user->socid) {
         if (!getDolGlobalString('BANK_DISABLE_CHECK_DEPOSIT')) {
             $board = new RemiseCheque($db);
             $dashboardlines[$board->element] = $board->load_board($user);
@@ -311,26 +311,26 @@ 
     }
 
     // Number of foundation members
-    if (isModEnabled('member')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
+    if (isModEnabled('member') && !getDolGlobalString('MAIN_DISABLE_BLOCK_ADHERENT') && $user->hasRight('adherent', 'lire') && !$user->socid) {
         $board = new Adherent($db);
         $dashboardlines[$board->element . '_shift'] = $board->load_board($user, 'shift');
         $dashboardlines[$board->element . '_expired'] = $board->load_board($user, 'expired');
     }
 
     // Number of expense reports to approve
-    if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
+    if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'approve')) {
         $board = new ExpenseReport($db);
         $dashboardlines[$board->element . '_toapprove'] = $board->load_board($user, 'toapprove');
     }
 
     // Number of expense reports to pay
-    if (isModEnabled('expensereport')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
+    if (isModEnabled('expensereport') && !getDolGlobalString('MAIN_DISABLE_BLOCK_EXPENSEREPORT') && $user->hasRight('expensereport', 'to_paid')) {
         $board = new ExpenseReport($db);
         $dashboardlines[$board->element . '_topay'] = $board->load_board($user, 'topay');
     }
 
     // Number of holidays to approve
-    if (isModEnabled('holiday')  && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
+    if (isModEnabled('holiday') && !getDolGlobalString('MAIN_DISABLE_BLOCK_HOLIDAY') && $user->hasRight('holiday', 'approve')) {
         $board = new Holiday($db);
         $dashboardlines[$board->element] = $board->load_board($user);
     }

public/htdocs/adherents/list.php

Spacing +13 added lines, -13 removed lines

@@ -74,7 +74,7 @@ 
 $search_address = GETPOST("search_address", 'alpha');
 $search_zip = GETPOST("search_zip", 'alpha');
 $search_town = GETPOST("search_town", 'alpha');
-$search_state = GETPOST("search_state", 'alpha');  // county / departement / federal state
+$search_state = GETPOST("search_state", 'alpha'); // county / departement / federal state
 $search_country = GETPOST("search_country", 'alpha');
 $search_phone = GETPOST("search_phone", 'alpha');
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
@@ -91,7 +91,7 @@ 
 }
 
 $search_filter = GETPOST("search_filter", 'alpha');
-$search_status = GETPOST("search_status", 'intcomma');  // status
+$search_status = GETPOST("search_status", 'intcomma'); // status
 $search_datec_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datec_start_month'), GETPOSTINT('search_datec_start_day'), GETPOSTINT('search_datec_start_year'));
 $search_datec_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datec_end_month'), GETPOSTINT('search_datec_end_day'), GETPOSTINT('search_datec_end_year'));
 $search_datem_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datem_start_month'), GETPOSTINT('search_datem_start_day'), GETPOSTINT('search_datem_start_year'));
@@ -205,18 +205,18 @@ 
     // If $val['visible']==0, then we never show the field
 
     if (!empty($val['visible'])) {
-        $visible = (int)dol_eval($val['visible'], 1);
+        $visible = (int) dol_eval($val['visible'], 1);
         $arrayfields[$tableprefix . '.' . $key] = array(
             'label' => $val['label'],
             'checked' => (($visible < 0) ? 0 : 1),
-            'enabled' => (abs($visible) != 3 && (int)dol_eval($val['enabled'], 1)),
+            'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1)),
             'position' => $val['position'],
             'help' => isset($val['help']) ? $val['help'] : ''
         );
     }
 }
 $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
 //var_dump($arrayfields);exit;
 
 // Security check
@@ -444,7 +444,7 @@ 
 $sqlfields = $sql; // $sql fields to remove for count total
 
 // SQL Alias adherent
-$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d";  // maybe better to use ad (adh) instead of d
+$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d"; // maybe better to use ad (adh) instead of d
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
     $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $object->table_element . "_extrafields as ef on (d.rowid = ef.fk_object)";
 }
@@ -467,9 +467,9 @@ 
             $searchCategoryContactSqlList[] = "NOT EXISTS (SELECT ck.fk_categorie FROM " . MAIN_DB_PREFIX . "categorie_member as ck WHERE d.rowid = ck.fk_member)";
         } elseif (intval($searchCategoryContact) > 0) {
             if ($searchCategoryContactOperator == 0) {
-                $searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM " . MAIN_DB_PREFIX . "categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = " . ((int)$searchCategoryContact) . ")";
+                $searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM " . MAIN_DB_PREFIX . "categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = " . ((int) $searchCategoryContact) . ")";
             } else {
-                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int)$searchCategoryContact);
+                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int) $searchCategoryContact);
             }
         }
     }
@@ -492,7 +492,7 @@ 
     $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
 if ($search_type > 0) {
-    $sql .= " AND t.rowid=" . ((int)$search_type);
+    $sql .= " AND t.rowid=" . ((int) $search_type);
 }
 if ($search_filter == 'withoutsubscription') {
     $sql .= " AND (datefin IS NULL)";
@@ -636,7 +636,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');   // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -656,7 +656,7 @@ 
     $param .= '&contextpage=' . urlencode($contextpage);
 }
 if ($limit > 0 && $limit != $conf->liste_limit) {
-    $param .= '&limit=' . ((int)$limit);
+    $param .= '&limit=' . ((int) $limit);
 }
 if ($optioncss != '') {
     $param .= '&optioncss=' . urlencode($optioncss);
@@ -686,7 +686,7 @@ 
     $param .= "&search_email=" . urlencode($search_email);
 }
 if ($search_categ > 0 || $search_categ == -2) {
-    $param .= "&search_categ=" . urlencode((string)($search_categ));
+    $param .= "&search_categ=" . urlencode((string) ($search_categ));
 }
 if ($search_company) {
     $param .= "&search_company=" . urlencode($search_company);
@@ -832,7 +832,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/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php

Indentation +9 added lines, -9 removed lines

@@ -150,7 +150,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -164,7 +164,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
 
         dol_syslog("write_file outputlangs->defaultlang=" . (is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
@@ -280,7 +280,7 @@ 
             if (file_exists($dir)) {
                 // Add pdfgeneration hook
                 if (!is_object($hookmanager)) {
-					$hookmanager = new HookManager($this->db);
+                    $hookmanager = new HookManager($this->db);
                 }
                 $hookmanager->initHooks(array('pdfgeneration'));
                 $parameters = array('file' => $file, 'object' => $object, 'outputlangs' => $outputlangs);
@@ -824,7 +824,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -834,11 +834,11 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -899,7 +899,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -912,7 +912,7 @@ 
      */
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $ltrdirection = 'L';
@@ -1163,7 +1163,7 @@ 
         return $top_shift;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

Dolibarr/Code/Holiday/Classes/Holiday.php

Indentation +6 added lines, -6 removed lines

@@ -1488,7 +1488,7 @@ 
         return $this->LibStatut($this->status, $mode, $this->date_debut);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Returns the label of a status
      *
@@ -1499,7 +1499,7 @@ 
      */
     public function LibStatut($status, $mode = 0, $startdate = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $langs;
 
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
@@ -2041,7 +2041,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Return list of people with permission to validate leave requests.
      * Search for permission "approve leave requests"
@@ -2050,7 +2050,7 @@ 
      */
     public function fetch_users_approver_holiday()
     {
-		// phpcs:enable
+        // phpcs:enable
         $users_validator = array();
 
         $sql = "SELECT DISTINCT ur.fk_user";
@@ -2431,7 +2431,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *      Load indicators for dashboard (this->nbtodo and this->nbtodolate)
      *
@@ -2440,7 +2440,7 @@ 
      */
     public function load_board($user)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         if ($user->socid) {

Spacing +1 added lines, -1 removed lines

@@ -451,7 +451,7 @@
                 $this->date_fin_gmt = $this->db->jdate($obj->date_fin, 1);
                 $this->halfday = $obj->halfday;
                 $this->status = $obj->status;
-                $this->statut = $obj->status;   // deprecated
+                $this->statut = $obj->status; // deprecated
                 $this->fk_validator = $obj->fk_validator;
                 $this->date_valid = $this->db->jdate($obj->date_valid);
                 $this->fk_user_valid = $obj->fk_user_valid;

Dolibarr/Code/Expedition/Classes/Expedition.php

Spacing +49 added lines, -49 removed lines

@@ -332,28 +332,28 @@ 
         $sql .= ", fk_incoterms, location_incoterms";
         $sql .= ") VALUES (";
         $sql .= "'(PROV)'";
-        $sql .= ", " . ((int)$conf->entity);
+        $sql .= ", " . ((int) $conf->entity);
         $sql .= ", " . ($this->ref_customer ? "'" . $this->db->escape($this->ref_customer) . "'" : "null");
         $sql .= ", " . ($this->ref_ext ? "'" . $this->db->escape($this->ref_ext) . "'" : "null");
         $sql .= ", '" . $this->db->idate($now) . "'";
-        $sql .= ", " . ((int)$user->id);
+        $sql .= ", " . ((int) $user->id);
         $sql .= ", " . ($this->date_shipping > 0 ? "'" . $this->db->idate($this->date_shipping) . "'" : "null");
         $sql .= ", " . ($this->date_delivery > 0 ? "'" . $this->db->idate($this->date_delivery) . "'" : "null");
-        $sql .= ", " . ($this->socid > 0 ? ((int)$this->socid) : "null");
-        $sql .= ", " . ($this->fk_project > 0 ? ((int)$this->fk_project) : "null");
+        $sql .= ", " . ($this->socid > 0 ? ((int) $this->socid) : "null");
+        $sql .= ", " . ($this->fk_project > 0 ? ((int) $this->fk_project) : "null");
         $sql .= ", " . ($this->fk_delivery_address > 0 ? $this->fk_delivery_address : "null");
-        $sql .= ", " . ($this->shipping_method_id > 0 ? ((int)$this->shipping_method_id) : "null");
+        $sql .= ", " . ($this->shipping_method_id > 0 ? ((int) $this->shipping_method_id) : "null");
         $sql .= ", '" . $this->db->escape($this->tracking_number) . "'";
         $sql .= ", " . (is_numeric($this->weight) ? $this->weight : 'NULL');
         $sql .= ", " . (is_numeric($this->sizeS) ? $this->sizeS : 'NULL'); // TODO Should use this->trueDepth
         $sql .= ", " . (is_numeric($this->sizeW) ? $this->sizeW : 'NULL'); // TODO Should use this->trueWidth
         $sql .= ", " . (is_numeric($this->sizeH) ? $this->sizeH : 'NULL'); // TODO Should use this->trueHeight
-        $sql .= ", " . ($this->weight_units != '' ? (int)$this->weight_units : 'NULL');
-        $sql .= ", " . ($this->size_units != '' ? (int)$this->size_units : 'NULL');
+        $sql .= ", " . ($this->weight_units != '' ? (int) $this->weight_units : 'NULL');
+        $sql .= ", " . ($this->size_units != '' ? (int) $this->size_units : 'NULL');
         $sql .= ", " . (!empty($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : "null");
         $sql .= ", " . (!empty($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : "null");
         $sql .= ", " . (!empty($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : "null");
-        $sql .= ", " . (int)$this->fk_incoterms;
+        $sql .= ", " . (int) $this->fk_incoterms;
         $sql .= ", '" . $this->db->escape($this->location_incoterms) . "'";
         $sql .= ")";
 
@@ -364,7 +364,7 @@ 
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "expedition";
             $sql .= " SET ref = '(PROV" . $this->id . ")'";
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(get_class($this) . "::create", LOG_DEBUG);
             if ($this->db->query($sql)) {
@@ -579,7 +579,7 @@ 
         $sql .= ", fk_statut = 1";
         $sql .= ", date_valid = '" . $this->db->idate($now) . "'";
         $sql .= ", fk_user_valid = " . $user->id;
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::valid update expedition", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -618,7 +618,7 @@ 
             if (preg_match('/^[\(]?PROV/i', $this->ref)) {
                 // Now we rename also files into index
                 $sql = 'UPDATE ' . MAIN_DB_PREFIX . "ecm_files set filename = CONCAT('" . $this->db->escape($this->newref) . "', SUBSTR(filename, " . (strlen($this->ref) + 1) . ")), filepath = 'expedition/sending/" . $this->db->escape($this->newref) . "'";
-                $sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'expedition/sending/" . $this->db->escape($this->ref) . "' and entity = " . ((int)$conf->entity);
+                $sql .= " WHERE filename LIKE '" . $this->db->escape($this->ref) . "%' AND filepath = 'expedition/sending/" . $this->db->escape($this->ref) . "' and entity = " . ((int) $conf->entity);
                 $resql = $this->db->query($sql);
                 if (!$resql) {
                     $error++;
@@ -707,7 +707,7 @@ 
         $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'c_shipment_mode as s ON e.fk_shipping_method = s.rowid';
         $sql .= " WHERE e.entity IN (" . getEntity('expedition') . ")";
         if ($id) {
-            $sql .= " AND e.rowid = " . ((int)$id);
+            $sql .= " AND e.rowid = " . ((int) $id);
         }
         if ($ref) {
             $sql .= " AND e.ref='" . $this->db->escape($ref) . "'";
@@ -826,7 +826,7 @@ 
         if (!empty($this->shipping_method_id)) {
             $sql = "SELECT em.code, em.tracking";
             $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode as em";
-            $sql .= " WHERE em.rowid = " . ((int)$this->shipping_method_id);
+            $sql .= " WHERE em.rowid = " . ((int) $this->shipping_method_id);
 
             $resql = $this->db->query($sql);
             if ($resql) {
@@ -869,9 +869,9 @@ 
         $sql .= ", p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units, p.tosell as product_tosell, p.tobuy as product_tobuy, p.tobatch as product_tobatch";
         $sql .= " FROM " . MAIN_DB_PREFIX . "expeditiondet as ed, " . MAIN_DB_PREFIX . "commandedet as cd";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product as p ON p.rowid = cd.fk_product";
-        $sql .= " WHERE ed.fk_expedition = " . ((int)$this->id);
+        $sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
         $sql .= " AND ed.fk_elementdet = cd.rowid";
-        $sql .= " ORDER BY cd.rang, ed.fk_elementdet";      // We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
+        $sql .= " ORDER BY cd.rang, ed.fk_elementdet"; // We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
 
         dol_syslog(get_class($this) . "::fetch_lines", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -900,13 +900,13 @@ 
 
 
                 if ($originline > 0 && $originline == $obj->fk_elementdet) {
-                    '@phan-var-force ExpeditionLigne $line';  // $line from previous loop
+                    '@phan-var-force ExpeditionLigne $line'; // $line from previous loop
                     $line->entrepot_id = 0; // entrepod_id in details_entrepot
                     $line->qty_shipped += $obj->qty_shipped;
                 } else {
-                    $line = new ExpeditionLigne($this->db);     // new group to start
-                    $line->entrepot_id = $obj->fk_entrepot;    // this is a property of a shipment line
-                    $line->qty_shipped = $obj->qty_shipped;    // this is a property of a shipment line
+                    $line = new ExpeditionLigne($this->db); // new group to start
+                    $line->entrepot_id = $obj->fk_entrepot; // this is a property of a shipment line
+                    $line->qty_shipped = $obj->qty_shipped; // this is a property of a shipment line
                 }
 
                 $detail_entrepot = new stdClass();
@@ -1067,13 +1067,13 @@ 
             $classname = getDolGlobalString('EXPEDITION_ADDON_NUMBER');
 
             // Include file with class
-            $dirmodels = array_merge(array('/'), (array)$conf->modules_parts['models']);
+            $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
             foreach ($dirmodels as $reldir) {
                 $dir = dol_buildpath($reldir . "core/modules/expedition/");
 
                 // Load file with numbering class (if found)
-                $mybool = ((bool)@include_once $dir . $file) || $mybool;
+                $mybool = ((bool) @include_once $dir . $file) || $mybool;
             }
 
             if (!$mybool) {
@@ -1126,7 +1126,7 @@ 
         $sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
         $sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expedition as e ON ed.fk_expedition = e.rowid";
-        $sql .= " WHERE ed.fk_expedition = " . ((int)$this->id);
+        $sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
         $sql .= " AND cd.rowid = ed.fk_elementdet";
 
         dol_syslog(get_class($this) . "::valid select details", LOG_DEBUG);
@@ -1395,31 +1395,31 @@ 
             $this->ref = trim($this->ref);
         }
         if (isset($this->entity)) {
-            $this->entity = (int)$this->entity;
+            $this->entity = (int) $this->entity;
         }
         if (isset($this->ref_customer)) {
             $this->ref_customer = trim($this->ref_customer);
         }
         if (isset($this->socid)) {
-            $this->socid = (int)$this->socid;
+            $this->socid = (int) $this->socid;
         }
         if (isset($this->fk_user_author)) {
-            $this->fk_user_author = (int)$this->fk_user_author;
+            $this->fk_user_author = (int) $this->fk_user_author;
         }
         if (isset($this->fk_user_valid)) {
-            $this->fk_user_valid = (int)$this->fk_user_valid;
+            $this->fk_user_valid = (int) $this->fk_user_valid;
         }
         if (isset($this->fk_delivery_address)) {
-            $this->fk_delivery_address = (int)$this->fk_delivery_address;
+            $this->fk_delivery_address = (int) $this->fk_delivery_address;
         }
         if (isset($this->shipping_method_id)) {
-            $this->shipping_method_id = (int)$this->shipping_method_id;
+            $this->shipping_method_id = (int) $this->shipping_method_id;
         }
         if (isset($this->tracking_number)) {
             $this->tracking_number = trim($this->tracking_number);
         }
         if (isset($this->statut)) {
-            $this->statut = (int)$this->statut;
+            $this->statut = (int) $this->statut;
         }
         if (isset($this->trueDepth)) {
             $this->trueDepth = trim($this->trueDepth);
@@ -1437,7 +1437,7 @@ 
             $this->weight_units = trim($this->weight_units);
         }
         if (isset($this->trueWeight)) {
-            $this->weight = trim((string)$this->trueWeight);
+            $this->weight = trim((string) $this->trueWeight);
         }
         if (isset($this->note_private)) {
             $this->note_private = trim($this->note_private);
@@ -1479,7 +1479,7 @@ 
         $sql .= " note_public=" . (isset($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : "null") . ",";
         $sql .= " model_pdf=" . (isset($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : "null") . ",";
         $sql .= " entity=" . $conf->entity;
-        $sql .= " WHERE rowid=" . ((int)$this->id);
+        $sql .= " WHERE rowid=" . ((int) $this->id);
 
         $this->db->begin();
 
@@ -1561,7 +1561,7 @@ 
             $sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
             $sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd,";
             $sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
-            $sql .= " WHERE ed.fk_expedition = " . ((int)$this->id);
+            $sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
             $sql .= " AND cd.rowid = ed.fk_elementdet";
 
             dol_syslog(get_class($this) . "::delete select details", LOG_DEBUG);
@@ -1632,7 +1632,7 @@ 
 
         if (!$error) {
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expeditiondet";
-            $sql .= " WHERE fk_expedition = " . ((int)$this->id);
+            $sql .= " WHERE fk_expedition = " . ((int) $this->id);
 
             if ($this->db->query($sql)) {
                 // Delete linked object
@@ -1644,7 +1644,7 @@ 
                 // No delete expedition
                 if (!$error) {
                     $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "expedition";
-                    $sql .= " WHERE rowid = " . ((int)$this->id);
+                    $sql .= " WHERE rowid = " . ((int) $this->id);
 
                     if ($this->db->query($sql)) {
                         if (!empty($this->origin) && $this->origin_id > 0) {
@@ -1797,7 +1797,7 @@ 
             $sql = "SELECT cd.fk_product, cd.subprice, ed.qty, ed.fk_entrepot, ed.rowid as expeditiondet_id";
             $sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd,";
             $sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
-            $sql .= " WHERE ed.fk_expedition = " . ((int)$this->id);
+            $sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
             $sql .= " AND cd.rowid = ed.fk_elementdet";
 
             dol_syslog(get_class($this) . "::delete select details", LOG_DEBUG);
@@ -1861,10 +1861,10 @@ 
         if (!$error) {
             $main = MAIN_DB_PREFIX . 'expeditiondet';
             $ef = $main . "_extrafields";
-            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = " . ((int)$this->id) . ")";
+            $sqlef = "DELETE FROM $ef WHERE fk_object IN (SELECT rowid FROM $main WHERE fk_expedition = " . ((int) $this->id) . ")";
 
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expeditiondet";
-            $sql .= " WHERE fk_expedition = " . ((int)$this->id);
+            $sql .= " WHERE fk_expedition = " . ((int) $this->id);
 
             if ($this->db->query($sqlef) && $this->db->query($sql)) {
                 // Delete linked object
@@ -1881,7 +1881,7 @@ 
 
                 if (!$error) {
                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expedition";
-                    $sql .= " WHERE rowid = " . ((int)$this->id);
+                    $sql .= " WHERE rowid = " . ((int) $this->id);
 
                     if ($this->db->query($sql)) {
                         if (!empty($this->origin) && $this->origin_id > 0) {
@@ -1900,8 +1900,8 @@ 
                             $this->db->commit();
 
                             // Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-                            $this->deleteEcmFiles(0);    // Deleting files physically is done later with the dol_delete_dir_recursive
-                            $this->deleteEcmFiles(1);    // Deleting files physically is done later with the dol_delete_dir_recursive
+                            $this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+                            $this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive
 
                             // We delete PDFs
                             $ref = dol_sanitizeFileName($this->ref);
@@ -2237,7 +2237,7 @@ 
         if ($user->hasRight('expedition', 'creer')) {
             $sql = "UPDATE " . MAIN_DB_PREFIX . "expedition";
             $sql .= " SET date_delivery = " . ($delivery_date ? "'" . $this->db->idate($delivery_date) . "'" : 'null');
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             dol_syslog(get_class($this) . "::setDeliveryDate", LOG_DEBUG);
             $resql = $this->db->query($sql);
@@ -2295,7 +2295,7 @@ 
         $sql = "SELECT em.rowid, em.code, em.libelle as label, em.description, em.tracking, em.active";
         $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode as em";
         if (!empty($id)) {
-            $sql .= " WHERE em.rowid=" . ((int)$id);
+            $sql .= " WHERE em.rowid=" . ((int) $id);
         }
 
         $resql = $this->db->query($sql);
@@ -2332,7 +2332,7 @@ 
         $this->db->begin();
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "expedition SET fk_statut = " . self::STATUS_CLOSED;
-        $sql .= " WHERE rowid = " . ((int)$this->id) . " AND fk_statut > 0";
+        $sql .= " WHERE rowid = " . ((int) $this->id) . " AND fk_statut > 0";
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2357,12 +2357,12 @@ 
                 if ($shipments_match_order) {
                     dol_syslog("Qty for the " . count($order->lines) . " lines of the origin order is same than qty for lines in the shipment we close (shipments_match_order is true), with new status Expedition::STATUS_CLOSED=" . self::STATUS_CLOSED . ', so we close order');
                     // We close the order
-                    $order->cloture($user);     // Note this may also create an invoice if module workflow ask it
+                    $order->cloture($user); // Note this may also create an invoice if module workflow ask it
                 }
             }
 
-            $this->statut = self::STATUS_CLOSED;    // Will be revert to STATUS_VALIDATED at end if there is a rollback
-            $this->status = self::STATUS_CLOSED;    // Will be revert to STATUS_VALIDATED at end if there is a rollback
+            $this->statut = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
+            $this->status = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
 
             // If stock increment is done on closing
             if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
@@ -2409,7 +2409,7 @@ 
         $this->db->begin();
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'expedition SET billed = 1';
-        $sql .= " WHERE rowid = " . ((int)$this->id) . ' AND fk_statut > 0';
+        $sql .= " WHERE rowid = " . ((int) $this->id) . ' AND fk_statut > 0';
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2473,7 +2473,7 @@ 
         $oldbilled = $this->billed;
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'expedition SET fk_statut = 1';
-        $sql .= " WHERE rowid = " . ((int)$this->id) . ' AND fk_statut > 0';
+        $sql .= " WHERE rowid = " . ((int) $this->id) . ' AND fk_statut > 0';
 
         $resql = $this->db->query($sql);
         if ($resql) {
@@ -2495,7 +2495,7 @@ 
                 $sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd,";
                 $sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-                $sql .= " WHERE ed.fk_expedition = " . ((int)$this->id);
+                $sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
                 $sql .= " AND cd.rowid = ed.fk_elementdet";
 
                 dol_syslog(get_class($this) . "::valid select details", LOG_DEBUG);

Dolibarr/Code/Expedition/Classes/ExpeditionLigne.php

Spacing +11 added lines, -11 removed lines

@@ -75,7 +75,7 @@ 
      * @var int
      * @deprecated
      */
-    public $line_id;    // deprecated
+    public $line_id; // deprecated
 
     /**
      * @var int ID  Duplicate of origin_id (using origin_id is better)
@@ -109,7 +109,7 @@ 
      * @var string
      * @deprecated  Use instead origin_type = element_type to guess the line of origin of the shipment line.
      */
-    public $fk_origin;          // Example: 'orderline'
+    public $fk_origin; // Example: 'orderline'
 
     /**
      * @var int Id of shipment
@@ -317,10 +317,10 @@ 
         $sql .= ") VALUES (";
         $sql .= $this->fk_expedition;
         $sql .= ", " . (empty($this->entrepot_id) ? 'NULL' : $this->entrepot_id);
-        $sql .= ", " . ((int)$this->fk_elementdet);
+        $sql .= ", " . ((int) $this->fk_elementdet);
         $sql .= ", '" . (empty($this->element_type) ? 'order' : $this->db->escape($this->element_type)) . "'";
         $sql .= ", " . price2num($this->qty, 'MS');
-        $sql .= ", " . ((int)$ranktouse);
+        $sql .= ", " . ((int) $ranktouse);
         $sql .= ")";
 
         dol_syslog(get_class($this) . "::insert", LOG_DEBUG);
@@ -379,7 +379,7 @@ 
         // delete batch expedition line
         if (isModEnabled('productbatch')) {
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expeditiondet_batch";
-            $sql .= " WHERE fk_expeditiondet = " . ((int)$this->id);
+            $sql .= " WHERE fk_expeditiondet = " . ((int) $this->id);
 
             if (!$this->db->query($sql)) {
                 $this->errors[] = $this->db->lasterror() . " - sql=$sql";
@@ -388,7 +388,7 @@ 
         }
 
         $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expeditiondet";
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         if (!$error && $this->db->query($sql)) {
             // Remove extrafields
@@ -524,8 +524,8 @@ 
                 if (!$error && !empty($expedition_batch_id)) {
                     // delete lot expedition line
                     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "expeditiondet_batch";
-                    $sql .= " WHERE fk_expeditiondet = " . ((int)$this->id);
-                    $sql .= " AND rowid = " . ((int)$expedition_batch_id);
+                    $sql .= " WHERE fk_expeditiondet = " . ((int) $this->id);
+                    $sql .= " AND rowid = " . ((int) $expedition_batch_id);
 
                     if (!$this->db->query($sql)) {
                         $this->errors[] = $this->db->lasterror() . " - sql=$sql";
@@ -554,8 +554,8 @@ 
             // update line
             $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
             $sql .= " fk_entrepot = " . ($this->entrepot_id > 0 ? $this->entrepot_id : 'null');
-            $sql .= " , qty = " . ((float)price2num($qty, 'MS'));
-            $sql .= " WHERE rowid = " . ((int)$this->id);
+            $sql .= " , qty = " . ((float) price2num($qty, 'MS'));
+            $sql .= " WHERE rowid = " . ((int) $this->id);
 
             if (!$this->db->query($sql)) {
                 $this->errors[] = $this->db->lasterror() . " - sql=$sql";
@@ -603,7 +603,7 @@ 
     {
         $sql = 'SELECT ed.rowid, ed.fk_expedition, ed.fk_entrepot, ed.fk_elementdet, ed.element_type, ed.qty, ed.rang';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . $this->table_element . ' as ed';
-        $sql .= ' WHERE ed.rowid = ' . ((int)$rowid);
+        $sql .= ' WHERE ed.rowid = ' . ((int) $rowid);
         $result = $this->db->query($sql);
         if ($result) {
             $objp = $this->db->fetch_object($result);

Dolibarr/Code/Compta/Classes/AccountLine.php

Spacing +22 added lines, -22 removed lines

@@ -221,7 +221,7 @@ 
         } elseif ($ref) {
             $sql .= " AND b.rowid = '" . $this->db->escape($ref) . "'";
         } else {
-            $sql .= " AND b.rowid = " . ((int)$rowid);
+            $sql .= " AND b.rowid = " . ((int) $rowid);
         }
 
         dol_syslog(get_class($this) . "::fetch", LOG_DEBUG);
@@ -246,7 +246,7 @@ 
                 $this->fk_user_rappro = $obj->fk_user_rappro;
 
                 $this->fk_type = $obj->fk_type; // Type of transaction
-                $this->rappro = (int)$obj->rappro;
+                $this->rappro = (int) $obj->rappro;
                 $this->num_releve = $obj->num_releve;
 
                 $this->num_chq = $obj->num_chq;
@@ -303,13 +303,13 @@ 
         $sql .= ", '" . $this->db->escape($this->label) . "'";
         $sql .= ", " . price2num($this->amount);
         $sql .= ", " . (empty($this->amount_main_currency) ? "NULL" : price2num($this->amount_main_currency));
-        $sql .= ", " . ($this->fk_user_author > 0 ? ((int)$this->fk_user_author) : "null");
+        $sql .= ", " . ($this->fk_user_author > 0 ? ((int) $this->fk_user_author) : "null");
         $sql .= ", " . ($this->num_chq ? "'" . $this->db->escape($this->num_chq) . "'" : "null");
         $sql .= ", '" . $this->db->escape($this->fk_account) . "'";
         $sql .= ", '" . $this->db->escape($this->fk_type) . "'";
         $sql .= ", " . ($this->emetteur ? "'" . $this->db->escape($this->emetteur) . "'" : "null");
         $sql .= ", " . ($this->bank_chq ? "'" . $this->db->escape($this->bank_chq) . "'" : "null");
-        $sql .= ", " . (int)$this->rappro;
+        $sql .= ", " . (int) $this->rappro;
         $sql .= ", " . ($this->numero_compte ? "'" . $this->db->escape($this->numero_compte) . "'" : "''");
         $sql .= ", " . ($this->num_releve ? "'" . $this->db->escape($this->num_releve) . "'" : "null");
         $sql .= ")";
@@ -370,7 +370,7 @@ 
 
         // Protection to avoid any delete of accounted lines. Protection on by default
         if (!getDolGlobalString('BANK_ALLOW_TRANSACTION_DELETION_EVEN_IF_IN_ACCOUNTING')) {
-            $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = " . ((int)$this->id);
+            $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping WHERE doc_type = 'bank' AND fk_doc = " . ((int) $this->id);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $obj = $this->db->fetch_object($resql);
@@ -392,20 +392,20 @@ 
             $nbko++;
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_class WHERE lineid=" . (int)$this->rowid;
+        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_class WHERE lineid=" . (int) $this->rowid;
         dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (!$result) {
             $nbko++;
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_extrafields WHERE fk_object=" . (int)$this->rowid;
+        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_extrafields WHERE fk_object=" . (int) $this->rowid;
         $result = $this->db->query($sql);
         if (!$result) {
             $nbko++;
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank WHERE rowid=" . (int)$this->rowid;
+        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank WHERE rowid=" . (int) $this->rowid;
         dol_syslog(get_class($this) . "::delete", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (!$result) {
@@ -443,7 +443,7 @@ 
 
         $this->db->begin();
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_url WHERE fk_bank=" . (int)$this->rowid;
+        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "bank_url WHERE fk_bank=" . (int) $this->rowid;
         dol_syslog(get_class($this) . "::delete_urls", LOG_DEBUG);
         $result = $this->db->query($sql);
         if (!$result) {
@@ -475,7 +475,7 @@ 
         $sql .= " amount = " . price2num($this->amount) . ",";
         $sql .= " datev='" . $this->db->idate($this->datev) . "',";
         $sql .= " dateo='" . $this->db->idate($this->dateo) . "'";
-        $sql .= " WHERE rowid = " . ((int)$this->rowid);
+        $sql .= " WHERE rowid = " . ((int) $this->rowid);
 
         dol_syslog(get_class($this) . "::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -501,7 +501,7 @@ 
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "bank SET";
         $sql .= " label = '" . $this->db->escape($this->label) . "'";
-        $sql .= " WHERE rowid = " . ((int)$this->rowid);
+        $sql .= " WHERE rowid = " . ((int) $this->rowid);
 
         dol_syslog(get_class($this) . "::update_label", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -542,12 +542,12 @@ 
         }
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "bank SET";
-        $sql .= " rappro = " . ((int)$conciliated);
+        $sql .= " rappro = " . ((int) $conciliated);
         $sql .= ", num_releve = '" . $this->db->escape($this->num_releve) . "'";
         if ($conciliated) {
             $sql .= ", fk_user_rappro = " . $user->id;
         }
-        $sql .= " WHERE rowid = " . ((int)$this->id);
+        $sql .= " WHERE rowid = " . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::update_conciliation", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -558,7 +558,7 @@ 
                 $sql .= ", fk_categ";
                 $sql .= ") VALUES (";
                 $sql .= $this->id;
-                $sql .= ", " . ((int)$cat);
+                $sql .= ", " . ((int) $cat);
                 $sql .= ")";
 
                 dol_syslog(get_class($this) . "::update_conciliation", LOG_DEBUG);
@@ -591,7 +591,7 @@ 
     public function datev_change($rowid, $sign = 1)
     {
         // phpcs:enable
-        $sql = "SELECT datev FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int)$rowid);
+        $sql = "SELECT datev FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int) $rowid);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -599,7 +599,7 @@ 
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "bank SET";
             $sql .= " datev = '" . $this->db->idate($newdate) . "'";
-            $sql .= " WHERE rowid = " . ((int)$rowid);
+            $sql .= " WHERE rowid = " . ((int) $rowid);
 
             $result = $this->db->query($sql);
             if ($result) {
@@ -657,7 +657,7 @@ 
     public function dateo_change($rowid, $sign = 1)
     {
         // phpcs:enable
-        $sql = "SELECT dateo FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int)$rowid);
+        $sql = "SELECT dateo FROM " . MAIN_DB_PREFIX . "bank WHERE rowid = " . ((int) $rowid);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);
@@ -665,7 +665,7 @@ 
 
             $sql = "UPDATE " . MAIN_DB_PREFIX . "bank SET";
             $sql .= " dateo = '" . $this->db->idate($newdate) . "'";
-            $sql .= " WHERE rowid = " . ((int)$rowid);
+            $sql .= " WHERE rowid = " . ((int) $rowid);
 
             $result = $this->db->query($sql);
             if ($result) {
@@ -722,7 +722,7 @@ 
         $sql = 'SELECT b.rowid, b.datec, b.tms as datem,';
         $sql .= ' b.fk_user_author, b.fk_user_rappro';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'bank as b';
-        $sql .= ' WHERE b.rowid = ' . ((int)$id);
+        $sql .= ' WHERE b.rowid = ' . ((int) $id);
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -765,7 +765,7 @@ 
             $label .= '<br><strong>' . $langs->trans("Amount") . ':</strong> ' . price($this->amount, 0, $langs, 1, -1, -1, $conf->currency);
         }
 
-        $linkstart = '<a href="' . constant('BASE_URL') . '/compta/bank/line.php?rowid=' . ((int)$this->id) . '&save_lastsearch_values=1" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip">';
+        $linkstart = '<a href="' . constant('BASE_URL') . '/compta/bank/line.php?rowid=' . ((int) $this->id) . '&save_lastsearch_values=1" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip">';
         $linkend = '</a>';
 
         $result .= $linkstart;
@@ -795,7 +795,7 @@ 
         }
         if (isModEnabled('accounting') && ($option == 'showall' || $option == 'showconciliatedandaccounted')) {
             $sql = "SELECT COUNT(rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
-            $sql .= " WHERE doc_type = 'bank' AND fk_doc = " . ((int)$this->id);
+            $sql .= " WHERE doc_type = 'bank' AND fk_doc = " . ((int) $this->id);
             $resql = $this->db->query($sql);
             if ($resql) {
                 $obj = $this->db->fetch_object($resql);
@@ -851,7 +851,7 @@ 
 
         $type = 'bank';
 
-        $sql = " SELECT COUNT(ab.rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='" . $this->db->escape($type) . "' AND ab.fk_doc = " . ((int)$this->id);
+        $sql = " SELECT COUNT(ab.rowid) as nb FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab WHERE ab.doc_type='" . $this->db->escape($type) . "' AND ab.fk_doc = " . ((int) $this->id);
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_object($resql);

Dolibarr/Code/Compta/Classes/FactureLigne.php

Spacing +29 added lines, -29 removed lines

@@ -174,7 +174,7 @@ 
         $sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc';
         $sql .= ' FROM ' . MAIN_DB_PREFIX . 'facturedet as fd';
         $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'product as p ON fd.fk_product = p.rowid';
-        $sql .= ' WHERE fd.rowid = ' . ((int)$rowid);
+        $sql .= ' WHERE fd.rowid = ' . ((int) $rowid);
 
         $result = $this->db->query($sql);
         if ($result) {
@@ -313,7 +313,7 @@ 
         if (empty($this->fk_prev_id)) {
             $this->fk_prev_id = 0;
         }
-        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string)$this->situation_percent == '') {
+        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
             $this->situation_percent = 100;
         }
 
@@ -384,16 +384,16 @@ 
         $sql .= " '" . $this->db->escape($this->localtax1_type) . "',";
         $sql .= " '" . $this->db->escape($this->localtax2_type) . "',";
         $sql .= ' ' . ((!empty($this->fk_product) && $this->fk_product > 0) ? $this->fk_product : "null") . ',';
-        $sql .= " " . ((int)$this->product_type) . ",";
+        $sql .= " " . ((int) $this->product_type) . ",";
         $sql .= " " . price2num($this->remise_percent) . ",";
         $sql .= " " . price2num($this->subprice) . ",";
         $sql .= " '" . $this->db->escape($this->ref_ext) . "',";
         $sql .= ' ' . (!empty($this->fk_remise_except) ? $this->fk_remise_except : "null") . ',';
         $sql .= " " . (!empty($this->date_start) ? "'" . $this->db->idate($this->date_start) . "'" : "null") . ",";
         $sql .= " " . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null") . ",";
-        $sql .= ' ' . ((int)$this->fk_code_ventilation) . ',';
-        $sql .= ' ' . ((int)$this->rang) . ',';
-        $sql .= ' ' . ((int)$this->special_code) . ',';
+        $sql .= ' ' . ((int) $this->fk_code_ventilation) . ',';
+        $sql .= ' ' . ((int) $this->rang) . ',';
+        $sql .= ' ' . ((int) $this->special_code) . ',';
         $sql .= ' ' . (!empty($this->fk_fournprice) ? $this->fk_fournprice : "null") . ',';
         $sql .= ' ' . price2num($this->pa_ht) . ',';
         $sql .= " '" . $this->db->escape($this->info_bits) . "',";
@@ -402,12 +402,12 @@ 
         $sql .= " " . price2num($this->total_ttc) . ",";
         $sql .= " " . price2num($this->total_localtax1) . ",";
         $sql .= " " . price2num($this->total_localtax2);
-        $sql .= ", " . ((float)$this->situation_percent);
+        $sql .= ", " . ((float) $this->situation_percent);
         $sql .= ", " . (!empty($this->fk_prev_id) ? $this->fk_prev_id : "null");
         $sql .= ", " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
-        $sql .= ", " . ((int)$user->id);
-        $sql .= ", " . ((int)$user->id);
-        $sql .= ", " . (int)$this->fk_multicurrency;
+        $sql .= ", " . ((int) $user->id);
+        $sql .= ", " . ((int) $user->id);
+        $sql .= ", " . (int) $this->fk_multicurrency;
         $sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
         $sql .= ", " . price2num($this->multicurrency_subprice);
         $sql .= ", " . price2num($this->multicurrency_total_ht);
@@ -542,7 +542,7 @@ 
         if (empty($this->fk_parent_line)) {
             $this->fk_parent_line = 0;
         }
-        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string)$this->situation_percent == '') {
+        if (!isset($this->situation_percent) || $this->situation_percent > 100 || (string) $this->situation_percent == '') {
             $this->situation_percent = 100;
         }
         if (empty($this->pa_ht)) {
@@ -603,7 +603,7 @@ 
         $sql .= ", date_end=" . (!empty($this->date_end) ? "'" . $this->db->idate($this->date_end) . "'" : "null");
         $sql .= ", product_type=" . $this->product_type;
         $sql .= ", info_bits='" . $this->db->escape($this->info_bits) . "'";
-        $sql .= ", special_code=" . (int)$this->special_code;
+        $sql .= ", special_code=" . (int) $this->special_code;
         if (empty($this->skip_update_total)) {
             $sql .= ", total_ht=" . price2num($this->total_ht);
             $sql .= ", total_tva=" . price2num($this->total_tva);
@@ -612,14 +612,14 @@ 
             $sql .= ", total_localtax2=" . price2num($this->total_localtax2);
         }
         $sql .= ", fk_product_fournisseur_price=" . (!empty($this->fk_fournprice) ? "'" . $this->db->escape($this->fk_fournprice) . "'" : "null");
-        $sql .= ", buy_price_ht=" . (($this->pa_ht || (string)$this->pa_ht === '0') ? price2num($this->pa_ht) : "null"); // $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
+        $sql .= ", buy_price_ht=" . (($this->pa_ht || (string) $this->pa_ht === '0') ? price2num($this->pa_ht) : "null"); // $this->pa_ht should always be defined (set to 0 or to sell price depending on option)
         $sql .= ", fk_parent_line=" . ($this->fk_parent_line > 0 ? $this->fk_parent_line : "null");
         if (!empty($this->rang)) {
-            $sql .= ", rang=" . ((int)$this->rang);
+            $sql .= ", rang=" . ((int) $this->rang);
         }
-        $sql .= ", situation_percent = " . ((float)$this->situation_percent);
+        $sql .= ", situation_percent = " . ((float) $this->situation_percent);
         $sql .= ", fk_unit = " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);
-        $sql .= ", fk_user_modif = " . ((int)$user->id);
+        $sql .= ", fk_user_modif = " . ((int) $user->id);
 
         // Multicurrency
         $sql .= ", multicurrency_subprice=" . price2num($this->multicurrency_subprice);
@@ -627,7 +627,7 @@ 
         $sql .= ", multicurrency_total_tva=" . price2num($this->multicurrency_total_tva);
         $sql .= ", multicurrency_total_ttc=" . price2num($this->multicurrency_total_ttc);
 
-        $sql .= " WHERE rowid = " . ((int)$this->rowid);
+        $sql .= " WHERE rowid = " . ((int) $this->rowid);
 
         dol_syslog(get_class($this) . "::update", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -691,7 +691,7 @@ 
         // Free discount linked to invoice line
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'societe_remise_except';
         $sql .= ' SET fk_facture_line = NULL';
-        $sql .= ' WHERE fk_facture_line = ' . ((int)$this->id);
+        $sql .= ' WHERE fk_facture_line = ' . ((int) $this->id);
 
         dol_syslog(get_class($this) . "::deleteline", LOG_DEBUG);
         $result = $this->db->query($sql);
@@ -704,7 +704,7 @@ 
 
         $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'element_time';
         $sql .= ' SET invoice_id = NULL, invoice_line_id = NULL';
-        $sql .= ' WHERE invoice_line_id = ' . ((int)$this->id);
+        $sql .= ' WHERE invoice_line_id = ' . ((int) $this->id);
         if (!$this->db->query($sql)) {
             $this->error = $this->db->error() . " sql=" . $sql;
             $this->errors[] = $this->error;
@@ -712,7 +712,7 @@ 
             return -1;
         }
 
-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "facturedet WHERE rowid = " . ((int)$this->id);
+        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "facturedet WHERE rowid = " . ((int) $this->id);
 
         if ($this->db->query($sql)) {
             $this->db->commit();
@@ -754,7 +754,7 @@ 
         $sql .= ",total_localtax1=" . price2num($this->total_localtax1);
         $sql .= ",total_localtax2=" . price2num($this->total_localtax2);
         $sql .= ",total_ttc=" . price2num($this->total_ttc);
-        $sql .= " WHERE rowid = " . ((int)$this->rowid);
+        $sql .= " WHERE rowid = " . ((int) $this->rowid);
 
         dol_syslog(get_class($this) . "::update_total", LOG_DEBUG);
 
@@ -798,7 +798,7 @@ 
             }
 
             $sql = "SELECT situation_percent FROM " . MAIN_DB_PREFIX . "facturedet";
-            $sql .= " WHERE rowid = " . ((int)$this->fk_prev_id);
+            $sql .= " WHERE rowid = " . ((int) $this->fk_prev_id);
 
             $resql = $this->db->query($sql);
 
@@ -807,20 +807,20 @@ 
 
                 $obj = $this->db->fetch_object($resql);
                 if ($obj) {
-                    $returnPercent = (float)$obj->situation_percent;
+                    $returnPercent = (float) $obj->situation_percent;
                 }
 
                 if ($include_credit_note) {
                     $sql = 'SELECT fd.situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet fd';
                     $sql .= ' JOIN ' . MAIN_DB_PREFIX . 'facture f ON (f.rowid = fd.fk_facture) ';
-                    $sql .= " WHERE fd.fk_prev_id = " . ((int)$this->fk_prev_id);
-                    $sql .= " AND f.situation_cycle_ref = " . ((int)$invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
+                    $sql .= " WHERE fd.fk_prev_id = " . ((int) $this->fk_prev_id);
+                    $sql .= " AND f.situation_cycle_ref = " . ((int) $invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
                     $sql .= " AND f.type = " . Facture::TYPE_CREDIT_NOTE;
 
                     $res = $this->db->query($sql);
                     if ($res) {
                         while ($obj = $this->db->fetch_object($res)) {
-                            $returnPercent = $returnPercent + (float)$obj->situation_percent;
+                            $returnPercent = $returnPercent + (float) $obj->situation_percent;
                         }
                     } else {
                         dol_print_error($this->db);
@@ -870,7 +870,7 @@ 
             $cumulated_percent = 0.0;
 
             while (!$all_found) {
-                $sql = "SELECT situation_percent, fk_prev_id FROM " . MAIN_DB_PREFIX . "facturedet WHERE rowid = " . ((int)$lastprevid);
+                $sql = "SELECT situation_percent, fk_prev_id FROM " . MAIN_DB_PREFIX . "facturedet WHERE rowid = " . ((int) $lastprevid);
                 $resql = $this->db->query($sql);
 
                 if ($resql && $this->db->num_rows($resql) > 0) {
@@ -880,8 +880,8 @@ 
                     if ($include_credit_note) {
                         $sql_credit_note = 'SELECT fd.situation_percent FROM ' . MAIN_DB_PREFIX . 'facturedet fd';
                         $sql_credit_note .= ' JOIN ' . MAIN_DB_PREFIX . 'facture f ON (f.rowid = fd.fk_facture) ';
-                        $sql_credit_note .= " WHERE fd.fk_prev_id = " . ((int)$lastprevid);
-                        $sql_credit_note .= " AND f.situation_cycle_ref = " . ((int)$invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
+                        $sql_credit_note .= " WHERE fd.fk_prev_id = " . ((int) $lastprevid);
+                        $sql_credit_note .= " AND f.situation_cycle_ref = " . ((int) $invoicecache[$invoiceid]->situation_cycle_ref); // Prevent cycle outed
                         $sql_credit_note .= " AND f.type = " . Facture::TYPE_CREDIT_NOTE;
 
                         $res_credit_note = $this->db->query($sql_credit_note);