alxarafe / alixar

public/htdocs/core/modules/modFournisseur.class.php

Indentation +2 added lines, -2 removed lines

@@ -939,8 +939,8 @@
         }
 
         $sql_order = array(
-             "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'order_supplier' AND entity = " . ((int) $conf->entity),
-             "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'order_supplier', " . ((int) $conf->entity) . ")",
+                "DELETE FROM " . MAIN_DB_PREFIX . "document_model WHERE nom = '" . $this->db->escape($this->const[0][2]) . "' AND type = 'order_supplier' AND entity = " . ((int) $conf->entity),
+                "INSERT INTO " . MAIN_DB_PREFIX . "document_model (nom, type, entity) VALUES('" . $this->db->escape($this->const[0][2]) . "', 'order_supplier', " . ((int) $conf->entity) . ")",
         );
 
         //ODT template for Supplier Invoice

Spacing +1 added lines, -1 removed lines

@@ -520,7 +520,7 @@
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
         // End add extra fields object
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
+        $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
         if (is_object($user) && !$user->hasRight('societe', 'client', 'voir')) {
             $this->export_sql_end[$r] .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
         }

public/htdocs/core/modules/oauth/google_oauthcallback.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
 
     if ($forlogin) {
         // Set approval_prompt
-        $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto');    // Can be 'force'
+        $approval_prompt = getDolGlobalString('OAUTH_GOOGLE_FORCE_PROMPT_ON_LOGIN', 'auto'); // Can be 'force'
         $apiService->setApprouvalPrompt($approval_prompt);
     }
 
@@ -311,7 +311,7 @@ 
                     $storage->clearToken('Google');
 
                     $tmpuser = new User($db);
-                    $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1);    // Load user. Can load with email_oauth2.
+                    $res = $tmpuser->fetch(0, '', '', 0, $entitytosearchuser, $useremail, 0, 1); // Load user. Can load with email_oauth2.
 
                     if ($res > 0) {
                         $username = $tmpuser->login;

public/htdocs/core/modules/modMultiCurrency.class.php

Spacing +1 added lines, -1 removed lines

@@ -336,7 +336,7 @@
 
         $multicurrency = new MultiCurrency($this->db);
 
-        if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) {
+        if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) {
             $langs->loadCacheCurrencies('');
 
             $multicurrency->code = $conf->currency;

public/htdocs/core/modules/expedition/doc/pdf_merou.modules.php

Indentation +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -122,7 +122,7 @@ 
      */
     public function write_file(&$object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $mysoc, $hookmanager;
 
         $object->fetch_thirdparty();
@@ -399,7 +399,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -440,7 +440,7 @@ 
         $pdf->Rect(10, $tab_top, 190, $tab_height);
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *
@@ -469,7 +469,7 @@ 
         //}
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *

public/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php

Indentation +2 added lines, -2 removed lines

@@ -195,7 +195,7 @@ 
         return $texte;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build a document on disk using the generic odt module.
      *
@@ -209,7 +209,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $langs, $conf, $mysoc, $hookmanager;
 
         if (empty($srctemplatepath)) {

Spacing +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
         $maxfilesizearray = getMaxFileSizeArray();
         $maxmin = $maxfilesizearray['maxmin'];
         if ($maxmin > 0) {
-            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
+            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
         }
         $texte .= ' <input type="file" name="uploadfile">';
         $texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';

public/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php

Indentation +8 added lines, -8 removed lines

@@ -112,7 +112,7 @@ 
         $this->tabTitleHeight = 5; // default height
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -126,7 +126,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $hookmanager;
 
         $object->fetch_thirdparty();
@@ -769,8 +769,8 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Show total to pay
      *
@@ -783,7 +783,7 @@ 
      */
     protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         $sign = 1;
@@ -876,7 +876,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -929,7 +929,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -1194,7 +1194,7 @@ 
         return $top_shift;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

Spacing +2 added lines, -2 removed lines

@@ -292,7 +292,7 @@ 
                 $pdf->MultiCell(0, 3, ''); // Set interline to 3
                 $pdf->SetTextColor(0, 0, 0);
 
-                $tab_top = 90;  // position of top tab
+                $tab_top = 90; // position of top tab
                 $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
                 $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
@@ -873,7 +873,7 @@ 
             if ($object->volume_units < 50) {
                 $totalVolumetoshow = showDimensionInBestUnit($object->trueVolume, $object->volume_units, "volume", $outputlangs);
             } else {
-                $totalVolumetoshow =  price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units);
+                $totalVolumetoshow = price($object->trueVolume, 0, $outputlangs, 0, 0) . ' ' . measuringUnitString(0, "volume", $object->volume_units);
             }
         }
 

public/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php

Indentation +10 added lines, -10 removed lines

@@ -146,7 +146,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -160,7 +160,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $hookmanager;
 
         $object->fetch_thirdparty();
@@ -695,8 +695,8 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Show total to pay
      *
@@ -709,7 +709,7 @@ 
      */
     protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         $sign = 1;
@@ -811,7 +811,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -826,7 +826,7 @@ 
      */
     protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         // Force to disable hidetop and hidebottom
@@ -894,7 +894,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -906,7 +906,7 @@ 
      */
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs, $mysoc;
 
         $langs->load("orders");
@@ -1145,7 +1145,7 @@ 
         return $top_shift;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *

Spacing +1 added lines, -1 removed lines

@@ -325,7 +325,7 @@
                 $pdf->MultiCell(0, 3, ''); // Set interline to 3
                 $pdf->SetTextColor(0, 0, 0);
 
-                $tab_top = 90;  // position of top tab
+                $tab_top = 90; // position of top tab
                 $tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
                 $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;

public/htdocs/core/modules/expedition/modules_expedition.php

Indentation +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
  */
 abstract class ModelePdfExpedition extends CommonDocGenerator
 {
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation models
      *
@@ -50,7 +50,7 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $type = 'shipping';
         $list = array();
 

public/htdocs/core/modules/hrm/modules_evaluation.php

Indentation +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
  */
 abstract class ModelePDFEvaluation extends CommonDocGenerator
 {
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -49,7 +49,7 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $type = 'evaluation';
         $list = array();