alxarafe / alixar

public/htdocs/core/modules/project/doc/pdf_timespent.modules.php

Indentation +5 added lines, -5 removed lines

@@ -131,7 +131,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf project onto disk
      *
@@ -141,7 +141,7 @@ 
      */
     public function write_file($object, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $hookmanager, $langs, $user;
 
         if (!is_object($outputlangs)) {
@@ -499,7 +499,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -547,7 +547,7 @@ 
         $pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxuser, 3, '', 0, 'C');
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -639,7 +639,7 @@ 
         return 0;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show footer of page. Need this->emetteur object
      *

public/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php

Indentation +18 added lines, -18 removed lines

@@ -130,7 +130,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Define array with couple substitution key => substitution value
      *
@@ -141,7 +141,7 @@ 
      */
     public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
     {
-		// phpcs:enable
+        // phpcs:enable
         if (!$object instanceof Project) {
             dol_syslog("Expected Project object, got " . gettype($object), LOG_ERR);
             return array();
@@ -172,7 +172,7 @@ 
         return $resarray;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -182,7 +182,7 @@ 
      */
     public function get_substitutionarray_tasks(Task $task, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         $resarray = array(
             'task_ref' => $task->ref,
             'task_fk_project' => $task->fk_project,
@@ -213,7 +213,7 @@ 
         return $resarray;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -223,7 +223,7 @@ 
      */
     public function get_substitutionarray_project_contacts($contact, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         $pc = 'projcontacts_'; // prefix to avoid typos
 
         $ret = array(
@@ -270,7 +270,7 @@ 
         return $ret;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -280,7 +280,7 @@ 
      */
     public function get_substitutionarray_project_file($file, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'projfile_name' => $file['name'],
             'projfile_date' => dol_print_date($file['date'], 'day'),
@@ -288,7 +288,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -298,7 +298,7 @@ 
      */
     public function get_substitutionarray_project_reference($refdetail, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         return array(
@@ -312,7 +312,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -322,7 +322,7 @@ 
      */
     public function get_substitutionarray_tasksressource($taskresource, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
 
         //dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
         return array(
@@ -336,7 +336,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -346,7 +346,7 @@ 
      */
     public function get_substitutionarray_taskstime($tasktime, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'tasktime_rowid' => $tasktime['rowid'],
             'tasktime_task_date' => dol_print_date($tasktime['task_date'], 'day'),
@@ -363,7 +363,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -373,7 +373,7 @@ 
      */
     public function get_substitutionarray_task_file($file, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'tasksfile_name' => $file['name'],
             'tasksfile_date' => dol_print_date($file['date'], 'day'),
@@ -482,7 +482,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.
      *
@@ -493,7 +493,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $langs, $conf, $mysoc, $hookmanager;
 
         if (empty($srctemplatepath)) {

Spacing +1 added lines, -1 removed lines

@@ -466,7 +466,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="PROJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';

public/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php

Indentation +18 added lines, -18 removed lines

@@ -130,7 +130,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      * Define array with couple substitution key => substitution value
      *
@@ -141,7 +141,7 @@ 
      */
     public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $extrafields;
 
         if (!$object instanceof Project) {
@@ -174,7 +174,7 @@ 
         return $resarray;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -185,7 +185,7 @@ 
      */
     public function get_substitutionarray_tasks($task, $outputlangs, $array_key = 'task')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $extrafields;
 
         $resarray = array(
@@ -218,7 +218,7 @@ 
         return $resarray;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -228,7 +228,7 @@ 
      */
     public function get_substitutionarray_project_contacts($contact, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'projcontacts_id' => $contact['id'],
             'projcontacts_rowid' => $contact['rowid'],
@@ -241,7 +241,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -251,7 +251,7 @@ 
      */
     public function get_substitutionarray_project_file($file, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'projfile_name' => $file['name'],
             'projfile_date' => dol_print_date($file['date'], 'day'),
@@ -259,7 +259,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -269,7 +269,7 @@ 
      */
     public function get_substitutionarray_project_reference($refdetail, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'projref_type' => $refdetail['type'],
             'projref_ref' => $refdetail['ref'],
@@ -281,7 +281,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -291,7 +291,7 @@ 
      */
     public function get_substitutionarray_tasksressource($taskresource, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
 
         //dol_syslog(get_class($this).'::get_substitutionarray_tasksressource taskressource='.var_export($taskressource,true),LOG_DEBUG);
         return array(
@@ -305,7 +305,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -315,7 +315,7 @@ 
      */
     public function get_substitutionarray_taskstime($tasktime, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf;
 
         return array(
@@ -330,7 +330,7 @@ 
         );
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Define array with couple substitution key => substitution value
      *
@@ -340,7 +340,7 @@ 
      */
     public function get_substitutionarray_task_file($file, $outputlangs)
     {
-		// phpcs:enable
+        // phpcs:enable
         return array(
             'tasksfile_name' => $file['name'],
             'tasksfile_date' => dol_print_date($file['date'], 'day'),
@@ -449,7 +449,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.
      *
@@ -460,7 +460,7 @@ 
      */
     public function write_file($object, $outputlangs, $srctemplatepath)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $langs, $conf, $mysoc, $hookmanager;
 
         if (empty($srctemplatepath)) {

Spacing +1 added lines, -1 removed lines

@@ -434,7 +434,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="PROJECT_TASK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';

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

Indentation +8 added lines, -8 removed lines

@@ -127,7 +127,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -141,7 +141,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();
@@ -676,8 +676,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
      *
@@ -692,7 +692,7 @@ 
      */
     protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs, $totalOrdered, $totalAmount = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $mysoc;
 
         $sign = 1;
@@ -794,7 +794,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -888,7 +888,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page.
      *
@@ -1129,7 +1129,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

@@ -293,7 +293,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 : 10);
 
                 $tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;

public/htdocs/core/modules/reception/doc/doc_generic_reception_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

@@ -170,7 +170,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="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';

public/htdocs/core/modules/dons/html_generic.modules.php

Indentation +2 added lines, -2 removed lines

@@ -183,7 +183,7 @@ 
         return 1;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Write the object to document file to disk
      *
@@ -194,7 +194,7 @@ 
      */
     public function write_file($don, $outputlangs, $currency = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $mysoc;
 
         $id = (!is_object($don) ? $don : '');

public/htdocs/core/modules/dons/html_cerfafr.modules.php

Indentation +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Write the object to document file to disk
      *
@@ -77,7 +77,7 @@ 
      */
     public function write_file($don, $outputlangs, $currency = '')
     {
-		// phpcs:enable
+        // phpcs:enable
         global $user, $conf, $langs, $mysoc;
 
         $now = dol_now();

public/htdocs/core/modules/facture/doc/pdf_sponge.modules.php

Indentation +8 added lines, -8 removed lines

@@ -182,7 +182,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -196,7 +196,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'));
@@ -1974,7 +1974,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -1984,11 +1984,11 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -2056,7 +2056,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page. This include the logo, ref and address blocks
      *
@@ -2069,7 +2069,7 @@ 
      */
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $ltrdirection = 'L';
@@ -2449,7 +2449,7 @@ 
         return $pagehead;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

Spacing +4 added lines, -4 removed lines

@@ -453,7 +453,7 @@ 
                 // $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
                 // $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-                $this->tab_top = 90 + $top_shift + $shipp_shift;        // top_shift is an addition for linked objects or addons (0 in most cases)
+                $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
                 $this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
                 // You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -690,7 +690,7 @@ 
                     }
 
                     $pdf->setTopMargin($this->tab_top_newpage);
-                    $page_bottom_margin =  $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs);
+                    $page_bottom_margin = $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot + $this->getHeightForQRInvoice($pdf->getPage(), $object, $langs);
                     $pdf->setPageOrientation('', 1, $page_bottom_margin);
                     $pageposbefore = $pdf->getPage();
 
@@ -934,7 +934,7 @@ 
                     if (!isset($this->tva[$vatrate])) {
                         $this->tva[$vatrate] = 0;
                     }
-                    $this->tva[$vatrate] += $tvaligne;  // ->tva is abandoned, we use now ->tva_array that is more complete
+                    $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
                     $vatcode = $object->lines[$i]->vat_src_code;
                     if (empty($this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'])) {
                         $this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'] = 0;
@@ -1228,7 +1228,7 @@ 
             $posy = $pdf->GetY() + 4;
         }
 
-        $posxval = 52;  // Position of values of properties shown on left side
+        $posxval = 52; // Position of values of properties shown on left side
         $posxend = 110; // End of x for text on left side
         if ($this->page_largeur < 210) { // To work with US executive format
             $posxend -= 10;

public/htdocs/core/modules/facture/doc/pdf_octopus.modules.php

Indentation +8 added lines, -8 removed lines

@@ -182,7 +182,7 @@ 
     }
 
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Function to build pdf onto disk
      *
@@ -196,7 +196,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'));
@@ -1974,7 +1974,7 @@ 
         return ($tab2_top + ($tab2_hl * $index));
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
     /**
      *  Return list of active generation modules
      *
@@ -1984,11 +1984,11 @@ 
      */
     public static function liste_modeles($db, $maxfilenamelength = 0)
     {
-		// phpcs:enable
+        // phpcs:enable
         return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *   Show table for lines
      *
@@ -2056,7 +2056,7 @@ 
         }
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *  Show top header of page. This include the logo, ref and address blocks
      *
@@ -2069,7 +2069,7 @@ 
      */
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
     {
-		// phpcs:enable
+        // phpcs:enable
         global $conf, $langs;
 
         $ltrdirection = 'L';
@@ -2449,7 +2449,7 @@ 
         return $pagehead;
     }
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
     /**
      *      Show footer of page. Need this->emetteur object
      *

Spacing +34 added lines, -34 removed lines

@@ -78,7 +78,7 @@ 
      * Dolibarr version of the loaded document
      * @var string
      */
-    public $version = 'disabled';   // Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
+    public $version = 'disabled'; // Disabled by default. Enabled in constructor if option INVOICE_USE_SITUATION is 2.
 
     /**
      * @var int height for info total
@@ -292,7 +292,7 @@ 
             $outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
         }
 
-        if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE &&  !empty($object->situation_cycle_ref)))) {
+        if (empty($object) || ($object->type != Facture::TYPE_SITUATION && ($object->type != Facture::TYPE_CREDIT_NOTE && !empty($object->situation_cycle_ref)))) {
             setEventMessage($langs->trans('WarningsObjectIsNotASituation'), 'warnings');
             return 1;
         }
@@ -411,7 +411,7 @@ 
                 $pdf->SetAutoPageBreak(1, 0);
 
                 // compute height for situation invoices
-                $this->heightforinfotot = 45;   // Height reserved to output the info and total part and payment part
+                $this->heightforinfotot = 45; // Height reserved to output the info and total part and payment part
                 if (!getDolGlobalString('INVOICE_NO_PAYMENT_DETAILS') && $nbpayments > 0) {
                     $this->heightforinfotot += 4 * ($nbpayments + 3);
                 }
@@ -525,7 +525,7 @@ 
                 // $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
                 // $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-                $this->tab_top = 90 + $top_shift + $shipp_shift;        // top_shift is an addition for linked objects or addons (0 in most cases)
+                $this->tab_top = 90 + $top_shift + $shipp_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
                 $this->tab_top_newpage = (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD') ? 42 + $top_shift : 10);
 
                 // You can add more thing under header here, if you increase $extra_under_address_shift too.
@@ -1037,7 +1037,7 @@ 
                     if (!isset($this->tva[$vatrate])) {
                         $this->tva[$vatrate] = 0;
                     }
-                    $this->tva[$vatrate] += $tvaligne;  // ->tva is abandoned, we use now ->tva_array that is more complete
+                    $this->tva[$vatrate] += $tvaligne; // ->tva is abandoned, we use now ->tva_array that is more complete
                     $vatcode = $object->lines[$i]->vat_src_code;
                     if (empty($this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'])) {
                         $this->tva_array[$vatrate . ($vatcode ? ' (' . $vatcode . ')' : '')]['amount'] = 0;
@@ -1337,7 +1337,7 @@ 
             $posy = $pdf->GetY() + 4;
         }
 
-        $posxval = 52;  // Position of values of properties shown on left side
+        $posxval = 52; // Position of values of properties shown on left side
         $posxend = 110; // End of x for text on left side
         if ($this->page_largeur < 210) { // To work with US executive format
             $posxend -= 10;
@@ -1700,7 +1700,7 @@ 
                     if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
                         $vatrate .= '*';
                     }
-                    if (! isset($tvas[$vatrate])) {
+                    if (!isset($tvas[$vatrate])) {
                         $tvas[$vatrate] = 0;
                     }
                     $tvas[$vatrate] += $tvaligne;
@@ -2013,7 +2013,7 @@ 
         $pdf->SetFont('', '', $default_font_size - 1);
 
         if (empty($hidetop)) {
-            $pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);   // line prend une position y en 2eme param et 4eme param
+            $pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5); // line prend une position y en 2eme param et 4eme param
         }
     }
 
@@ -2583,7 +2583,7 @@ 
             'overtitle' => array(
                 'textkey' => 'Chantier', // use lang key is useful in somme case with module
                 'align' => 'C',
-                'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
                 'width' => 18
             ),
         );
@@ -2610,11 +2610,11 @@ 
             'overtitle' => array(
                 'textkey' => $outputlangs->transnoentities('SituationInvoiceDate', $derniere_situation->situation_counter, dol_print_date($derniere_situation->date, "%d/%m/%Y")), // use lang key is useful in somme case with module
                 'align' => 'C',
-                'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
                 'width' => 10 + 15 //current width + amount cell width
             ),
         );
-        if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+        if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
             $this->cols['prev_progress']['status'] = true;
         }
 
@@ -2629,7 +2629,7 @@ 
             ),
             'border-left' => true, // add left line separator
         );
-        if ($this->situationinvoice && ! empty($this->TDataSituation['date_derniere_situation'])) {
+        if ($this->situationinvoice && !empty($this->TDataSituation['date_derniere_situation'])) {
             $this->cols['prev_progress_amount']['status'] = true;
         }
 
@@ -2646,7 +2646,7 @@ 
             'overtitle' => array(
                 'textkey' => $outputlangs->transnoentities('SituationInvoiceDate', $object->situation_counter, dol_print_date($object->date, "%d/%m/%Y")), // use lang key is useful in somme case with module
                 'align' => 'C',
-                'padding' => array(0.5,0.2,0.5,0.2), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+                'padding' => array(0.5, 0.2, 0.5, 0.2), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
                 'width' => 10 + 15
             ),
         );
@@ -2769,7 +2769,7 @@ 
 
         // Output Rect
         // KEEPTHIS => Affiche les bords extérieurs
-        $this->printRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom);  // Rect prend une longueur en 3eme param et 4eme param
+        $this->printRectBtp($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect prend une longueur en 3eme param et 4eme param
 
         $pdf->line($this->posx_cumul_anterieur - 1, $tab_top, $this->posx_cumul_anterieur - 1, $tab_top + $tab_height);
         if (empty($hidetop)) {
@@ -2826,7 +2826,7 @@ 
             $pdf->SetXY($this->marge_gauche + 10, $tab_top + 24 + $i);
             $pdf->MultiCell(80, 2, $outputlangs->transnoentities("TotalHT") . ' ' . $TVatInfo['label'], '', 'L');
 
-            if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+            if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
                 $pdf->SetXY($this->marge_gauche + 10, $tab_top + 28 + $i);
                 $pdf->MultiCell(80, 2, $outputlangs->transnoentities("VAT") . ' ' . $TVatInfo['label'], '', 'L');
             } else {
@@ -2890,7 +2890,7 @@ 
                 $pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['HT'], 0, '', 1, -1, 2), '', 'R');
 
                 // Total TVA
-                if (! empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
+                if (!empty($this->TDataSituation['current'][$tva_tx_formated]['TVA'])) {
                     $pdf->SetXY($x, $tab_top + 28 + $i);
                     $pdf->MultiCell(32, 2, price($this->TDataSituation[$col][$tva_tx_formated]['TVA'], 0, '', 1, -1, 2), '', 'R');
                 } else {
@@ -2970,7 +2970,7 @@ 
 
         $TDataSituation = array();
 
-        if (! empty($facDerniereSituation)) {
+        if (!empty($facDerniereSituation)) {
             $TDataSituation['derniere_situation'] = $facDerniereSituation;
             $TDataSituation['date_derniere_situation'] = $facDerniereSituation->date;
         }
@@ -2979,9 +2979,9 @@ 
         $retenue_garantie_anterieure = 0;
         // Init tous les champs à 0
         $TDataSituation['cumul_anterieur'] = array(
-            'HT' => 0,  //montant HT normal
-            'TVA' => 0,   //montant de la TVA sur le HTnet
-            'TTC' => 0,   //montant TTC (HTnet + TVA)
+            'HT' => 0, //montant HT normal
+            'TVA' => 0, //montant de la TVA sur le HTnet
+            'TTC' => 0, //montant TTC (HTnet + TVA)
             'retenue_garantie' => 0,
             'travaux_sup' => 0,
             'HTnet' => 0, //montant HT
@@ -3011,7 +3011,7 @@ 
                     $isFirstSituation = false;
                     if (!empty($l->fk_prev_id)) {
                         $prevSituationPercent = $l->get_prev_progress($previousInvoice->id, true);
-                    } elseif (! array_key_exists($i + 1, $TPreviousInvoices)) {
+                    } elseif (!array_key_exists($i + 1, $TPreviousInvoices)) {
                         $isFirstSituation = true;
                     }
 
@@ -3021,7 +3021,7 @@ 
 
                     //1ere ligne
                     $amounttva = $calc_ht * ($ltvatx / 100);
-                    if (! isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
+                    if (!isset($TDataSituation['cumul_anterieur'][$ltvatx])) {
                         $TDataSituation['cumul_anterieur'][$ltvatx]['HT'] = $calc_ht;
                         $TDataSituation['cumul_anterieur'][$ltvatx]['TVA'] = $amounttva;
                     } else {
@@ -3033,14 +3033,14 @@ 
                     //le grand total de TVA
                     // $TDataSituation['cumul_anterieur']['TVA'] += $amounttva;
 
-                    if (empty($l->fk_prev_id) && ! $isFirstSituation) {
+                    if (empty($l->fk_prev_id) && !$isFirstSituation) {
                         // TODO: à clarifier, mais pour moi, un facture de situation précédente qui a des progressions à 0% c'est pas logique
                         $TDataSituation['cumul_anterieur']['travaux_sup'] += $calc_ht;
                     }
                 }
             }
 
-            if (! empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
+            if (!empty($previousInvoice->retained_warranty) && !getDolGlobalString('USE_RETAINED_WARRANTY_ONLY_FOR_SITUATION_FINAL')) {
                 $retenue_garantie_anterieure += $previousInvoice->getRetainedWarrantyAmount();
             }
 
@@ -3054,7 +3054,7 @@ 
         // print json_encode($facDerniereSituation->lines);exit;
         $TDataSituation['current'] = $this->btpGetInvoiceAmounts($object->id);
 
-        if (! empty($facDerniereSituation->lines)) {
+        if (!empty($facDerniereSituation->lines)) {
             $TFacLinesKey = array_keys($facDerniereSituation->lines);
             $TObjectLinesKey = array_keys($object->lines);
             $TDiffKey = array_diff($TObjectLinesKey, $TFacLinesKey);
@@ -3220,7 +3220,7 @@ 
      */
     public function btpGetInvoiceAmounts($id, $forceReadFromDB = false)
     {
-        global $user,$langs,$conf,$mysoc,$db,$hookmanager,$nblignes;
+        global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblignes;
 
         $object = new Facture($db);
         $object->fetch($id);
@@ -3238,16 +3238,16 @@ 
         $facDerniereSituation = $TPreviousInvoices[0];
 
         $ret = array(
-            'HT' => 0,  //montant HT normal
+            'HT' => 0, //montant HT normal
             'HTnet' => 0, //montant HT
-            'TVA' => 0,   //montant de la TVA sur le HTnet
-            'TTC' => 0,   //montant TTC (HTnet + TVA)
+            'TVA' => 0, //montant de la TVA sur le HTnet
+            'TTC' => 0, //montant TTC (HTnet + TVA)
             'retenue_garantie' => 0,
             'travaux_sup' => 0,
             'total_a_payer' => 0 //montant "a payer" sur la facture
         );
 
-        if (! empty($facDerniereSituation)) {
+        if (!empty($facDerniereSituation)) {
             $ret['derniere_situation'] = $facDerniereSituation;
             $ret['date_derniere_situation'] = $facDerniereSituation->date;
         }
@@ -3379,14 +3379,14 @@ 
             $label = $outputlangs->transnoentities("SituationInvoiceTotalProposal");
             $pdf->MultiCell($this->page_largeur - ($this->marge_droite + $this->marge_gauche), 3, $label, 0, 'L', 0, 1, $posx, $posy + 1);
 
-            $amount = price($sign * ($total_ht + (! empty($propal->remise) ? $propal->remise : 0)));
+            $amount = price($sign * ($total_ht + (!empty($propal->remise) ? $propal->remise : 0)));
             $pdf->MultiCell($width2, 3, $amount, 0, 'R', 0, 1, $posx + $width, $posy + 1);
 
             $pdf->SetFont('', '', $default_font_size - 1);
 
             // Output Rect
             $pdf->SetDrawColor(128, 128, 128);
-            $this->printRect($pdf, $posx, $posy, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 6);   // Rect prend une longueur en 3eme param et 4eme param
+            $this->printRect($pdf, $posx, $posy, $this->page_largeur - $this->marge_gauche - $this->marge_droite, 6); // Rect prend une longueur en 3eme param et 4eme param
 
             $posy += 4;
         } elseif (count($orders)) {
@@ -3421,7 +3421,7 @@ 
 
         $force_to_zero = false;
 
-        $idinv = 0;//count($previousinvoices);
+        $idinv = 0; //count($previousinvoices);
         while ($idinv < count($previousinvoices)) {
             $invoice = $previousinvoices[$idinv];
 
@@ -3471,7 +3471,7 @@ 
                 if (($invoice->lines[$i]->info_bits & 0x01) == 0x01) {
                     $vatrate .= '*';
                 }
-                if (! isset($tvas[$vatrate])) {
+                if (!isset($tvas[$vatrate])) {
                     $tvas[$vatrate] = 0;
                 }
                 $tvas[$vatrate] += $tvaligne;

Braces +9 added lines, -3 removed lines

@@ -3558,7 +3558,9 @@ 
             $deja_regle = $invoice->getSommePaiement();
 
             $resteapayer = price2num($invoice->total_ttc - $deja_regle - $total_ttc_rg - $creditnoteamount - $depositsamount, 'MT');
-            if ($invoice->paye) $resteapayer = 0;
+            if ($invoice->paye) {
+                $resteapayer = 0;
+            }
 
             $y = 0;
 
@@ -3608,7 +3610,9 @@ 
 
             if ($deja_regle > 0) {
                 $title = $outputlangs->transnoentities("PaymentsAlreadyDone");
-                if ($invoice->type == 2) $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+                if ($invoice->type == 2) {
+                    $title = $outputlangs->transnoentities("PaymentsBackAlreadyDone");
+                }
 
                 $pdf->SetFont('', '', $default_font_size - 3);
                 $pdf->SetXY($posx, $posy + $height * $index);
@@ -3671,7 +3675,9 @@ 
                 if (!empty($this->tplidx)) {
                     $pdf->useTemplate($this->tplidx);
                 }
-                if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) $this->_pagehead($pdf, $object, 0, $outputlangs);
+                if (!getDolGlobalInt('MAIN_PDF_DONOTREPEAT_HEAD')) {
+                    $this->_pagehead($pdf, $object, 0, $outputlangs);
+                }
                 $pdf->setPage($pageposafter + 1);
                 $pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.