alxarafe / alixar

public/htdocs/fourn/facture/card-rec.php

Spacing +20 added lines, -20 removed lines

@@ -87,10 +87,10 @@ 
     $page = 0;
 }     // If $page is not defined, or '' or -1
 $offset = $limit * $page;
-if (! $sortorder) {
+if (!$sortorder) {
     $sortorder = 'DESC';
 }
-if (! $sortfield) {
+if (!$sortfield) {
     $sortfield = 'f.titre';
 }
 $pageprev = $page - 1;
@@ -99,7 +99,7 @@ 
 $object = new FactureFournisseurRec($db);
 if (($id > 0 || $title) && $action != 'create' && $action != 'add') {
     $ret = $object->fetch($id, $title);
-    if (! $ret) {
+    if (!$ret) {
         setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
     }
 }
@@ -143,7 +143,7 @@ 
     $action = 'list';
     $massaction = '';
 }
-if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
     $massaction = '';
 }
 
@@ -170,7 +170,7 @@ 
 
     // Create predefined invoice
     if ($action == 'add') {
-        if (! GETPOST('title', 'alphanohtml')) {
+        if (!GETPOST('title', 'alphanohtml')) {
             setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
             $action = "create";
             $error++;
@@ -193,10 +193,10 @@ 
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $object->subtype               = GETPOSTINT('subtype');
             $object->title                 = GETPOST('title', 'alphanohtml');
-            $object->libelle               = GETPOST('libelle', 'alpha');   // deprecated
+            $object->libelle               = GETPOST('libelle', 'alpha'); // deprecated
             $object->label                 = GETPOST('libelle', 'alpha');
             $object->fk_project            = GETPOSTINT('projectid');
             $object->ref_supplier          = GETPOST('ref_supplier', 'alphanohtml');
@@ -242,7 +242,7 @@ 
                 $action = "create";
             }
 
-            if (! $error) {
+            if (!$error) {
                 $db->commit();
 
                 header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
@@ -292,7 +292,7 @@ 
         $result = $object->setValueFrom('titre', $title, '', null, 'text', '', $user);
 
         if ($result > 0) {
-            $object->titre = $title;    // deprecated
+            $object->titre = $title; // deprecated
             $object->title = $title;
             $object->ref = $object->title;
         } else {
@@ -339,7 +339,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $db->commit();
         } else {
             $db->rollback();
@@ -356,7 +356,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $db->commit();
         } else {
             $db->rollback();
@@ -415,7 +415,7 @@ 
             $error++;
         }
 
-        if (! $error) {
+        if (!$error) {
             $result = $object->insertExtraFields('BILLREC_MODIFY');
             if ($result < 0) {
                 setEventMessages($object->error, $object->errors, 'errors');
@@ -466,7 +466,7 @@ 
             setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
             $error++;
         }
-        if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (! ($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
+        if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (!($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
             setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
             $error++;
         }
@@ -515,7 +515,7 @@ 
             }
         }
 
-        if (! $error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
+        if (!$error && ($qty >= 0) && (!empty($product_desc) || (!empty($idprod) && $idprod > 0))) {
             $ret = $object->fetch($id);
             if ($ret < 0) {
                 dol_print_error($db, $object->error);
@@ -731,8 +731,8 @@ 
                 $action = '';
             }
         }
-    } elseif ($action == 'updateline' && $usercancreate && ! GETPOST('cancel', 'alpha')) {
-        if (! $object->fetch($id) > 0) {
+    } elseif ($action == 'updateline' && $usercancreate && !GETPOST('cancel', 'alpha')) {
+        if (!$object->fetch($id) > 0) {
             dol_print_error($db);
         }
         $object->fetch_thirdparty();
@@ -783,7 +783,7 @@ 
 
         // Define special_code for special lines
         $special_code = GETPOSTINT('special_code');
-        if (! GETPOST('qty', 'alpha')) {
+        if (!GETPOST('qty', 'alpha')) {
             $special_code = 3;
         }
 
@@ -829,7 +829,7 @@ 
         $date_end_fill = !empty(GETPOSTINT('date_end_fill')) ? GETPOSTINT('date_end_fill') : 'NULL';
 
         // Update line
-        if (! $error) {
+        if (!$error) {
             $result = $object->updateline(GETPOSTINT('lineid'), GETPOSTINT('productid'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
             if ($result >= 0) {
                 $object->fetch($object->id); // Reload lines
@@ -1488,8 +1488,8 @@ 
             print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
         }
         //var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
-        if (! $object->isMaxNbGenReached()) {
-            if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+        if (!$object->isMaxNbGenReached()) {
+            if (!$object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
                 print img_warning($langs->trans("Late"));
             }
         } else {

public/htdocs/fourn/paiement/card.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 // Load object
 include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-$result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', '');    // This also test permission on read invoice
+$result = restrictedArea($user, $object->element, $object->id, 'paiementfourn', ''); // This also test permission on read invoice
 
 // Security check
 if ($user->socid) {

public/htdocs/fourn/paiement/list.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
 $search_date_endday     = GETPOSTINT('search_date_endday');
 $search_date_endmonth   = GETPOSTINT('search_date_endmonth');
 $search_date_endyear    = GETPOSTINT('search_date_endyear');
-$search_date_start      = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);  // Use tzserver
+$search_date_start      = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end        = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_company         = GETPOST('search_company', 'alpha');
 $search_payment_type    = GETPOST('search_payment_type', 'alpha');
@@ -110,7 +110,7 @@ 
     'p.amount'          => array('label' => "Amount", 'checked' => 1, 'position' => 70),
 );
 $arrayfields = dol_sort_array($arrayfields, 'position');
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('paymentsupplierlist'));
@@ -207,7 +207,7 @@ 
 $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'facture_fourn AS f ON f.rowid = pf.fk_facturefourn';
 $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . 'societe AS s ON s.rowid = f.fk_soc';
 
-$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')';       // TODO We should use p.entity that does not exists yet in this table
+$sql .= ' WHERE f.entity IN (' . getEntity('supplier_invoice') . ')'; // TODO We should use p.entity that does not exists yet in this table
 if ($socid > 0) {
     $sql .= " AND EXISTS (SELECT f.fk_soc FROM " . MAIN_DB_PREFIX . "facture_fourn as f, " . MAIN_DB_PREFIX . "paiementfourn_facturefourn as pf";
     $sql .= " WHERE p.rowid = pf.fk_paiementfourn AND pf.fk_facturefourn = f.rowid AND f.fk_soc = " . ((int) $socid) . ")";

public/htdocs/fourn/class/fournisseur.facture-rec.class.php

Spacing +13 added lines, -13 removed lines

@@ -351,13 +351,13 @@ 
             $sql .= ", '" . $this->db->idate($now) . "'";
             $sql .= ", " . ((int) $this->suspended);
             $sql .= ", '" . $this->db->escape($this->libelle) . "'";
-            $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
+            $sql .= ", " . (!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0'); // amount
             $sql .= ", " . ((int) $user->id);
             $sql .= ", " . (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
             $sql .= ", " . (!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
             $sql .= ", " . ($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
             $sql .= ", " . ($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
-            $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL');      // date_lim_reglement
+            $sql .= ", " . ($facfourn_src->date_echeance > 0 ? "'" . $this->db->idate($facfourn_src->date_echeance) . "'" : 'NULL'); // date_lim_reglement
             $sql .= ", " . (!empty($this->note_private) ? "'" . $this->db->escape($this->note_private) . "'" : 'NULL');
             $sql .= ", " . (!empty($this->note_public) ? "'" . $this->db->escape($this->note_public) . "'" : 'NULL');
             $sql .= ", " . (!empty($this->model_pdf) ? "'" . $this->db->escape($this->model_pdf) . "'" : 'NULL');
@@ -512,7 +512,7 @@ 
         $error = 0;
 
         $sql = "UPDATE " . MAIN_DB_PREFIX . "facture_fourn_rec SET";
-        $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "'," ;
+        $sql .= " titre = '" . (!empty($this->title) ? $this->db->escape($this->title) : "") . "',";
         $sql .= " subtype=" . (isset($this->subtype) ? $this->db->escape($this->subtype) : "null") . ",";
         $sql .= " ref_supplier = '" . (!empty($this->ref_supplier) ? $this->db->escape($this->ref_supplier) : "") . "',";
         $sql .= " entity = " . (!empty($this->entity) ? ((int) $this->entity) : 1) . ',';
@@ -630,7 +630,7 @@ 
                 $this->id                       = $obj->rowid;
                 $this->titre                    = $obj->title;
                 $this->title                    = $obj->title;
-                $this->subtype                        = $obj->subtype;
+                $this->subtype = $obj->subtype;
                 $this->ref                      = $obj->title;
                 $this->ref_supplier             = $obj->ref_supplier;
                 $this->entity                   = $obj->entity;
@@ -788,7 +788,7 @@ 
                 $line->product_type             = $objp->product_type;
                 $line->date_start               = $objp->date_start;
                 $line->date_end                 = $objp->date_end;
-                $line->info_bits                = $objp->info_bits  ;
+                $line->info_bits                = $objp->info_bits;
                 $line->special_code             = $objp->special_code;
                 $line->rang                     = $objp->rang;
                 $line->fk_unit                  = $objp->fk_unit;
@@ -871,7 +871,7 @@ 
             }
             // End call triggers
         }
-        if (! $error) {
+        if (!$error) {
             $this->db->commit();
             return 1;
         } else {
@@ -1015,7 +1015,7 @@ 
             $sql .= ', fk_user_author';
             $sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
             $sql .= ') VALUES (';
-            $sql .= ' ' . (int) $facid;   // source supplier invoice id
+            $sql .= ' ' . (int) $facid; // source supplier invoice id
             $sql .= ', ' . (!empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
             $sql .= ', ' . (!empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
             $sql .= ', ' . (!empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
@@ -1356,7 +1356,7 @@ 
 
                     $new_fac_fourn->type = self::TYPE_STANDARD;
                     $new_fac_fourn->subtype = $facturerec->subtype;
-                    $new_fac_fourn->statut = self::STATUS_DRAFT;    // deprecated
+                    $new_fac_fourn->statut = self::STATUS_DRAFT; // deprecated
                     $new_fac_fourn->status = self::STATUS_DRAFT;
                     $new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
                     $new_fac_fourn->socid = $facturerec->socid;
@@ -1365,7 +1365,7 @@ 
                     $new_fac_fourn->model_pdf = $facturerec->model_pdf;
                     $new_fac_fourn->fk_project = $facturerec->fk_project;
                     $new_fac_fourn->label = $facturerec->label;
-                    $new_fac_fourn->libelle = $facturerec->label;   // deprecated
+                    $new_fac_fourn->libelle = $facturerec->label; // deprecated
 
                     $invoiceidgenerated = $new_fac_fourn->create($user);
                     $laststep = "Create invoiceidgenerated $invoiceidgenerated";
@@ -2072,8 +2072,8 @@ 
         $error = 0;
         $this->db->begin();
 
-        if (! $error) {
-            if (! $notrigger) {
+        if (!$error) {
+            if (!$notrigger) {
                 // Call triggers
                 $result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
                 if ($result < 0) {
@@ -2083,14 +2083,14 @@ 
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $result = $this->deleteExtraFields();
             if ($result < 0) {
                 $error++;
             }
         }
 
-        if (! $error) {
+        if (!$error) {
             $sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
 
             $res = $this->db->query($sql);

public/htdocs/fourn/class/fournisseur.commande.class.php

Spacing +15 added lines, -15 removed lines

@@ -520,7 +520,7 @@ 
             $this->ref_supplier = $obj->ref_supplier;
             $this->socid = $obj->fk_soc;
             $this->fourn_id = $obj->fk_soc;
-            $this->statut = $obj->status;   // deprecated
+            $this->statut = $obj->status; // deprecated
             $this->status = $obj->status;
             $this->billed = $obj->billed;
             $this->user_author_id = $obj->user_author_id;
@@ -551,7 +551,7 @@ 
             $this->fk_project = $obj->fk_project;
             $this->cond_reglement_id = $obj->fk_cond_reglement;
             $this->cond_reglement_code = $obj->cond_reglement_code;
-            $this->cond_reglement = $obj->cond_reglement_label;         // deprecated
+            $this->cond_reglement = $obj->cond_reglement_label; // deprecated
             $this->cond_reglement_label = $obj->cond_reglement_label;
             $this->cond_reglement_doc = $obj->cond_reglement_doc;
             $this->fk_account = $obj->fk_account;
@@ -684,10 +684,10 @@ 
                     $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")";
                     $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product);
                     $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'";
-                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty);  // required to be qualified
-                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")";  // required to be qualified
+                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified
+                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified
                     $sqlsearchpackage .= " AND fk_soc = " . ((int) $this->socid);
-                    $sqlsearchpackage .= " ORDER BY packaging ASC";     // Take the smaller package first
+                    $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
                     $sqlsearchpackage .= " LIMIT 1";
 
                     $resqlsearchpackage = $this->db->query($sqlsearchpackage);
@@ -1623,10 +1623,10 @@ 
                         $line->date_end,
                         $line->array_options,
                         $line->fk_unit,
-                        $line->multicurrency_subprice,  // pu_ht_devise
-                        $line->origin,     // origin
-                        $line->origin_id,  // origin_id
-                        $line->rang,       // rang
+                        $line->multicurrency_subprice, // pu_ht_devise
+                        $line->origin, // origin
+                        $line->origin_id, // origin_id
+                        $line->rang, // rang
                         $line->special_code
                     );
                     if ($result < 0) {
@@ -2000,7 +2000,7 @@ 
             $this->db->begin();
 
             $product_type = $type;
-            $label = '';    // deprecated
+            $label = ''; // deprecated
 
             if ($fk_product > 0) {
                 if (getDolGlobalString('SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY')) { // Not the common case
@@ -2143,7 +2143,7 @@ 
             $this->line->total_localtax2 = $total_localtax2;
             $this->line->total_ttc = $total_ttc;
             $this->line->product_type = $type;
-            $this->line->special_code   = (!empty($special_code) ? $special_code : 0);
+            $this->line->special_code = (!empty($special_code) ? $special_code : 0);
             $this->line->origin = $origin;
             $this->line->origin_id = $origin_id;
             $this->line->fk_unit = $fk_unit;
@@ -3350,7 +3350,7 @@ 
         global $conf, $langs;
 
         if (!dol_strlen($modele)) {
-            $modele = '';   // No doc template/generation by default
+            $modele = ''; // No doc template/generation by default
 
             if (!empty($this->model_pdf)) {
                 $modele = $this->model_pdf;
@@ -3892,10 +3892,10 @@ 
                     $sqlsearchpackage .= ' WHERE entity IN (' . getEntity('product_fournisseur_price') . ")";
                     $sqlsearchpackage .= " AND fk_product = " . ((int) $objp->fk_product);
                     $sqlsearchpackage .= " AND ref_fourn = '" . $this->db->escape($objp->ref_supplier) . "'";
-                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty);  // required to be qualified
-                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")";  // required to be qualified
+                    $sqlsearchpackage .= " AND quantity <= " . ((float) $objp->qty); // required to be qualified
+                    $sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= " . ((float) $objp->qty) . ")"; // required to be qualified
                     $sqlsearchpackage .= " AND fk_soc = " . ((int) $objp->socid);
-                    $sqlsearchpackage .= " ORDER BY packaging ASC";     // Take the smaller package first
+                    $sqlsearchpackage .= " ORDER BY packaging ASC"; // Take the smaller package first
                     $sqlsearchpackage .= " LIMIT 1";
 
                     $resqlsearchpackage = $this->db->query($sqlsearchpackage);

public/htdocs/fourn/class/fournisseur.facture.class.php

Spacing +17 added lines, -18 removed lines

@@ -227,7 +227,7 @@ 
     /**
      * @var int ID
      */
-    public $fk_account;     // default bank account
+    public $fk_account; // default bank account
 
     /**
      * @var int Transport mode id
@@ -463,7 +463,7 @@ 
             $this->location_incoterms = $_facrec->location_incoterms;
 
             // Clean parameters
-            if (! $this->type) {
+            if (!$this->type) {
                 $this->type = self::TYPE_STANDARD;
             }
             if (!empty(GETPOST('ref_supplier'))) {
@@ -477,7 +477,7 @@ 
 
             $this->array_options = $_facrec->array_options;
 
-            if (! $this->mode_reglement_id) {
+            if (!$this->mode_reglement_id) {
                 $this->mode_reglement_id = 0;
             }
             $this->status = self::STATUS_DRAFT;
@@ -726,7 +726,7 @@ 
             /*
              * Insert lines of template invoices
              */
-            if (! $error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
+            if (!$error && $this->fac_rec > 0 && $_facrec instanceof FactureFournisseurRec) {
                 foreach ($_facrec->lines as $i => $val) {
                     if ($_facrec->lines[$i]->fk_product) {
                         $prod = new Product($this->db);
@@ -753,7 +753,7 @@ 
                     $buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
 
                     // If buyprice not defined from template invoice, we try to guess the best value
-                    if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) {
+                    if (!$buyprice && $_facrec->lines[$i]->fk_product > 0) {
                         require_once constant('DOL_DOCUMENT_ROOT') . '/fourn/class/fournisseur.product.class.php';
                         $producttmp = new ProductFournisseur($this->db);
                         $producttmp->fetch($_facrec->lines[$i]->fk_product);
@@ -1004,7 +1004,7 @@ 
 
                 $this->extraparams = isset($obj->extraparams) ? (array) json_decode($obj->extraparams, true) : array();
 
-                $this->socid  = $obj->socid;
+                $this->socid = $obj->socid;
 
                 // Retrieve all extrafield
                 // fetch optionals attributes and labels
@@ -2278,7 +2278,7 @@ 
             // Multicurrency
             $supplierinvoiceline->fk_multicurrency = $this->fk_multicurrency;
             $supplierinvoiceline->multicurrency_code = $this->multicurrency_code;
-            $supplierinvoiceline->multicurrency_subprice    = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
+            $supplierinvoiceline->multicurrency_subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht_devise) : $pu_ht_devise); // For credit note, unit price always negative, always positive otherwise
 
             $supplierinvoiceline->multicurrency_total_ht = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_ht) : $multicurrency_total_ht); // For credit note and if qty is negative, total is negative
             $supplierinvoiceline->multicurrency_total_tva = (($this->type == self::TYPE_CREDIT_NOTE || $qty < 0) ? -abs($multicurrency_total_tva) : $multicurrency_total_tva); // For credit note and if qty is negative, total is negative
@@ -2444,7 +2444,7 @@ 
 
         $line->qty = ($this->type == self::TYPE_CREDIT_NOTE ? abs((float) $qty) : $qty); // For credit note, quantity is always positive and unit price negative
         $line->subprice = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ht) : $pu_ht); // For credit note, unit price always negative, always positive otherwise
-        $line->pu_ht = $line->subprice;  // deprecated
+        $line->pu_ht = $line->subprice; // deprecated
         $line->pu_ttc = ($this->type == self::TYPE_CREDIT_NOTE ? -abs($pu_ttc) : $pu_ttc); // For credit note, unit price always negative, always positive otherwise
 
         $line->remise_percent = $remise_percent;
@@ -2729,7 +2729,7 @@ 
 
             while ($obj = $this->db->fetch_object($resql)) {
                 $facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-                $facturestatic->statut = $obj->status;  // For backward compatibility
+                $facturestatic->statut = $obj->status; // For backward compatibility
                 $facturestatic->status = $obj->status;
 
                 $response->nbtodo++;
@@ -3164,15 +3164,15 @@ 
         // Load source object
         $object->fetch($fromid);
         $object->id = 0;
-        $object->statut = self::STATUS_DRAFT;   // For backward compatibility
+        $object->statut = self::STATUS_DRAFT; // For backward compatibility
         $object->status = self::STATUS_DRAFT;
 
         $object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor
 
         // Clear fields
         $object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf") . ' ' . $object->ref_supplier : $this->ref_supplier);
-        $object->author             = $user->id;  // FIXME? user_validation_id is replacement for author
-        $object->user_validation_id = 0;  // FIXME?  user_validation_id is replacement for author
+        $object->author             = $user->id; // FIXME? user_validation_id is replacement for author
+        $object->user_validation_id = 0; // FIXME?  user_validation_id is replacement for author
         $object->fk_facture_source  = 0;
         $object->date_creation      = '';
         $object->date_validation    = '';
@@ -3475,14 +3475,14 @@ 
         if (!empty($paymentmode) && $paymentmode != 'all') {
             $sql .= ", " . MAIN_DB_PREFIX . "c_paiement as cp";
         }
-        $sql .= " WHERE f.paye = 0";    // Only unpaid
-        $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED;   // Only validated status
+        $sql .= " WHERE f.paye = 0"; // Only unpaid
+        $sql .= " AND f.fk_statut = " . self::STATUS_VALIDATED; // Only validated status
         if ($datetouse == 'invoicedate') {
             $sql .= " AND f.datef = '" . $this->db->idate($tmpidate, 'gmt') . "'";
         } else {
             $sql .= " AND f.date_lim_reglement = '" . $this->db->idate($tmpidate, 'gmt') . "'";
         }
-        $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")";  // One batch process only one company (no sharing)
+        $sql .= " AND f.entity IN (" . getEntity('supplier_invoice', 0) . ")"; // One batch process only one company (no sharing)
         if (!empty($paymentmode) && $paymentmode != 'all') {
             $sql .= " AND f.fk_mode_reglement = cp.id AND cp.code = '" . $this->db->escape($paymentmode) . "'";
         }
@@ -3702,7 +3702,7 @@ 
                                 $actioncomm->create($user);
                             }
 
-                            $this->db->commit();    // We always commit
+                            $this->db->commit(); // We always commit
                         }
 
                         if ($errormesg) {
@@ -4377,8 +4377,7 @@ 
         $sql .= " " . ($this->fk_parent_line > 0 ? "'" . $this->db->escape($this->fk_parent_line) . "'" : "null") . ",";
         $product_label
             = !empty($this->product_label)
-              ? $this->product_label :
-                (!empty($this->label) ? $this->label : null);
+              ? $this->product_label : (!empty($this->label) ? $this->label : null);
         $sql .= " " . (!empty($product_label) ? "'" . $this->db->escape($product_label) . "'" : "null") . ",";
         $sql .= " '" . $this->db->escape($this->desc ? $this->desc : $this->description) . "',";
         $sql .= " '" . $this->db->escape($this->ref_supplier) . "',";

public/htdocs/fourn/class/paiementfourn.class.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
                 $this->note_private         = $obj->note;
                 $this->type_code            = $obj->payment_code;
                 $this->type_label           = $obj->payment_type;
-                $this->fk_paiement           = $obj->fk_paiement;
+                $this->fk_paiement = $obj->fk_paiement;
                 $this->statut               = $obj->statut;
 
                 $error = 1;

public/htdocs/fourn/class/fournisseur.product.class.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,7 @@ 
      */
     public $fourn_remise;
 
-    public $fourn_charges;  // when getDolGlobalString('PRODUCT_CHARGES') is set
+    public $fourn_charges; // when getDolGlobalString('PRODUCT_CHARGES') is set
 
     /**
      * @var int     product-supplier id
@@ -157,7 +157,7 @@ 
     public $fk_availability;
 
     public $fourn_unitprice;
-    public $fourn_unitprice_with_discount;  // not saved into database
+    public $fourn_unitprice_with_discount; // not saved into database
     public $fourn_tva_tx;
     public $fourn_tva_npr;
 
@@ -475,7 +475,7 @@ 
             }
             $sql = "UPDATE " . MAIN_DB_PREFIX . "product_fournisseur_price";
             $sql .= " SET fk_user = " . ((int) $user->id) . " ,";
-            $sql .= " datec = '" . $this->db->idate($now) . "' ,";  // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log.
+            $sql .= " datec = '" . $this->db->idate($now) . "' ,"; // Note: Even if this is an update, we update the creation date as the log of each change is tracked into product_fournisseur_log.
             $sql .= " ref_fourn = '" . $this->db->escape($ref_fourn) . "',";
             $sql .= " desc_fourn = '" . $this->db->escape($desc_fourn) . "',";
             $sql .= " price = " . ((float) $buyprice) . ",";
@@ -825,10 +825,10 @@ 
                 $prodfourn->fourn_tva_tx = $record["tva_tx"];
                 $prodfourn->fourn_id = $record["fourn_id"];
                 $prodfourn->fourn_name = $record["supplier_name"];
-                $prodfourn->fk_availability         = $record["fk_availability"];
+                $prodfourn->fk_availability = $record["fk_availability"];
                 $prodfourn->delivery_time_days = $record["delivery_time_days"];
                 $prodfourn->id = $prodid;
-                $prodfourn->fourn_tva_npr                   = $record["info_bits"];
+                $prodfourn->fourn_tva_npr = $record["info_bits"];
                 $prodfourn->fk_supplier_price_expression = $record["fk_supplier_price_expression"];
                 $prodfourn->supplier_reputation = $record["supplier_reputation"];
                 $prodfourn->fourn_date_creation          = $this->db->jdate($record['datec']);

public/htdocs/fourn/commande/card.php

Spacing +5 added lines, -5 removed lines

@@ -446,7 +446,7 @@ 
             $idprod = GETPOSTINT('idprod');
         }
 
-        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);      // Can be '1.2' or '1.2 (CODE)'
+        $tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0); // Can be '1.2' or '1.2 (CODE)'
 
         $price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
         $price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
@@ -1249,7 +1249,7 @@ 
             $object->mode_reglement_id = GETPOSTINT('mode_reglement_id');
             $object->fk_account        = GETPOSTINT('fk_account');
             $object->note_private = GETPOST('note_private', 'restricthtml');
-            $object->note_public    = GETPOST('note_public', 'restricthtml');
+            $object->note_public = GETPOST('note_public', 'restricthtml');
             $object->delivery_date = $datelivraison;
             $object->fk_incoterms = GETPOSTINT('incoterm_id');
             $object->location_incoterms = GETPOST('location_incoterms', 'alpha');
@@ -1685,7 +1685,7 @@ 
             $demand_reason_id = (!empty($objectsrc->demand_reason_id) ? $objectsrc->demand_reason_id : (!empty($soc->demand_reason_id) ? $soc->demand_reason_id : 0));
             //$remise_percent       = (!empty($objectsrc->remise_percent) ? $objectsrc->remise_percent : (!empty($soc->remise_supplier_percent) ? $soc->remise_supplier_percent : 0));
             //$remise_absolue       = (!empty($objectsrc->remise_absolue) ? $objectsrc->remise_absolue : (!empty($soc->remise_absolue) ? $soc->remise_absolue : 0));
-            $dateinvoice        = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '';
+            $dateinvoice = !getDolGlobalString('MAIN_AUTOFILL_DATE') ? -1 : '';
 
             $datedelivery = (!empty($objectsrc->delivery_date) ? $objectsrc->delivery_date : '');
 
@@ -1801,7 +1801,7 @@ 
         // Payment term
         print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td>';
         print img_picto('', 'payment', 'class="pictofixedwidth"');
-        print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') &&  GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
+        print $form->getSelectConditionsPaiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id', -1, 1);
         print '</td></tr>';
 
         // Payment mode
@@ -2051,7 +2051,7 @@ 
                 'morecss' => 'minwidth300'
             )
         );
-        $formconfirm  = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
+        $formconfirm = $form->formconfirm($_SERVER['PHP_SELF'] . "?id=$object->id", $langs->trans("DenyingThisOrder"), $langs->trans("ConfirmDenyingThisOrder", $object->ref), "confirm_refuse", $formquestion, 0, 1);
     }
 
     // Confirmation of cancellation