alxarafe / alixar

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

htdocs/fourn/commande/contact.php

Spacing +2 added lines, -2 removed lines

@@ -52,8 +52,8 @@
 
 $object = new CommandeFournisseur($db);
 
-$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
 
 /*
  * Actions

htdocs/fourn/commande/info.php

Spacing +2 added lines, -2 removed lines

@@ -85,8 +85,8 @@
 // Init Hooks
 $hookmanager->initHooks(array('ordersuppliercardinfo'));
 
-$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
 
 
 /*

htdocs/contrat/list.php

Spacing +28 added lines, -28 removed lines

@@ -80,7 +80,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);
 $searchCategoryCustomerOperator = 0;
 if (GETPOSTISSET('formfilteraction')) {
@@ -93,20 +93,20 @@ 
 $search_date_creation_startmonth = GETPOSTINT('search_date_creation_startmonth');
 $search_date_creation_startyear = GETPOSTINT('search_date_creation_startyear');
 $search_date_creation_startday = GETPOSTINT('search_date_creation_startday');
-$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear);   // Use tzserver
+$search_date_creation_start = dol_mktime(0, 0, 0, $search_date_creation_startmonth, $search_date_creation_startday, $search_date_creation_startyear); // Use tzserver
 $search_date_creation_endmonth = GETPOSTINT('search_date_creation_endmonth');
 $search_date_creation_endyear = GETPOSTINT('search_date_creation_endyear');
 $search_date_creation_endday = GETPOSTINT('search_date_creation_endday');
-$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear);    // Use tzserver
+$search_date_creation_end = dol_mktime(23, 59, 59, $search_date_creation_endmonth, $search_date_creation_endday, $search_date_creation_endyear); // Use tzserver
 
 $search_date_modif_startmonth = GETPOSTINT('search_date_modif_startmonth');
 $search_date_modif_startyear = GETPOSTINT('search_date_modif_startyear');
 $search_date_modif_startday = GETPOSTINT('search_date_modif_startday');
-$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear);   // Use tzserver
+$search_date_modif_start = dol_mktime(0, 0, 0, $search_date_modif_startmonth, $search_date_modif_startday, $search_date_modif_startyear); // Use tzserver
 $search_date_modif_endmonth = GETPOSTINT('search_date_modif_endmonth');
 $search_date_modif_endyear = GETPOSTINT('search_date_modif_endyear');
 $search_date_modif_endday = GETPOSTINT('search_date_modif_endday');
-$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear);    // Use tzserver
+$search_date_modif_end = dol_mktime(23, 59, 59, $search_date_modif_endmonth, $search_date_modif_endday, $search_date_modif_endyear); // Use tzserver
 
 // Load variable for pagination
 $limit = GETPOSTINT('limit') ? GETPOSTINT('limit') : $conf->liste_limit;
@@ -528,7 +528,7 @@ 
         $resql = $db->query($sql, 0, 'auto', 1);
         while ($db->fetch_object($resql)) {
             if (empty($nbtotalofrecords)) {
-                $nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+                $nbtotalofrecords = 1; // We can't make +1 because init value is ''
             } else {
                 $nbtotalofrecords++;
             }
@@ -980,55 +980,55 @@ 
 print '<tr class="liste_titre">';
 if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
     print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['c.ref']['checked'])) {
     print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER['PHP_SELF'], "c.ref", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['c.ref_customer']['checked'])) {
     print_liste_field_titre($arrayfields['c.ref_customer']['label'], $_SERVER['PHP_SELF'], "c.ref_customer", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['c.ref_supplier']['checked'])) {
     print_liste_field_titre($arrayfields['c.ref_supplier']['label'], $_SERVER['PHP_SELF'], "c.ref_supplier", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.nom']['checked'])) {
     print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.email']['checked'])) {
     print_liste_field_titre($arrayfields['s.email']['label'], $_SERVER['PHP_SELF'], "s.email", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.town']['checked'])) {
     print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER['PHP_SELF'], 's.town', '', $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['s.zip']['checked'])) {
     print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER['PHP_SELF'], 's.zip', '', $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['state.nom']['checked'])) {
     print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER['PHP_SELF'], "state.nom", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['country.code_iso']['checked'])) {
     print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER['PHP_SELF'], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['typent.code']['checked'])) {
     print_liste_field_titre($arrayfields['typent.code']['label'], $_SERVER['PHP_SELF'], "typent.code", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['sale_representative']['checked'])) {
     print_liste_field_titre($arrayfields['sale_representative']['label'], $_SERVER['PHP_SELF'], "", "", $param, '', $sortfield, $sortorder);
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['c.date_contrat']['checked'])) {
     print_liste_field_titre($arrayfields['c.date_contrat']['label'], $_SERVER['PHP_SELF'], "c.date_contrat", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1038,29 +1038,29 @@ 
 print $hookmanager->resPrint;
 if (!empty($arrayfields['c.datec']['checked'])) {
     print_liste_field_titre($arrayfields['c.datec']['label'], $_SERVER['PHP_SELF'], "c.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['c.tms']['checked'])) {
     print_liste_field_titre($arrayfields['c.tms']['label'], $_SERVER['PHP_SELF'], "c.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
     print_liste_field_titre($arrayfields['lower_planned_end_date']['label'], $_SERVER['PHP_SELF'], "lower_planned_end_date", "", $param, '', $sortfield, $sortorder, 'center ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!empty($arrayfields['status']['checked'])) {
     print_liste_field_titre($staticcontratligne->LibStatut(0, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
     print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 0, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
     print_liste_field_titre($staticcontratligne->LibStatut(4, 3, 1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
     print_liste_field_titre($staticcontratligne->LibStatut(5, 3, -1, 'class="nochangebackground"'), '', '', '', '', 'width="16"');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
     print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-    $totalarray['nbfield']++;   // For the column action
+    $totalarray['nbfield']++; // For the column action
 }
 print "</tr>\n";
 
@@ -1350,7 +1350,7 @@ 
 
 // If no record found
 if ($num == 0) {
-    $colspan = 4;   // Include the 4 columns of status
+    $colspan = 4; // Include the 4 columns of status
     foreach ($arrayfields as $key => $val) {
         if (!empty($val['checked'])) {
             $colspan++;

htdocs/contrat/note.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
 $object = new Contrat($db);
 $object->fetch($id, $ref);
 
-$permissiontoadd   = $user->hasRight('contrat', 'creer');     //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoadd = $user->hasRight('contrat', 'creer'); //  Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissionnote = $user->hasRight('contrat', 'creer'); // Used by the include of actions_setnotes.inc.php
 
 $result = restrictedArea($user, 'contrat', $object->id);