alxarafe / alixar

public/htdocs/societe/index.php

Spacing +8 added lines, -8 removed lines

@@ -108,7 +108,7 @@ 
 }
 $sql .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
 if (!$user->hasRight('societe', 'client', 'voir')) {
-    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int)$user->id);
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);
 }
 if (!$user->hasRight('fournisseur', 'lire')) {
     $sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
@@ -118,7 +118,7 @@ 
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     if ($socid > 0) {
-        $sql .= " AND s.rowid = " . ((int)$socid);
+        $sql .= " AND s.rowid = " . ((int) $socid);
     }
 }
 $sql .= $hookmanager->resPrint;
@@ -292,7 +292,7 @@ 
 $sql .= ", s.canvas, s.tms as date_modification, s.status as status";
 $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int)$conf->entity);
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 // TODO Replace this
 if (!$user->hasRight('societe', 'client', 'voir')) {
@@ -300,7 +300,7 @@ 
 }
 $sql .= ' WHERE s.entity IN (' . getEntity('societe') . ')';
 if (!$user->hasRight('societe', 'client', 'voir')) {
-    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int)$user->id);
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);
 }
 if (!$user->hasRight('fournisseur', 'lire')) {
     $sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
@@ -310,7 +310,7 @@ 
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     if ($socid > 0) {
-        $sql .= " AND s.rowid = " . ((int)$socid);
+        $sql .= " AND s.rowid = " . ((int) $socid);
     }
 }
 $sql .= $hookmanager->resPrint;
@@ -414,7 +414,7 @@ 
 $sql .= ", sp.address as caddress, sp.phone as cphone";
 $sql .= " FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "socpeople as sp";
 if (getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int)$conf->entity);
+    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe_perentity as spe ON spe.fk_soc = s.rowid AND spe.entity = " . ((int) $conf->entity);
 }
 // TODO Replace this
 if (!$user->hasRight('societe', 'client', 'voir')) {
@@ -422,7 +422,7 @@ 
 }
 $sql .= ' WHERE s.entity IN (' . getEntity('societe') . ') AND sp.fk_soc = s.rowid';
 if (!$user->hasRight('societe', 'client', 'voir')) {
-    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int)$user->id);
+    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . ((int) $user->id);
 }
 if (!$user->hasRight('fournisseur', 'lire')) {
     $sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
@@ -432,7 +432,7 @@ 
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     if ($socid > 0) {
-        $sql .= " AND s.rowid = " . ((int)$socid);
+        $sql .= " AND s.rowid = " . ((int) $socid);
     }
 }
 $sql .= $hookmanager->resPrint;

public/htdocs/societe/admin/societe.php

Spacing +5 added lines, -5 removed lines

@@ -41,7 +41,7 @@ 
 
 $action = GETPOST('action', 'aZ09');
 $value = GETPOST('value', 'alpha');
-$modulepart = GETPOST('modulepart', 'aZ09');    // Used by actions_setmoduleoptions.inc.php
+$modulepart = GETPOST('modulepart', 'aZ09'); // Used by actions_setmoduleoptions.inc.php
 
 if (!$user->admin) {
     accessforbidden();
@@ -118,7 +118,7 @@ 
 
     $type = 'company';
     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('" . $db->escape($value) . "', '" . $db->escape($type) . "', " . ((int)$conf->entity) . ", ";
+    $sql .= " VALUES ('" . $db->escape($value) . "', '" . $db->escape($type) . "', " . ((int) $conf->entity) . ", ";
     $sql .= ($label ? "'" . $db->escape($label) . "'" : 'null') . ", ";
     $sql .= (!empty($scandir) ? "'" . $db->escape($scandir) . "'" : "null");
     $sql .= ")";
@@ -133,7 +133,7 @@ 
 if ($action == 'del') {
     $type = 'company';
     $sql = "DELETE FROM " . MAIN_DB_PREFIX . "document_model";
-    $sql .= " WHERE nom='" . $db->escape($value) . "' AND type='" . $db->escape($type) . "' AND entity=" . ((int)$conf->entity);
+    $sql .= " WHERE nom='" . $db->escape($value) . "' AND type='" . $db->escape($type) . "' AND entity=" . ((int) $conf->entity);
     $resql = $db->query($sql);
     if (!$resql) {
         dol_print_error($db);
@@ -154,12 +154,12 @@ 
     $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "document_model";
     $sql_del .= " WHERE nom = '" . $db->escape(GETPOST('value', 'alpha')) . "'";
     $sql_del .= " AND type = '" . $db->escape($type) . "'";
-    $sql_del .= " AND entity = " . ((int)$conf->entity);
+    $sql_del .= " AND entity = " . ((int) $conf->entity);
     dol_syslog("societe.php " . $sql);
     $result1 = $db->query($sql_del);
 
     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity, libelle, description)";
-    $sql .= " VALUES ('" . $db->escape($value) . "', '" . $db->escape($type) . "', " . ((int)$conf->entity) . ", ";
+    $sql .= " VALUES ('" . $db->escape($value) . "', '" . $db->escape($type) . "', " . ((int) $conf->entity) . ", ";
     $sql .= ($label ? "'" . $db->escape($label) . "'" : 'null') . ", ";
     $sql .= (!empty($scandir) ? "'" . $db->escape($scandir) . "'" : "null");
     $sql .= ")";

public/htdocs/societe/consumption.php

Spacing +17 added lines, -17 removed lines

@@ -174,7 +174,7 @@ 
         print ' <span class="error">(' . $langs->trans("WrongCustomerCode") . ')</span>';
     }
     print '</td></tr>';
-    $sql = "SELECT count(*) as nb from " . MAIN_DB_PREFIX . "facture where fk_soc = " . ((int)$socid);
+    $sql = "SELECT count(*) as nb from " . MAIN_DB_PREFIX . "facture where fk_soc = " . ((int) $socid);
     $resql = $db->query($sql);
     if (!$resql) {
         dol_print_error($db);
@@ -215,7 +215,7 @@ 
         print ' <span class="error">(' . $langs->trans("WrongSupplierCode") . ')</span>';
     }
     print '</td></tr>';
-    $sql = "SELECT count(*) as nb from " . MAIN_DB_PREFIX . "commande_fournisseur where fk_soc = " . ((int)$socid);
+    $sql = "SELECT count(*) as nb from " . MAIN_DB_PREFIX . "commande_fournisseur where fk_soc = " . ((int) $socid);
     $resql = $db->query($sql);
     if (!$resql) {
         dol_print_error($db);
@@ -266,7 +266,7 @@ 
     $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datec as dateprint, f.fk_statut as status, NULL as paid, ';
     $sql_select .= 'NULL as fk_product, NULL as info_bits, NULL as date_start, NULL as date_end, NULL as prod_qty, NULL as total_ht, ';
     $tables_from = MAIN_DB_PREFIX . "fichinter as f LEFT JOIN " . MAIN_DB_PREFIX . "fichinterdet as d ON d.fk_fichinter = f.rowid"; // Must use left join to work also with option that disable usage of lines.
-    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND f.entity = " . $conf->entity;
     $dateprint = 'f.datec';
     $doc_number = 'f.ref';
@@ -275,7 +275,7 @@ 
     $documentstatic = new Facture($db);
     $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, f.type as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, d.fk_remise_except, ';
     $tables_from = MAIN_DB_PREFIX . "facture as f," . MAIN_DB_PREFIX . "facturedet as d";
-    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_facture = f.rowid";
     $where .= " AND f.entity IN (" . getEntity('invoice') . ")";
     $dateprint = 'f.datef';
@@ -286,7 +286,7 @@ 
     $documentstatic = new Propal($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.datep as dateprint, c.fk_statut as status, NULL as paid,';
     $tables_from = MAIN_DB_PREFIX . "propal as c," . MAIN_DB_PREFIX . "propaldet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_propal = c.rowid";
     $where .= " AND c.entity = " . $conf->entity;
     $dateprint = 'c.datep';
@@ -298,7 +298,7 @@ 
     $documentstatic = new Commande($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_commande as dateprint, c.fk_statut as status, NULL as paid, c.date_livraison as delivery_planned_date,';
     $tables_from = MAIN_DB_PREFIX . "commande as c," . MAIN_DB_PREFIX . "commandedet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_commande = c.rowid";
     $where .= " AND c.entity = " . $conf->entity;
     $dateprint = 'c.date_commande';
@@ -310,7 +310,7 @@ 
     $documentstatic = new Expedition($db);
     $sql_select = 'SELECT e.rowid as doc_id, e.ref as doc_number, \'1\' as doc_type, e.date_creation as dateprint, e.fk_statut as status, NULL as paid, e.date_delivery as delivery_planned_date,';
     $tables_from = MAIN_DB_PREFIX . "expedition as e," . MAIN_DB_PREFIX . "expeditiondet as ed," . MAIN_DB_PREFIX . "commandedet as d";
-    $where = " WHERE e.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE e.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND ed.fk_expedition = e.rowid";
     $where .= " AND ed.element_type = 'commande' AND ed.fk_elementdet = d.rowid";
     $where .= " AND e.entity = " . $conf->entity;
@@ -322,7 +322,7 @@ 
     $documentstatic = new FactureFournisseur($db);
     $sql_select = 'SELECT f.rowid as doc_id, f.ref as doc_number, \'1\' as doc_type, f.datef as dateprint, f.fk_statut as status, f.paye as paid, ';
     $tables_from = MAIN_DB_PREFIX . "facture_fourn as f," . MAIN_DB_PREFIX . "facture_fourn_det as d";
-    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE f.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_facture_fourn = f.rowid";
     $where .= " AND f.entity = " . $conf->entity;
     $dateprint = 'f.datef';
@@ -333,7 +333,7 @@ 
     $documentstatic = new SupplierProposal($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, NULL as paid, ';
     $tables_from = MAIN_DB_PREFIX . "supplier_proposal as c," . MAIN_DB_PREFIX . "supplier_proposaldet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_supplier_proposal = c.rowid";
     $where .= " AND c.entity = " . $conf->entity;
     $dateprint = 'c.date_valid';
@@ -345,7 +345,7 @@ 
     $documentstatic = new CommandeFournisseur($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_valid as dateprint, c.fk_statut as status, NULL as paid, c.date_livraison as delivery_planned_date, ';
     $tables_from = MAIN_DB_PREFIX . "commande_fournisseur as c," . MAIN_DB_PREFIX . "commande_fournisseurdet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_commande = c.rowid";
     $where .= " AND c.entity = " . $conf->entity;
     $dateprint = 'c.date_valid';
@@ -357,7 +357,7 @@ 
     $documentstatic = new Reception($db);
     $sql_select = 'SELECT r.rowid as doc_id, r.ref as doc_number, \'1\' as doc_type, r.date_creation as dateprint, r.fk_statut as status, NULL as paid, r.date_delivery as delivery_planned_date, ';
     $tables_from = MAIN_DB_PREFIX . "reception as r," . MAIN_DB_PREFIX . "receptiondet_batch as rd," . MAIN_DB_PREFIX . "commande_fournisseurdet as d";
-    $where = " WHERE r.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE r.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND rd.fk_reception = r.rowid";
     $where .= " AND rd.fk_elementdet = d.rowid AND rd.element_type = 'supplier_order'";
     $where .= " AND r.entity = " . $conf->entity;
@@ -370,7 +370,7 @@ 
     $documentstaticline = new ContratLigne($db);
     $sql_select = 'SELECT c.rowid as doc_id, c.ref as doc_number, \'1\' as doc_type, c.date_contrat as dateprint, d.statut as status, NULL as paid,';
     $tables_from = MAIN_DB_PREFIX . "contrat as c," . MAIN_DB_PREFIX . "contratdet as d";
-    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int)$socid);
+    $where = " WHERE c.fk_soc = s.rowid AND s.rowid = " . ((int) $socid);
     $where .= " AND d.fk_contrat = c.rowid";
     $where .= " AND c.entity = " . $conf->entity;
     $dateprint = 'c.date_valid';
@@ -459,12 +459,12 @@ 
 
     $num = $db->num_rows($resql);
 
-    $param = "&socid=" . urlencode((string)($socid)) . "&type_element=" . urlencode((string)($type_element));
+    $param = "&socid=" . urlencode((string) ($socid)) . "&type_element=" . urlencode((string) ($type_element));
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
         $param .= '&contextpage=' . urlencode($contextpage);
     }
     if ($limit > 0 && $limit != $conf->liste_limit) {
-        $param .= '&limit=' . ((int)$limit);
+        $param .= '&limit=' . ((int) $limit);
     }
     if ($sprod_fulldescr) {
         $param .= "&sprod_fulldescr=" . urlencode($sprod_fulldescr);
@@ -473,10 +473,10 @@ 
         $param .= "&sref=" . urlencode($sref);
     }
     if ($month) {
-        $param .= "&month=" . urlencode((string)($month));
+        $param .= "&month=" . urlencode((string) ($month));
     }
     if ($year) {
-        $param .= "&year=" . urlencode((string)($year));
+        $param .= "&year=" . urlencode((string) ($year));
     }
     if ($optioncss) {
         $param .= '&optioncss=' . urlencode($optioncss);
@@ -724,7 +724,7 @@ 
 
         print '<td class="right"><span class="amount">' . price($objp->total_ht) . '</span></td>';
 
-        $total_ht += (float)$objp->total_ht;
+        $total_ht += (float) $objp->total_ht;
 
         print '<td class="right">' . price($objp->total_ht / (empty($objp->prod_qty) ? 1 : $objp->prod_qty)) . '</td>';
 

public/htdocs/societe/list.php

Spacing +39 added lines, -39 removed lines

@@ -135,20 +135,20 @@ 
 $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
 $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
 $search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
-$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);   // Use tzserver
+$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver
 $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
 $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
 $search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
-$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);    // Use tzserver
+$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver
 
 $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
 $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
 $search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
-$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);   // Use tzserver
+$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver
 $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
 $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
 $search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
-$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);    // Use tzserver
+$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver
 
 $type = GETPOST('type', 'alpha');
 $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
@@ -322,7 +322,7 @@ 
 
 $object->fields = dol_sort_array($object->fields, 'position');
 $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
 
 // Security check
 $socid = GETPOSTINT('socid');
@@ -351,11 +351,11 @@ 
         $invoice->module_source = 'takepos';
         $invoice->pos_source = $_SESSION["takeposterminal"];
         $placeid = $invoice->create($user);
-        $sql = "UPDATE " . MAIN_DB_PREFIX . "facture set ref='(PROV-POS" . $_SESSION["takeposterminal"] . "-" . $place . ")' where rowid = " . ((int)$placeid);
+        $sql = "UPDATE " . MAIN_DB_PREFIX . "facture set ref='(PROV-POS" . $_SESSION["takeposterminal"] . "-" . $place . ")' where rowid = " . ((int) $placeid);
         $db->query($sql);
     }
 
-    $sql = "UPDATE " . MAIN_DB_PREFIX . "facture set fk_soc=" . ((int)$idcustomer) . " where ref='(PROV-POS" . $_SESSION["takeposterminal"] . "-" . $place . ")'";
+    $sql = "UPDATE " . MAIN_DB_PREFIX . "facture set fk_soc=" . ((int) $idcustomer) . " where ref='(PROV-POS" . $_SESSION["takeposterminal"] . "-" . $place . ")'";
     $resql = $db->query($sql); ?>
     <script>
         console.log("Reload page invoice.php with place=<?php print $place; ?>");
@@ -596,7 +596,7 @@ 
     if ($search_sale == -2) {
         $sql .= " AND NOT EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = s.rowid)";
     } elseif ($search_sale > 0) {
-        $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = " . ((int)$search_sale) . ")";
+        $sql .= " AND EXISTS (SELECT sc.fk_soc FROM " . MAIN_DB_PREFIX . "societe_commerciaux as sc WHERE sc.fk_soc = s.rowid AND sc.fk_user = " . ((int) $search_sale) . ")";
     }
 }
 
@@ -609,9 +609,9 @@ 
             $searchCategoryCustomerSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_societe as ck WHERE s.rowid = ck.fk_soc)";
         } elseif (intval($searchCategoryCustomer) > 0) {
             if ($searchCategoryCustomerOperator == 0) {
-                $searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = " . ((int)$searchCategoryCustomer) . ")";
+                $searchCategoryCustomerSqlList[] = " EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_societe as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = " . ((int) $searchCategoryCustomer) . ")";
             } else {
-                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int)$searchCategoryCustomer);
+                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int) $searchCategoryCustomer);
             }
         }
     }
@@ -638,9 +638,9 @@ 
             $searchCategorySupplierSqlList[] = "NOT EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc)";
         } elseif (intval($searchCategorySupplier) > 0) {
             if ($searchCategorySupplierOperator == 0) {
-                $searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = " . ((int)$searchCategorySupplier) . ")";
+                $searchCategorySupplierSqlList[] = " EXISTS (SELECT ck.fk_soc FROM " . MAIN_DB_PREFIX . "categorie_fournisseur as ck WHERE s.rowid = ck.fk_soc AND ck.fk_categorie = " . ((int) $searchCategorySupplier) . ")";
             } else {
-                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int)$searchCategorySupplier);
+                $listofcategoryid .= ($listofcategoryid ? ', ' : '') . ((int) $searchCategorySupplier);
             }
         }
     }
@@ -807,7 +807,7 @@ 
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
     if ($socid) {
-        $sql .= " AND s.rowid = " . ((int)$socid);
+        $sql .= " AND s.rowid = " . ((int) $socid);
     }
 }
 $sql .= $hookmanager->resPrint;
@@ -896,7 +896,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);
@@ -905,16 +905,16 @@ 
     $param = "&search_all=" . urlencode($search_all);
 }
 if ($search_categ_cus > 0) {
-    $param .= '&search_categ_cus=' . urlencode((string)($search_categ_cus));
+    $param .= '&search_categ_cus=' . urlencode((string) ($search_categ_cus));
 }
 if ($search_categ_sup > 0) {
-    $param .= '&search_categ_sup=' . urlencode((string)($search_categ_sup));
+    $param .= '&search_categ_sup=' . urlencode((string) ($search_categ_sup));
 }
 if ($searchCategoryCustomerOperator == 1) {
-    $param .= "&search_category_customer_operator=" . urlencode((string)($searchCategoryCustomerOperator));
+    $param .= "&search_category_customer_operator=" . urlencode((string) ($searchCategoryCustomerOperator));
 }
 if ($searchCategorySupplierOperator == 1) {
-    $param .= "&search_category_supplier_operator=" . urlencode((string)($searchCategorySupplierOperator));
+    $param .= "&search_category_supplier_operator=" . urlencode((string) ($searchCategorySupplierOperator));
 }
 foreach ($searchCategoryCustomerList as $searchCategoryCustomer) {
     $param .= "&search_category_customer_list[]=" . urlencode($searchCategoryCustomer);
@@ -923,10 +923,10 @@ 
     $param .= "&search_category_supplier_list[]=" . urlencode($searchCategorySupplier);
 }
 if ($search_sale > 0) {
-    $param .= '&search_sale=' . ((int)$search_sale);
+    $param .= '&search_sale=' . ((int) $search_sale);
 }
 if ($search_id > 0) {
-    $param .= "&search_id=" . ((int)$search_id);
+    $param .= "&search_id=" . ((int) $search_id);
 }
 if ($search_nom != '') {
     $param .= "&search_nom=" . urlencode($search_nom);
@@ -1007,13 +1007,13 @@ 
     $param .= '&search_price_level=' . urlencode($search_price_level);
 }
 if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
-    $param .= '&search_type_thirdparty=' . urlencode((string)($search_type_thirdparty));
+    $param .= '&search_type_thirdparty=' . urlencode((string) ($search_type_thirdparty));
 }
 if ($search_type != '') {
     $param .= '&search_type=' . urlencode($search_type);
 }
 if ($search_status != '') {
-    $param .= '&search_status=' . urlencode((string)($search_status));
+    $param .= '&search_status=' . urlencode((string) ($search_status));
 }
 if (is_array($search_level) && count($search_level)) {
     foreach ($search_level as $slevel) {
@@ -1035,49 +1035,49 @@ 
     $param .= '&type=' . urlencode($type);
 }
 if ($search_date_creation_startmonth) {
-    $param .= '&search_date_creation_startmonth=' . urlencode((string)($search_date_creation_startmonth));
+    $param .= '&search_date_creation_startmonth=' . urlencode((string) ($search_date_creation_startmonth));
 }
 if ($search_date_creation_startyear) {
-    $param .= '&search_date_creation_startyear=' . urlencode((string)($search_date_creation_startyear));
+    $param .= '&search_date_creation_startyear=' . urlencode((string) ($search_date_creation_startyear));
 }
 if ($search_date_creation_startday) {
-    $param .= '&search_date_creation_startday=' . urlencode((string)($search_date_creation_startday));
+    $param .= '&search_date_creation_startday=' . urlencode((string) ($search_date_creation_startday));
 }
 if ($search_date_creation_start) {
     $param .= '&search_date_creation_start=' . urlencode($search_date_creation_start);
 }
 if ($search_date_creation_endmonth) {
-    $param .= '&search_date_creation_endmonth=' . urlencode((string)($search_date_creation_endmonth));
+    $param .= '&search_date_creation_endmonth=' . urlencode((string) ($search_date_creation_endmonth));
 }
 if ($search_date_creation_endyear) {
-    $param .= '&search_date_creation_endyear=' . urlencode((string)($search_date_creation_endyear));
+    $param .= '&search_date_creation_endyear=' . urlencode((string) ($search_date_creation_endyear));
 }
 if ($search_date_creation_endday) {
-    $param .= '&search_date_creation_endday=' . urlencode((string)($search_date_creation_endday));
+    $param .= '&search_date_creation_endday=' . urlencode((string) ($search_date_creation_endday));
 }
 if ($search_date_creation_end) {
     $param .= '&search_date_creation_end=' . urlencode($search_date_creation_end);
 }
 if ($search_date_modif_startmonth) {
-    $param .= '&search_date_modif_startmonth=' . urlencode((string)($search_date_modif_startmonth));
+    $param .= '&search_date_modif_startmonth=' . urlencode((string) ($search_date_modif_startmonth));
 }
 if ($search_date_modif_startyear) {
-    $param .= '&search_date_modif_startyear=' . urlencode((string)($search_date_modif_startyear));
+    $param .= '&search_date_modif_startyear=' . urlencode((string) ($search_date_modif_startyear));
 }
 if ($search_date_modif_startday) {
-    $param .= '&search_date_modif_startday=' . urlencode((string)($search_date_modif_startday));
+    $param .= '&search_date_modif_startday=' . urlencode((string) ($search_date_modif_startday));
 }
 if ($search_date_modif_start) {
     $param .= '&search_date_modif_start=' . urlencode($search_date_modif_start);
 }
 if ($search_date_modif_endmonth) {
-    $param .= '&search_date_modif_endmonth=' . urlencode((string)($search_date_modif_endmonth));
+    $param .= '&search_date_modif_endmonth=' . urlencode((string) ($search_date_modif_endmonth));
 }
 if ($search_date_modif_endyear) {
-    $param .= '&search_date_modif_endyear=' . urlencode((string)($search_date_modif_endyear));
+    $param .= '&search_date_modif_endyear=' . urlencode((string) ($search_date_modif_endyear));
 }
 if ($search_date_modif_endday) {
-    $param .= '&search_date_modif_endday=' . urlencode((string)($search_date_modif_endday));
+    $param .= '&search_date_modif_endday=' . urlencode((string) ($search_date_modif_endday));
 }
 if ($search_date_modif_end) {
     $param .= '&search_date_modif_end=' . urlencode($search_date_modif_end);
@@ -1260,7 +1260,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) && $contextpage != 'poslist') ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
@@ -1704,19 +1704,19 @@ 
 print $hookmanager->resPrint;
 if (!empty($arrayfields['s.datec']['checked'])) {
     print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.tms']['checked'])) {
     print_liste_field_titre($arrayfields['s.tms']['label'], $_SERVER["PHP_SELF"], "s.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.status']['checked'])) {
     print_liste_field_titre($arrayfields['s.status']['label'], $_SERVER["PHP_SELF"], "s.status", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.import_key']['checked'])) {
     print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 // Action column
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

public/htdocs/societe/agenda.php

Spacing +2 added lines, -2 removed lines

@@ -194,12 +194,12 @@
 if (isModEnabled('agenda') && ($user->hasRight('agenda', 'myactions', 'read') || $user->hasRight('agenda', 'allactions', 'read'))) {
     print '<br>';
 
-    $param = '&socid=' . urlencode((string)($socid));
+    $param = '&socid=' . urlencode((string) ($socid));
     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
         $param .= '&contextpage=' . urlencode($contextpage);
     }
     if ($limit > 0 && $limit != $conf->liste_limit) {
-        $param .= '&limit=' . ((int)$limit);
+        $param .= '&limit=' . ((int) $limit);
     }
 
     // Try to know count of actioncomm from cache

public/htdocs/societe/price.php

Spacing +3 added lines, -3 removed lines

@@ -124,7 +124,7 @@ 
                 $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";
                 $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";
                 $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $db->escape($mysoc->country_code) . "'";
-                $sql .= " AND t.taux = " . ((float)$tva_tx) . " AND t.active = 1";
+                $sql .= " AND t.taux = " . ((float) $tva_tx) . " AND t.active = 1";
                 $sql .= " AND t.code = '" . $db->escape($vatratecode) . "'";
                 $sql .= " AND t.entity IN (" . getEntity('c_tva') . ")";
                 $resql = $db->query($sql);
@@ -545,11 +545,11 @@ 
         foreach ($prodcustprice->fields as $key => $val) {
             // If $val['visible']==0, then we never show the field
             if (!empty($val['visible'])) {
-                $visible = (int)dol_eval($val['visible'], 1, 1, '1');
+                $visible = (int) dol_eval($val['visible'], 1, 1, '1');
                 $arrayfields['t.' . $key] = array(
                     'label' => $val['label'],
                     'checked' => (($visible < 0) ? 0 : 1),
-                    'enabled' => (abs($visible) != 3 && (int)dol_eval($val['enabled'], 1, 1, '1')),
+                    'enabled' => (abs($visible) != 3 && (int) dol_eval($val['enabled'], 1, 1, '1')),
                     'position' => $val['position'],
                     'help' => isset($val['help']) ? $val['help'] : ''
                 );

public/htdocs/societe/card.php

Spacing +8 added lines, -8 removed lines

@@ -196,7 +196,7 @@ 
 
     if ($action == 'confirm_merge' && $confirm == 'yes' && $user->hasRight('societe', 'creer')) {
         $soc_origin_id = GETPOSTINT('soc_origin');
-        $soc_origin = new Societe($db);     // The thirdparty that we will delete
+        $soc_origin = new Societe($db); // The thirdparty that we will delete
 
         if ($soc_origin_id <= 0) {
             $langs->load('errors');
@@ -335,7 +335,7 @@ 
             }
 
             $object->phone = GETPOST('phone', 'alpha');
-            $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha');
+            $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
             $object->fax = GETPOST('fax', 'alpha');
             $object->email = trim(GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL));
             $object->no_email = GETPOSTINT("no_email");
@@ -593,7 +593,7 @@ 
                     }
 
                     if (!empty($backtopage)) {
-                        $backtopage = preg_replace('/--IDFORBACKTOPAGE--/', (string)$object->id, $backtopage); // New method to autoselect project after a New on another form object creation
+                        $backtopage = preg_replace('/--IDFORBACKTOPAGE--/', (string) $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
                         if (preg_match('/\?/', $backtopage)) {
                             $backtopage .= '&socid=' . $object->id; // Old method
                         }
@@ -749,7 +749,7 @@ 
                 // Update linked member
                 if (!$error && isset($object->fk_soc) && $object->fk_soc > 0) {
                     $sql = "UPDATE " . MAIN_DB_PREFIX . "adherent";
-                    $sql .= " SET fk_soc = NULL WHERE fk_soc = " . ((int)$socid);
+                    $sql .= " SET fk_soc = NULL WHERE fk_soc = " . ((int) $socid);
                     if (!$object->db->query($sql)) {
                         $error++;
                         $object->error .= $object->db->lasterror();
@@ -987,7 +987,7 @@ 
         }
 
         $object->phone = GETPOST('phone', 'alpha');
-        $object->phone_mobile = (string)GETPOST("phone_mobile", 'alpha');
+        $object->phone_mobile = (string) GETPOST("phone_mobile", 'alpha');
         $object->fax = GETPOST('fax', 'alpha');
         $object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
         $object->url = GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL);
@@ -1226,7 +1226,7 @@ 
             print '</td><td' . (!getDolGlobalString('SOCIETE_USEPREFIX') ? ' colspan="3"' : '') . '>';
 
             print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="' . dol_escape_htmltag($object->name) . '" autofocus="autofocus">';
-            print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300');   // For some countries that need the company name in 2 languages
+            print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alphanohtml', 'minwidth300'); // For some countries that need the company name in 2 languages
             // This implementation of the feature to search already existing company has been disabled. It must be implemented by keeping the "input text" and we must call the search ajax societe/ajax/ajaxcompanies.php
             // on a keydown of the input. We should show data about a duplicate found if we found less than 5 answers into a div under the input.
             /*
@@ -1874,7 +1874,7 @@ 
                 }
 
                 $object->phone = GETPOST('phone', 'alpha');
-                $object->phone_mobile = (string)GETPOST('phone_mobile', 'alpha');
+                $object->phone_mobile = (string) GETPOST('phone_mobile', 'alpha');
                 $object->fax = GETPOST('fax', 'alpha');
                 $object->email = GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL);
                 $object->no_email = GETPOSTINT("no_email");
@@ -2536,7 +2536,7 @@ 
                     $maxfilesizearray = getMaxFileSizeArray();
                     $maxmin = $maxfilesizearray['maxmin'];
                     if ($maxmin > 0) {
-                        print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+                        print '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
                     }
                     print '<input type="file" class="flat" name="photo" id="photoinput">';
                     print '</td></tr>';

public/htdocs/societe/societecontact.php

Spacing +1 added lines, -1 removed lines

@@ -220,7 +220,7 @@
             $sql .= " t.libelle as type_label, t.subscription";
             $sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d";
             $sql .= ", " . MAIN_DB_PREFIX . "adherent_type as t";
-            $sql .= " WHERE d.fk_soc = " . ((int)$id);
+            $sql .= " WHERE d.fk_soc = " . ((int) $id);
             $sql .= " AND d.fk_adherent_type = t.rowid";
 
             dol_syslog("get list sql=" . $sql);

public/htdocs/societe/notify/card.php

Spacing +4 added lines, -4 removed lines

@@ -106,10 +106,10 @@ 
             $db->begin();
 
             $sql = "DELETE FROM " . MAIN_DB_PREFIX . "notify_def";
-            $sql .= " WHERE fk_soc=" . ((int)$socid) . " AND fk_contact=" . ((int)$contactid) . " AND fk_action=" . ((int)$actionid);
+            $sql .= " WHERE fk_soc=" . ((int) $socid) . " AND fk_contact=" . ((int) $contactid) . " AND fk_action=" . ((int) $actionid);
             if ($db->query($sql)) {
                 $sql = "INSERT INTO " . MAIN_DB_PREFIX . "notify_def (datec,fk_soc, fk_contact, fk_action)";
-                $sql .= " VALUES ('" . $db->idate($now) . "'," . ((int)$socid) . "," . ((int)$contactid) . "," . ((int)$actionid) . ")";
+                $sql .= " VALUES ('" . $db->idate($now) . "'," . ((int) $socid) . "," . ((int) $contactid) . "," . ((int) $actionid) . ")";
 
                 if (!$db->query($sql)) {
                     $error++;
@@ -241,7 +241,7 @@ 
     $sql .= " " . MAIN_DB_PREFIX . "socpeople as c";
     $sql .= " WHERE a.rowid = n.fk_action";
     $sql .= " AND c.rowid = n.fk_contact";
-    $sql .= " AND c.fk_soc = " . ((int)$object->id);
+    $sql .= " AND c.fk_soc = " . ((int) $object->id);
 
     $resql = $db->query($sql);
     if ($resql) {
@@ -384,7 +384,7 @@ 
     $sql .= " " . MAIN_DB_PREFIX . "notify as n ";
     $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople as c ON n.fk_contact = c.rowid";
     $sql .= " WHERE a.rowid = n.fk_action";
-    $sql .= " AND n.fk_soc = " . ((int)$object->id);
+    $sql .= " AND n.fk_soc = " . ((int) $object->id);
     $sql .= $db->order($sortfield, $sortorder);
 
     // Count total nb of records