alxarafe / alixar

htdocs/fourn/facture/card.php

Spacing +6 added lines, -6 removed lines

@@ -776,7 +776,7 @@ 
             $error++;
         }
 
-        $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver');   // If we enter the 02 january, we need to save the 02 january for server
+        $dateinvoice = dol_mktime(0, 0, 0, GETPOSTINT('remonth'), GETPOSTINT('reday'), GETPOSTINT('reyear'), 'tzserver'); // If we enter the 02 january, we need to save the 02 january for server
         $datedue = dol_mktime(0, 0, 0, GETPOSTINT('echmonth'), GETPOSTINT('echday'), GETPOSTINT('echyear'), 'tzserver');
         //var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
         //var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
@@ -1058,7 +1058,7 @@ 
                 $object->ref                = GETPOST('ref', 'alphanohtml');
                 $object->ref_supplier       = GETPOST('ref_supplier', 'alphanohtml');
                 $object->socid              = GETPOSTINT('socid');
-                $object->libelle            = GETPOST('label', 'alphanohtml');  // deprecated
+                $object->libelle            = GETPOST('label', 'alphanohtml'); // deprecated
                 $object->label              = GETPOST('label', 'alphanohtml');
                 $object->date               = $dateinvoice;
                 $object->date_echeance      = $datedue;
@@ -1414,7 +1414,7 @@ 
         // Edit line
         $db->begin();
 
-        if (! $object->fetch($id) > 0) {
+        if (!$object->fetch($id) > 0) {
             dol_print_error($db);
         }
         $object->fetch_thirdparty();
@@ -1558,7 +1558,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);
@@ -2257,7 +2257,7 @@ 
     print '<form name="add" action="' . $_SERVER['PHP_SELF'] . '" method="post">';
     print '<input type="hidden" name="token" value="' . newToken() . '">';
     print '<input type="hidden" name="action" value="add">';
-    print '<input type="hidden" name="changecompany" value="0">';   // will be set to 1 by javascript so we know post is done after a company change
+    print '<input type="hidden" name="changecompany" value="0">'; // will be set to 1 by javascript so we know post is done after a company change
 
     if (!empty($societe->id) && $societe->id > 0) {
         print '<input type="hidden" name="socid" value="' . $societe->id . '">' . "\n";
@@ -4147,7 +4147,7 @@ 
                 }
 
                 // Clone as predefined / Create template
-                if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
+                if (($object->type == FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
                     if (!$objectidnext && count($object->lines) > 0) {
                         print '<a class="butAction" href="' . DOL_URL_ROOT . '/fourn/facture/card-rec.php?facid=' . $object->id . '&amp;action=create">' . $langs->trans("ChangeIntoRepeatableInvoice") . '</a>';
                     }

htdocs/fourn/facture/contact.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     $socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
-$hookmanager->initHooks(array('invoicesuppliercardcontact','invoicesuppliercontactcard', 'globalcard'));
+$hookmanager->initHooks(array('invoicesuppliercardcontact', 'invoicesuppliercontactcard', 'globalcard'));
 
 $object = new FactureFournisseur($db);
 

htdocs/fourn/paiement/list.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,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');
@@ -204,7 +204,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) . ")";

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) {

htdocs/fourn/ajax/getSupplierPrices.php

Spacing +1 added lines, -1 removed lines

@@ -115,7 +115,7 @@
             }
         }
 
-        $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency));  // For price field, we must use price2num(), for label or title, price()
+        $prices[] = array("id" => 'pmpprice', "price" => price2num($price), "label" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency), "title" => $langs->trans("PMPValueShort") . ': ' . price($price, 0, $langs, 0, 0, -1, $conf->currency)); // For price field, we must use price2num(), for label or title, price()
     }
 
     // Add price for costprice (at end)

htdocs/fourn/commande/list.php

Spacing +5 added lines, -5 removed lines

@@ -65,7 +65,7 @@ 
 $search_date_order_endday = GETPOSTINT('search_date_order_endday');
 $search_date_order_endmonth = GETPOSTINT('search_date_order_endmonth');
 $search_date_order_endyear = GETPOSTINT('search_date_order_endyear');
-$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear);   // Use tzserver
+$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear); // Use tzserver
 $search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear);
 
 $search_date_delivery_startday = GETPOSTINT('search_date_delivery_startday');
@@ -74,7 +74,7 @@ 
 $search_date_delivery_endday = GETPOSTINT('search_date_delivery_endday');
 $search_date_delivery_endmonth = GETPOSTINT('search_date_delivery_endmonth');
 $search_date_delivery_endyear = GETPOSTINT('search_date_delivery_endyear');
-$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);   // Use tzserver
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
 
 $search_date_valid_startday = GETPOSTINT('search_date_valid_startday');
@@ -83,7 +83,7 @@ 
 $search_date_valid_endday = GETPOSTINT('search_date_valid_endday');
 $search_date_valid_endmonth = GETPOSTINT('search_date_valid_endmonth');
 $search_date_valid_endyear = GETPOSTINT('search_date_valid_endyear');
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);   // Use tzserver
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
 
 $search_date_approve_startday = GETPOSTINT('search_date_approve_startday');
@@ -92,7 +92,7 @@ 
 $search_date_approve_endday = GETPOSTINT('search_date_approve_endday');
 $search_date_approve_endmonth = GETPOSTINT('search_date_approve_endmonth');
 $search_date_approve_endyear = GETPOSTINT('search_date_approve_endyear');
-$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);   // Use tzserver
+$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver
 $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
 
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -1236,7 +1236,7 @@ 
 
     $topicmail = "SendOrderRef";
     $modelmail = "order_supplier_send";
-    $objecttmp = new CommandeFournisseur($db);  // in case $object is not the good object
+    $objecttmp = new CommandeFournisseur($db); // in case $object is not the good object
     $trackid = 'sord' . $object->id;
     include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';
 

htdocs/fourn/commande/note.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 // Permissions
 $permissionnote = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer")); // Used by the include of actions_setnotes.inc.php
 $usercancreate  = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
-$permissiontoadd    = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
 /*

htdocs/fourn/commande/dispatch.php

Spacing +3 added lines, -3 removed lines

@@ -102,8 +102,8 @@ 
     accessforbidden();
 }
 
-$usercancreate  = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
-$permissiontoadd    = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
+$usercancreate = ($user->hasRight("fournisseur", "commande", "creer") || $user->hasRight("supplier_order", "creer"));
+$permissiontoadd = $usercancreate; // Used by the include of actions_addupdatedelete.inc.php
 
 
 /*
@@ -629,7 +629,7 @@ 
     if (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER)) {
         $disabled = 0;
     }*/
-    $disabled = 0;  // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
+    $disabled = 0; // This is used to disable or not the bulk selection of target warehouse. No reason to have it disabled so forced to 0.
 
     // Line of orders
     if ($object->statut <= CommandeFournisseur::STATUS_ACCEPTED || $object->statut >= CommandeFournisseur::STATUS_CANCELED) {

htdocs/fourn/commande/card.php

Spacing +5 added lines, -5 removed lines

@@ -436,7 +436,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);
@@ -1239,7 +1239,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');
@@ -1635,7 +1635,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 : '');
 
@@ -1750,7 +1750,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
@@ -2000,7 +2000,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