alxarafe / alixar

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 +2 added lines, -2 removed lines

@@ -469,7 +469,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';
         }
@@ -536,7 +536,7 @@ 
         // Add extra fields object
         $keyforselect = 'commande_fournisseur';
         $keyforelement = 'order';
-        $keyforaliasextra = 'extra';  // @phan-suppress-current-line PhanPluginRedundantAssignment
+        $keyforaliasextra = 'extra'; // @phan-suppress-current-line PhanPluginRedundantAssignment
         include DOL_DOCUMENT_ROOT . '/core/extrafieldsinexport.inc.php';
         // End add extra fields object
         // Add extra fields line

htdocs/core/modules/reception/modules_reception.php

Indentation +2 added lines, -2 removed lines

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

htdocs/core/modules/reception/doc/pdf_squille.modules.php

Indentation +8 added lines, -8 removed lines

@@ -124,7 +124,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -138,7 +138,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();
@@ -633,8 +633,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
      *
@@ -649,7 +649,7 @@ 
      */
     protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered, $totalAmount = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         $sign = 1;
@@ -752,7 +752,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -846,7 +846,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -1094,7 +1094,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

htdocs/core/modules/propale/modules_propale.php

Indentation +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
     public $atleastoneratenotnull = 0;
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -66,7 +66,7 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $type = 'propal';
         $list = array();
 

htdocs/core/modules/propale/doc/pdf_azur.modules.php

Indentation +17 added lines, -17 removed lines

@@ -163,7 +163,7 @@ 
         $this->atleastonediscount = 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -177,7 +177,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'));
@@ -855,8 +855,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 payments table
      *
@@ -868,12 +868,12 @@ 
      */
     protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return 1;
     }
 
-	// 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 miscellaneous information (payment mode, payment term, ...)
      *
@@ -885,7 +885,7 @@ 
      */
     protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1059,8 +1059,8 @@ 
         return $posy;
     }
 
-	// 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
      *
@@ -1074,7 +1074,7 @@ 
      */
     protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $outputlangsbis = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
         $default_font_size = pdf_getPDFFontSize($outputlangs);
 
@@ -1336,7 +1336,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -1450,7 +1450,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -1725,7 +1725,7 @@ 
         return $top_shift;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *
@@ -1741,8 +1741,8 @@ 
         return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
     }
 
-	// 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 area for the customer to sign
      *
@@ -1754,7 +1754,7 @@ 
      */
     protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         $default_font_size = pdf_getPDFFontSize($outputlangs);
         $tab_top = $posy + 4;
         $tab_hl = 4;

Spacing +1 added lines, -1 removed lines

@@ -1682,7 +1682,7 @@
 
             $carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
 
-            $mode =  'target';
+            $mode = 'target';
             $carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
 
             // Show recipient

htdocs/core/modules/propale/doc/pdf_cyan.modules.php

Indentation +5 added lines, -5 removed lines

@@ -141,7 +141,7 @@ 
         $this->atleastonediscount = 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -155,7 +155,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'));
@@ -1444,7 +1444,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -1513,7 +1513,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -1803,7 +1803,7 @@ 
         return $top_shift;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

htdocs/core/modules/printsheet/doc/pdf_tcpdflabel.class.php

Indentation +2 added lines, -2 removed lines

@@ -247,7 +247,7 @@ 
 
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build PDF on disk, then output on HTTP stream.
      *
@@ -260,7 +260,7 @@ 
      */
     public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
         $this->code = $srctemplatepath;

htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php

Indentation +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         // use this method in future refactoring
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
      * - %LOGO% is replace with company logo
@@ -64,7 +64,7 @@ 
      */
     public function Add_PDF_label(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $photo = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $mysoc, $conf, $langs;
         global $forceimgscalewidth, $forceimgscaleheight;
 
@@ -224,7 +224,7 @@ 
 
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build PDF on disk, then output on HTTP stream.
      *
@@ -237,7 +237,7 @@ 
      */
     public function write_file($arrayofrecords, $outputlangs, $srctemplatepath, $outputdir = '', $filename = 'tmp_address_sheet.pdf')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $mysoc, $_Avery_Labels;
 
         $this->code = $srctemplatepath;

htdocs/core/modules/printsheet/modules_labels.php

Indentation +3 added lines, -3 removed lines

@@ -42,7 +42,7 @@ 
     public $error = '';
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -52,7 +52,7 @@ 
      */
     public function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         $type = 'members_labels';
         $list = array();
 
@@ -79,7 +79,7 @@ 
  */
 function doc_label_pdf_create($db, $arrayofrecords, $modele, $outputlangs, $outputdir = '', $template = 'standardlabel', $filename = 'tmp_address_sheet.pdf')
 {
-	// phpcs:enable
+    // phpcs:enable
     global $conf, $langs;
     $langs->load("members");