alxarafe / alixar

public/htdocs/theme/md/badges.inc.php

Spacing +5 added lines, -5 removed lines

@@ -245,22 +245,22 @@ 
             $thisBadgeTextColor = ${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName};
         }
 
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             $thisBadgeTextColor = '#212529';
             $thisBadgeBackgroundColor = "#fff";
         }
 
-        if (in_array((string)$statusName, array('0', '5', '9'))) {
+        if (in_array((string) $statusName, array('0', '5', '9'))) {
             $thisBadgeTextColor = '#999999';
         }
-        if (in_array((string)$statusName, array('6'))) {
+        if (in_array((string) $statusName, array('6'))) {
             $thisBadgeTextColor = '#777777';
         }
 
         // badge-statusX
         print $cssPrefix . ".badge-status" . $statusName . " {\n";
         print "        color: " . $thisBadgeTextColor . " !important;\n";
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             print "        border-color: " . $thisBadgeBorderColor . " !important;\n";
         }
         if ($thisBadgeBackgroundColor != '') {
@@ -283,7 +283,7 @@ 
         print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
         print "    color: " . $thisBadgeTextColor . " !important;\n";
         //print "    background-color: ".colorDarker($thisBadgeBackgroundColor, 10).";\n";
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . " !important;\n";
         }
         print "}\n";

public/htdocs/theme/md/btn.inc.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     if (getDolGlobalString('THEME_DARKMODEENABLED')) {
         print "/* For dark mode */\n";
         if (getDolGlobalInt('THEME_DARKMODEENABLED') != 2) {
-            print "@media (prefers-color-scheme: dark) {";  // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
+            print "@media (prefers-color-scheme: dark) {"; // To test, click on the 3 dots menu, then Other options then Display then emulate prefer-color-schemes
         } else {
             print "@media not print {";
         }

public/htdocs/theme/eldy/badges.inc.php

Spacing +5 added lines, -5 removed lines

@@ -243,22 +243,22 @@ 
             $thisBadgeTextColor = ${$statusVarNamePrefix . 'badgeStatus_textColor' . $statusName};
         }
 
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             $thisBadgeTextColor = '#212529';
             $thisBadgeBackgroundColor = "";
         }
 
-        if (in_array((string)$statusName, array('0', '5', '9'))) {
+        if (in_array((string) $statusName, array('0', '5', '9'))) {
             $thisBadgeTextColor = '#999999';
         }
-        if (in_array((string)$statusName, array('6'))) {
+        if (in_array((string) $statusName, array('6'))) {
             $thisBadgeTextColor = '#777777';
         }
 
         // badge-statusX
         print $cssPrefix . ".badge-status" . $statusName . " {\n";
         print "        color: " . $thisBadgeTextColor . " !important;\n";
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             print "        border-color: " . $thisBadgeBorderColor . " !important;\n";
         }
         if ($thisBadgeBackgroundColor != '') {
@@ -281,7 +281,7 @@ 
         print $cssPrefix . ".badge-status" . $statusName . ":focus, " . $cssPrefix . ".badge-status" . $statusName . ":hover {\n";
         print "    color: " . $thisBadgeTextColor . " !important;\n";
         //print "    background-color: " . colorDarker($thisBadgeBackgroundColor, 10) . ";\n";
-        if (in_array((string)$statusName, $TBadgeBorderOnly)) {
+        if (in_array((string) $statusName, $TBadgeBorderOnly)) {
             print "        border-color: " . colorDarker($thisBadgeBorderColor, 10) . " !important;\n";
         }
         print "}\n";

public/htdocs/societe/ajax/ajaxcompanies.php

Spacing +2 added lines, -2 removed lines

@@ -118,13 +118,13 @@
         $sql .= " OR s.code_fournisseur LIKE '%" . $db->escape($db->escapeforlike($socid)) . "%'";
     }
     if (getDolGlobalString('SOCIETE_ALLOW_SEARCH_ON_ROWID')) {
-        $sql .= " OR s.rowid = " . ((int)$socid);
+        $sql .= " OR s.rowid = " . ((int) $socid);
     }
     $sql .= ")";
 }
 // Protection for external user access
 if ($user->socid > 0) {
-    $sql .= " AND s.rowid = " . ((int)$user->socid);
+    $sql .= " AND s.rowid = " . ((int) $user->socid);
 }
 //if (GETPOST("filter")) $sql.= " AND (".GETPOST("filter", "alpha").")"; // Add other filters
 $sql .= " ORDER BY s.nom ASC";

public/htdocs/societe/paymentmodes.php

Spacing +19 added lines, -19 removed lines

@@ -529,8 +529,8 @@ 
             'use_companybankid' => GETPOST('companybankid'),
             'force_dir_output' => $conf->societe->multidir_output[$object->entity] . '/' . dol_sanitizeFileName($object->id)
         );
-        $_POST['lang_id'] = GETPOST('lang_idrib' . GETPOSTINT('companybankid'), 'alphanohtml');   // This is required by core/action_builddoc.inc.php
-        $_POST['model'] = GETPOST('modelrib' . GETPOSTINT('companybankid'), 'alphanohtml');       // This is required by core/action_builddoc.inc.php
+        $_POST['lang_id'] = GETPOST('lang_idrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php
+        $_POST['model'] = GETPOST('modelrib' . GETPOSTINT('companybankid'), 'alphanohtml'); // This is required by core/action_builddoc.inc.php
     }
 
     $id = $socid;
@@ -600,7 +600,7 @@ 
         }
         if ($action == 'syncsepatostripe') {
             // Create the bank account on current Stripe env
-            $companypaymentmode = new CompanyPaymentMode($db);  // Get record in llx_societe_rib
+            $companypaymentmode = new CompanyPaymentMode($db); // Get record in llx_societe_rib
             $companypaymentmode->fetch($id);
 
             if ($companypaymentmode->type != 'ban') {
@@ -653,10 +653,10 @@ 
             $db->begin();
 
             if (empty($newcu)) {
-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . $object->id . " AND status = " . ((int)$tmpservicestatus) . " AND entity = " . $conf->entity;
+                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "societe_account WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . $object->id . " AND status = " . ((int) $tmpservicestatus) . " AND entity = " . $conf->entity;
             } else {
                 $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . "societe_account";
-                $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int)$object->id) . " AND status = " . ((int)$tmpservicestatus) . " AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
+                $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int) $object->id) . " AND status = " . ((int) $tmpservicestatus) . " AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
             }
 
             $resql = $db->query($sql);
@@ -678,7 +678,7 @@ 
                 } else {
                     $sql = 'UPDATE ' . MAIN_DB_PREFIX . "societe_account";
                     $sql .= " SET key_account = '" . $db->escape($newcu) . "', site_account = '" . $db->escape($tmpsite_account) . "'";
-                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int)$object->id) . " AND status = " . ((int)$tmpservicestatus) . " AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
+                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '' or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int) $object->id) . " AND status = " . ((int) $tmpservicestatus) . " AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
                     $resql = $db->query($sql);
                 }
             }
@@ -731,7 +731,7 @@ 
                     $tokenstring['type'] = $stripesup->type;
                     $sql = "UPDATE " . MAIN_DB_PREFIX . "oauth_token";
                     $sql .= " SET tokenstring = '" . $db->escape(json_encode($tokenstring)) . "'";
-                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int)$object->id) . " AND service = '" . $db->escape($tmpservice) . "' AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
+                    $sql .= " WHERE site = 'stripe' AND (site_account IS NULL or site_account = '" . $db->escape($tmpsite_account) . "') AND fk_soc = " . ((int) $object->id) . " AND service = '" . $db->escape($tmpservice) . "' AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
                     // TODO Add site and site_account on oauth_token table
                     $sql .= " WHERE fk_soc = " . $object->id . " AND service = '" . $db->escape($tmpservice) . "' AND entity = " . $conf->entity; // Keep = here for entity. Only 1 record must be modified !
                 } catch (Exception $e) {
@@ -748,7 +748,7 @@ 
                     $tokenstring['stripe_user_id'] = $stripesup->id;
                     $tokenstring['type'] = $stripesup->type;
                     $sql = "INSERT INTO " . MAIN_DB_PREFIX . "oauth_token (service, fk_soc, entity, tokenstring)";
-                    $sql .= " VALUES ('" . $db->escape($tmpservice) . "', " . ((int)$object->id) . ", " . ((int)$conf->entity) . ", '" . $db->escape(json_encode($tokenstring)) . "')";
+                    $sql .= " VALUES ('" . $db->escape($tmpservice) . "', " . ((int) $object->id) . ", " . ((int) $conf->entity) . ", '" . $db->escape(json_encode($tokenstring)) . "')";
                     // TODO Add site and site_account on oauth_token table
                 } catch (Exception $e) {
                     $error++;
@@ -782,9 +782,9 @@ 
             try {
                 $cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
                 if (preg_match('/pm_|src_/', $source)) {
-                    $cu->invoice_settings->default_payment_method = (string)$source; // New
+                    $cu->invoice_settings->default_payment_method = (string) $source; // New
                 } else {
-                    $cu->default_source = (string)$source; // Old
+                    $cu->default_source = (string) $source; // Old
                 }
                 // @phan-suppress-next-line PhanDeprecatedFunction
                 $result = $cu->save();
@@ -971,7 +971,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);
@@ -1070,7 +1070,7 @@ 
             print ' <span class="error">(' . $langs->trans("WrongSupplierCode") . ')</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);
@@ -1167,7 +1167,7 @@ 
                         }
 
                         if ($paymentmethodobjsA->data != null && $paymentmethodobjsB->data != null) {
-                            $listofsources = array_merge((array)$paymentmethodobjsA->data, (array)$paymentmethodobjsB->data);
+                            $listofsources = array_merge((array) $paymentmethodobjsA->data, (array) $paymentmethodobjsB->data);
                         } elseif ($paymentmethodobjsB->data != null) {
                             $listofsources = $paymentmethodobjsB->data;
                         } else {
@@ -1199,7 +1199,7 @@ 
         print '<table class="liste centpercent">' . "\n";
         print '<tr class="liste_titre">';
         print '<td>' . $langs->trans('Label') . '</td>';
-        print '<td>' . $form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")) . '</td>';   // external system ID
+        print '<td>' . $form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")) . '</td>'; // external system ID
         print '<td>' . $langs->trans('Type') . '</td>';
         print '<td>' . $langs->trans('Informations') . '</td>';
         print '<td></td>';
@@ -1225,8 +1225,8 @@ 
 
             $sql = 'SELECT rowid FROM ' . MAIN_DB_PREFIX . "societe_rib";
             $sql .= " WHERE type in ('card')";
-            $sql .= " AND fk_soc = " . ((int)$object->id);
-            $sql .= " AND status = " . ((int)$servicestatus);
+            $sql .= " AND fk_soc = " . ((int) $object->id);
+            $sql .= " AND status = " . ((int) $servicestatus);
 
             $resql = $db->query($sql);
             if ($resql) {
@@ -1242,7 +1242,7 @@ 
 
                             $arrayofremotecard[$companypaymentmodetemp->stripe_card_ref] = $companypaymentmodetemp->stripe_card_ref;
 
-                            print '<tr class="oddeven" data-rowid="' . ((int)$companypaymentmodetemp->id) . '">';
+                            print '<tr class="oddeven" data-rowid="' . ((int) $companypaymentmodetemp->id) . '">';
                             // Label
                             print '<td class="tdoverflowmax150" title="' . dol_escape_htmltag($companypaymentmodetemp->label) . '">';
                             print dol_escape_htmltag($companypaymentmodetemp->label);
@@ -1558,7 +1558,7 @@ 
 
         print '<tr class="liste_titre">';
         print_liste_field_titre("Label");
-        print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem")));       // external system ID
+        print_liste_field_titre($form->textwithpicto($langs->trans('ExternalSystemID'), $langs->trans("IDOfPaymentInAnExternalSystem"))); // external system ID
         print_liste_field_titre("Bank");
         print_liste_field_titre("RIB");
         print_liste_field_titre("IBAN");
@@ -1672,7 +1672,7 @@ 
             // Default
             print '<td class="center" width="70">';
             if (!$rib->default_rib) {
-                print '<a href="' . $_SERVER["PHP_SELF"] . '?socid=' . ((int)$object->id) . '&ribid=' . ((int)$rib->id) . '&action=setasbankdefault&token=' . newToken() . '">';
+                print '<a href="' . $_SERVER["PHP_SELF"] . '?socid=' . ((int) $object->id) . '&ribid=' . ((int) $rib->id) . '&action=setasbankdefault&token=' . newToken() . '">';
                 print img_picto($langs->trans("Disabled"), 'off');
                 print '</a>';
             } else {

public/htdocs/societe/contact.php

Spacing +3 added lines, -3 removed lines

@@ -142,9 +142,9 @@
 
         $sql = "DELETE t, et FROM " . MAIN_DB_PREFIX . "socpeople AS t";
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "socpeople_extrafields AS et ON t.rowid = et.fk_object";
-        $sql .= " WHERE t.fk_soc = " . ((int)$socid);
-        $sql .= " AND t.rowid = " . ((int)$id);
-        $sql .= " AND ((t.fk_user_creat = " . ((int)$user->id) . " AND t.priv = 1) OR t.priv = 0)";
+        $sql .= " WHERE t.fk_soc = " . ((int) $socid);
+        $sql .= " AND t.rowid = " . ((int) $id);
+        $sql .= " AND ((t.fk_user_creat = " . ((int) $user->id) . " AND t.priv = 1) OR t.priv = 0)";
 
         $result = $db->query($sql);
         if (!$result) {

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