alxarafe / alixar

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

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/modSociete.class.php

Spacing +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
         $this->rights[$r][0] = 130;
         $this->rights[$r][1] = 'Modify thirdparty information payment';
         $this->rights[$r][3] = 0;
-        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance';      // Visible if option MAIN_USE_ADVANCED_PERMS is on
+        $this->rights[$r][4] = 'thirdparty_paymentinformation_advance'; // Visible if option MAIN_USE_ADVANCED_PERMS is on
         $this->rights[$r][5] = 'write';
 
         // 262 : Restrict access to sales representative

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

Spacing +2 added lines, -2 removed lines

@@ -268,7 +268,7 @@ 
             $this->export_dependencies_array[$r] = array('category' => 'p.rowid');
         }
         $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-        $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
+        $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
         if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
             $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
         }
@@ -417,7 +417,7 @@ 
                 $this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p2.rowid' => "Id", 'p2.ref' => "Ref", 'p2.label' => "Label", 'p2.description' => "Description"));
                 $this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p2.rowid' => "subproduct", 'p2.ref' => "subproduct", 'p2.label' => "subproduct", 'p2.description' => "subproduct"));
                 $this->export_sql_start[$r] = 'SELECT DISTINCT ';
-                $this->export_sql_end[$r]  = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
+                $this->export_sql_end[$r] = ' FROM ' . MAIN_DB_PREFIX . 'product as p';
                 if (getDolGlobalString('MAIN_PRODUCT_PERENTITY_SHARED')) {
                     $this->export_sql_end[$r] .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_perentity as pac ON pac.fk_product = p.rowid AND pac.entity = " . ((int) $conf->entity);
                 }

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

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

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;

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

Spacing +4 added lines, -4 removed lines

@@ -175,7 +175,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="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -410,10 +410,10 @@ 
                 }
 
                 // Define substitution array
-                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);    // Set tags __...__
+                $substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object); // Set tags __...__
                 $array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-                $array_objet = $this->get_substitutionarray_object($object, $outputlangs);          // Set tags object_...
-                $array_user = $this->get_substitutionarray_user($user, $outputlangs);               // Set tags myuser_...
+                $array_objet = $this->get_substitutionarray_object($object, $outputlangs); // Set tags object_...
+                $array_user = $this->get_substitutionarray_user($user, $outputlangs); // Set tags myuser_...
                 $array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
                 $array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
                 $array_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array();

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

Spacing +4 added lines, -4 removed lines

@@ -444,7 +444,7 @@ 
                 // $pdf->GetY() here can't be used. It is bottom of the second address box but first one may be higher
 
                 // $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-                $tab_top = 90 + $top_shift;     // top_shift is an addition for linked objects or addons (0 in most cases)
+                $tab_top = 90 + $top_shift; // top_shift is an addition for linked objects or addons (0 in most cases)
                 $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.
@@ -774,7 +774,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;
@@ -1153,7 +1153,7 @@ 
             $lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
             $pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
-            $posy = $pdf->GetY() + 3;   // We need spaces for 2 lines payment conditions
+            $posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
         }
 
         // Show category of operations
@@ -2113,7 +2113,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

public/htdocs/core/modules/takepos/mod_takepos_ref_simple.php

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
      */
     public function getExample()
     {
-        return $this->prefix . '0-0501-0001';     // TC0-0501-0001
+        return $this->prefix . '0-0501-0001'; // TC0-0501-0001
     }
 
     /**
@@ -98,10 +98,10 @@ 
         $pryymm = '';
         $max = '';
 
-        $pos_source = 0;    // POS source = Terminal ID
+        $pos_source = 0; // POS source = Terminal ID
 
         // First, we get the max value
-        $posindice = strlen($this->prefix . $pos_source . '-____-') + 1;    // So posindice is position after TCX-YYMM-
+        $posindice = strlen($this->prefix . $pos_source . '-____-') + 1; // So posindice is position after TCX-YYMM-
 
         $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max";
         $sql .= " FROM " . MAIN_DB_PREFIX . "facture";
@@ -141,10 +141,10 @@ 
     {
         global $db;
 
-        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0;   // POS source = Terminal ID
+        $pos_source = is_object($invoice) && $invoice->pos_source > 0 ? $invoice->pos_source : 0; // POS source = Terminal ID
 
         // First, we get the max value
-        $posindice = strlen($this->prefix . $pos_source . '-____-') + 1;    // So posindice is position after TCX-YYMM-
+        $posindice = strlen($this->prefix . $pos_source . '-____-') + 1; // So posindice is position after TCX-YYMM-
         $sql  = "SELECT MAX(CAST(SUBSTRING(ref FROM " . $posindice . ") AS SIGNED)) as max"; // This is standard SQL
         $sql .= " FROM " . MAIN_DB_PREFIX . "facture";
         $sql .= " WHERE ref LIKE '" . $db->escape($this->prefix . $pos_source . "-____-%") . "'";

public/htdocs/core/modules/printing/printgcp.modules.php

Spacing +4 added lines, -4 removed lines

@@ -116,7 +116,7 @@ 
                 'type' => 'info',
             );
         } else {
-            $keyforprovider = '';   // @FIXME
+            $keyforprovider = ''; // @FIXME
 
             $this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
             $this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
@@ -258,7 +258,7 @@ 
         global $conf;
         $ret = array();
 
-        $keyforprovider = '';   // @FIXME
+        $keyforprovider = ''; // @FIXME
 
         // Token storage
         $storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -400,7 +400,7 @@ 
             'contentType' => $contenttype,
         );
 
-        $keyforprovider = '';   // @FIXME
+        $keyforprovider = ''; // @FIXME
 
         // Dolibarr Token storage
         $storage = new DoliStorage($this->db, $conf, $keyforprovider);
@@ -452,7 +452,7 @@ 
         $error = 0;
         $html = '';
 
-        $keyforprovider = '';   // @FIXME
+        $keyforprovider = ''; // @FIXME
 
         // Token storage
         $storage = new DoliStorage($this->db, $conf, $keyforprovider);