alxarafe / alixar

dolibarr/htdocs/product/card.php

Spacing +263 added lines, -263 removed lines

@@ -37,36 +37,36 @@ 
  *  \ingroup    product

  *  \brief      Page to show product

  */

-require DOL_BASE_PATH . '/main.inc.php';

-

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/canvas.class.php';

-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-require_once DOL_DOCUMENT_ROOT . '/product/class/html.formproduct.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/genericobject.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/lib/product.lib.php';

-require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

-require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/modules/product/modules_product.class.php';

+require DOL_BASE_PATH.'/main.inc.php';

+

+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';

+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';

+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php';

 

 if (!empty($conf->propal->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';

 }

 if (!empty($conf->facture->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';

 }

 if (!empty($conf->commande->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';

 }

 if (!empty($conf->accounting->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

 }

 if (!empty($conf->accounting->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';

 }

 if (!empty($conf->accounting->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';

 }

 

 // Load translation files required by the page

@@ -111,15 +111,15 @@ 
     $result = $object->fetch($id, $ref);

 

     if (!empty($conf->product->enabled))

-        $upload_dir = $conf->product->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

+        $upload_dir = $conf->product->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);

     elseif (!empty($conf->service->enabled))

-        $upload_dir = $conf->service->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

+        $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 0, $object, 'product').dol_sanitizeFileName($object->ref);

 

     if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {    // For backward compatiblity, we scan also old dirs

         if (!empty($conf->product->enabled))

-            $upload_dirold = $conf->product->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

+            $upload_dirold = $conf->product->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

         else

-            $upload_dirold = $conf->service->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

+            $upload_dirold = $conf->service->multidir_output[$object->entity].'/'.substr(substr("000".$object->id, -2), 1, 1).'/'.substr(substr("000".$object->id, -2), 0, 1).'/'.$object->id."/photos";

     }

 }

 

@@ -129,7 +129,7 @@ 
 $canvas = !empty($object->canvas) ? $object->canvas : GETPOST("canvas");

 $objcanvas = null;

 if (!empty($canvas)) {

-    require_once DOL_DOCUMENT_ROOT . '/core/class/canvas.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';

     $objcanvas = new Canvas($db, $action);

     $objcanvas->getCanvas('product', 'card', $canvas);

 }

@@ -159,7 +159,7 @@ 
     $createbarcode = 0;

 

 $parameters = array('id' => $id, 'ref' => $ref, 'objcanvas' => $objcanvas);

-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

 if ($reshook < 0)

     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

 

@@ -167,21 +167,21 @@ 
     // Type

     if ($action == 'setfk_product_type' && $usercancreate) {

         $result = $object->setValueFrom('fk_product_type', GETPOST('fk_product_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');

-        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);

+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

         exit;

     }

 

     // Actions to build doc

     $upload_dir = $conf->produit->dir_output;

     $permissioncreate = $usercancreate;

-    include DOL_DOCUMENT_ROOT . '/core/actions_builddoc.inc.php';

+    include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';

 

-    include DOL_DOCUMENT_ROOT . '/core/actions_printing.inc.php';

+    include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';

 

     // Barcode type

     if ($action == 'setfk_barcode_type' && $createbarcode) {

         $result = $object->setValueFrom('fk_barcode_type', GETPOST('fk_barcode_type'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');

-        header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);

+        header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

         exit;

     }

 

@@ -191,7 +191,7 @@ 
 

         if ($result >= 0) {

             $result = $object->setValueFrom('barcode', GETPOST('barcode'), '', null, 'text', '', $user, 'PRODUCT_MODIFY');

-            header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $object->id);

+            header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);

             exit;

         } else {

             $langs->load("errors");

@@ -245,10 +245,10 @@ 
             else

                 $object->price_min = GETPOST('price_min');

 

-            $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'

+            $tva_tx_txt = GETPOST('tva_tx', 'alpha'); // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'

             // We must define tva_tx, npr and local taxes

             $vatratecode = '';

-            $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt);     // keep remove all after the numbers and dot

+            $tva_tx = preg_replace('/[^0-9\.].*$/', '', $tva_tx_txt); // keep remove all after the numbers and dot

             $npr = preg_match('/\*/', $tva_tx_txt) ? 1 : 0;

             $localtax1 = 0;

             $localtax2 = 0;

@@ -260,10 +260,10 @@ 
                 $vatratecode = $reg[1];

                 // Get record from code

                 $sql = "SELECT t.rowid, t.code, t.recuperableonly, t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $mysoc->country_code . "'";

-                $sql .= " AND t.taux = " . ((float) $tva_tx) . " AND t.active = 1";

-                $sql .= " AND t.code ='" . $vatratecode . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+                $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$mysoc->country_code."'";

+                $sql .= " AND t.taux = ".((float) $tva_tx)." AND t.active = 1";

+                $sql .= " AND t.code ='".$vatratecode."'";

                 $resql = $db->query($sql);

                 if ($resql) {

                     $obj = $db->fetch_object($resql);

@@ -298,7 +298,7 @@ 
             if ($result < 0) {

                 $error++;

                 $mesg = 'Failed to get bar code type information ';

-                setEventMessages($mesg . $stdobject->error, $mesg . $stdobject->errors, 'errors');

+                setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');

             }

             $object->barcode_type_code = $stdobject->barcode_type_code;

             $object->barcode_type_coder = $stdobject->barcode_type_coder;

@@ -307,7 +307,7 @@ 
             $object->description = dol_htmlcleanlastbr(GETPOST('desc', 'none'));

             $object->url = GETPOST('url');

             $object->note_private = dol_htmlcleanlastbr(GETPOST('note_private', 'none'));

-            $object->note = $object->note_private;   // deprecated

+            $object->note = $object->note_private; // deprecated

             $object->customcode = GETPOST('customcode', 'alpha');

             $object->country_id = GETPOST('country_id', 'int');

             $object->duration_value = $duration_value;

@@ -358,9 +358,9 @@ 
             // MultiPrix

             if (!empty($conf->global->PRODUIT_MULTIPRICES)) {

                 for ($i = 2; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {

-                    if (isset($_POST["price_" . $i])) {

-                        $object->multiprices["$i"] = price2num($_POST["price_" . $i], 'MU');

-                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_" . $i];

+                    if (isset($_POST["price_".$i])) {

+                        $object->multiprices["$i"] = price2num($_POST["price_".$i], 'MU');

+                        $object->multiprices_base_type["$i"] = $_POST["multiprices_base_type_".$i];

                     } else {

                         $object->multiprices["$i"] = "";

                     }

@@ -381,7 +381,7 @@ 
                 $categories = GETPOST('categories', 'array');

                 $object->setCategories($categories);

 

-                header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);

+                header("Location: ".$_SERVER['PHP_SELF']."?id=".$id);

                 exit;

             } else {

                 if (count($object->errors))

@@ -455,7 +455,7 @@ 
                 if ($result < 0) {

                     $error++;

                     $mesg = 'Failed to get bar code type information ';

-                    setEventMessages($mesg . $stdobject->error, $mesg . $stdobject->errors, 'errors');

+                    setEventMessages($mesg.$stdobject->error, $mesg.$stdobject->errors, 'errors');

                 }

                 $object->barcode_type_code = $stdobject->barcode_type_code;

                 $object->barcode_type_coder = $stdobject->barcode_type_coder;

@@ -545,7 +545,7 @@ 
                             if ($result < 1) {

                                 $db->rollback();

                                 setEventMessages($langs->trans('ErrorProductClone'), null, 'errors');

-                                header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $originalId);

+                                header("Location: ".$_SERVER["PHP_SELF"]."?id=".$originalId);

                                 exit;

                             }

                         }

@@ -555,7 +555,7 @@ 
                         $db->commit();

                         $db->close();

 

-                        header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);

+                        header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);

                         exit;

                     } else {

                         $id = $originalId;

@@ -567,7 +567,7 @@ 
                             $action = "";

 

                             $mesg = $langs->trans("ErrorProductAlreadyExists", $object->ref);

-                            $mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $object->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';

+                            $mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$object->ref.'">'.$langs->trans("ShowCardHere").'</a>.';

                             setEventMessages($mesg, null, 'errors');

                             $object->fetch($id);

                         } else {

@@ -597,7 +597,7 @@ 
         $result = $object->delete($user);

 

         if ($result > 0) {

-            header('Location: ' . DOL_URL_ROOT . '/product/list.php?type=' . $object->type . '&delprod=' . urlencode($object->ref));

+            header('Location: '.DOL_URL_ROOT.'/product/list.php?type='.$object->type.'&delprod='.urlencode($object->ref));

             exit;

         } else {

             setEventMessages($langs->trans($object->error), null, 'errors');

@@ -663,7 +663,7 @@ 
                 $pu_ttc = $object->multiprices_ttc[$soc->price_level];

                 $price_base_type = $object->multiprices_base_type[$soc->price_level];

             } elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {

-                require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/class/productcustomerprice.class.php';

 

                 $prodcustprice = new Productcustomerprice($db);

 

@@ -709,11 +709,11 @@ 
                     $object->id, GETPOST('remise_percent'), $price_base_type, $pu_ttc, 0, 0, -1, 0, 0, 0, $buyprice, '', '', '', 0, $object->fk_unit

                 );

                 if ($result > 0) {

-                    header("Location: " . DOL_URL_ROOT . "/comm/propal/card.php?id=" . $propal->id);

+                    header("Location: ".DOL_URL_ROOT."/comm/propal/card.php?id=".$propal->id);

                     return;

                 }

 

-                setEventMessages($langs->trans("ErrorUnknown") . ": $result", null, 'errors');

+                setEventMessages($langs->trans("ErrorUnknown").": $result", null, 'errors');

             } elseif (GETPOST('commandeid') > 0) {

                 // Define cost price for margin calculation

                 $buyprice = 0;

@@ -731,7 +731,7 @@ 
                 );

 

                 if ($result > 0) {

-                    header("Location: " . DOL_URL_ROOT . "/commande/card.php?id=" . $commande->id);

+                    header("Location: ".DOL_URL_ROOT."/commande/card.php?id=".$commande->id);

                     exit;

                 }

             } elseif (GETPOST('factureid') > 0) {

@@ -749,7 +749,7 @@ 
                 );

 

                 if ($result > 0) {

-                    header("Location: " . DOL_URL_ROOT . "/compta/facture/card.php?facid=" . $facture->id);

+                    header("Location: ".DOL_URL_ROOT."/compta/facture/card.php?facid=".$facture->id);

                     exit;

                 }

             }

@@ -770,11 +770,11 @@ 
 $helpurl = '';

 $shortlabel = dol_trunc($object->label, 16);

 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {

-    $title = $langs->trans('Product') . " " . $shortlabel . " - " . $langs->trans('Card');

+    $title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');

     $helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';

 }

 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {

-    $title = $langs->trans('Service') . " " . $shortlabel . " - " . $langs->trans('Card');

+    $title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');

     $helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';

 }

 

@@ -792,7 +792,7 @@ 
     $module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);

     $dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);

     foreach ($dirbarcode as $dirroot) {

-        $res = dol_include_once($dirroot . $module . '.php');

+        $res = dol_include_once($dirroot.$module.'.php');

         if ($res)

             break;

     }

@@ -813,7 +813,7 @@ 
             dol_print_error('', $object->error);

     }

     $objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates

-    $objcanvas->display_canvas($action);       // Show template

+    $objcanvas->display_canvas($action); // Show template

 }

 else {

     // -----------------------------------------

@@ -821,14 +821,14 @@ 
     // -----------------------------------------

     if ($action == 'create' && $usercancreate) {

         //WYSIWYG Editor

-        require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

 

         // Load object modCodeProduct

         $module = (!empty($conf->global->PRODUCT_CODEPRODUCT_ADDON) ? $conf->global->PRODUCT_CODEPRODUCT_ADDON : 'mod_codeproduct_leopard');

         if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {

             $module = substr($module, 0, dol_strlen($module) - 4);

         }

-        $result = dol_include_once('/core/modules/product/' . $module . '.php');

+        $result = dol_include_once('/core/modules/product/'.$module.'.php');

         if ($result > 0) {

             $modCodeProduct = new $module();

         }

@@ -836,10 +836,10 @@ 
         dol_set_focus('input[name="ref"]');

 

         //print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';

-        print '<form method="POST" href="' . BASE_URI . '?controller=product&method=card" method="POST">';

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+        print '<form method="POST" href="'.BASE_URI.'?controller=product&method=card" method="POST">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

         print '<input type="hidden" name="action" value="add">';

-        print '<input type="hidden" name="type" value="' . $type . '">' . "\n";

+        print '<input type="hidden" name="type" value="'.$type.'">'."\n";

         if (!empty($modCodeProduct->code_auto))

         {

             print '<input type="hidden" name="code_auto" value="1">';

@@ -867,30 +867,30 @@ 
         $tmpcode = '';

         if (!empty($modCodeProduct->code_auto))

             $tmpcode = $modCodeProduct->getNextValue($object, $type);

-        print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="' . dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode) . '">';

+        print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode).'">';

         if ($refalreadyexists) {

             print $langs->trans("RefAlreadyExists");

         }

         print '</td></tr>';

 

         // Label

-        print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="' . dol_escape_htmltag(GETPOST('label')) . '"></td></tr>';

+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>';

 

         // On sell

-        print '<tr><td class="fieldrequired">' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="3">';

+        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';

         $statutarray = array('1' => $langs->trans("OnSell"), '0' => $langs->trans("NotOnSell"));

         print $form->selectarray('statut', $statutarray, GETPOST('statut'));

         print '</td></tr>';

 

         // To buy

-        print '<tr><td class="fieldrequired">' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')</td><td colspan="3">';

+        print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';

         $statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));

         print $form->selectarray('statut_buy', $statutarray, GETPOST('statut_buy'));

         print '</td></tr>';

 

         // Batch number management

         if (!empty($conf->productbatch->enabled)) {

-            print '<tr><td>' . $langs->trans("ManageLotSerial") . '</td><td colspan="3">';

+            print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';

             $statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));

             print $form->selectarray('status_batch', $statutarray, GETPOST('status_batch'));

             print '</td></tr>';

@@ -901,26 +901,26 @@ 
             $showbarcode = 0;

 

         if ($showbarcode) {

-            print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

+            print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';

             if (isset($_POST['fk_barcode_type'])) {

                 $fk_barcode_type = GETPOST('fk_barcode_type');

             } else {

                 if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

                     $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

             }

-            require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';

             $formbarcode = new FormBarCode($db);

             print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

-            print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

+            print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';

             $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

             if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

                 $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

-            print '<input class="maxwidth100" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

+            print '<input class="maxwidth100" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';

             print '</td></tr>';

         }

 

         // Description (used in invoice, propal...)

-        print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td colspan="3">';

+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';

 

         $doleditor = new DolEditor('desc', GETPOST('desc', 'none'), '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');

         $doleditor->Create();

@@ -928,23 +928,23 @@ 
         print "</td></tr>";

 

         // Public URL

-        print '<tr><td>' . $langs->trans("PublicUrl") . '</td><td colspan="3">';

-        print '<input type="text" name="url" class="quatrevingtpercent" value="' . GETPOST('url') . '">';

+        print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';

+        print '<input type="text" name="url" class="quatrevingtpercent" value="'.GETPOST('url').'">';

         print '</td></tr>';

 

         if ($type != 1 && !empty($conf->stock->enabled)) {

             // Default warehouse

-            print '<tr><td>' . $langs->trans("DefaultWarehouse") . '</td><td>';

+            print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';

             print $formproduct->selectWarehouses(GETPOST('fk_default_warehouse'), 'fk_default_warehouse', 'warehouseopen', 1);

-            print ' <a href="' . DOL_URL_ROOT . '/product/stock/card.php?action=create&amp;backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=edit') . '">' . $langs->trans("AddWarehouse") . '</a>';

+            print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit').'">'.$langs->trans("AddWarehouse").'</a>';

             print '</td>';

             // Stock min level

-            print '<tr><td>' . $form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1) . '</td><td>';

-            print '<input name="seuil_stock_alerte" class="maxwidth50" value="' . GETPOST('seuil_stock_alerte') . '">';

+            print '<tr><td>'.$form->textwithpicto($langs->trans("StockLimit"), $langs->trans("StockLimitDesc"), 1).'</td><td>';

+            print '<input name="seuil_stock_alerte" class="maxwidth50" value="'.GETPOST('seuil_stock_alerte').'">';

             print '</td>';

             // Stock desired level

-            print '<td>' . $form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1) . '</td><td>';

-            print '<input name="desiredstock" class="maxwidth50" value="' . GETPOST('desiredstock') . '">';

+            print '<td>'.$form->textwithpicto($langs->trans("DesiredStock"), $langs->trans("DesiredStockDesc"), 1).'</td><td>';

+            print '<input name="desiredstock" class="maxwidth50" value="'.GETPOST('desiredstock').'">';

             print '</td></tr>';

         } else {

             print '<input name="seuil_stock_alerte" type="hidden" value="0">';

@@ -953,7 +953,7 @@ 
 

         // Nature

         if ($type != 1) {

-            print '<tr><td>' . $langs->trans("Nature") . '</td><td colspan="3">';

+            print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';

             $statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));

             print $form->selectarray('finished', $statutarray, GETPOST('finished'), 1);

             print '</td></tr>';

@@ -961,42 +961,42 @@ 
 

         // Duration

         if ($type == 1) {

-            print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="' . $duration_value . '"> &nbsp;';

-            print '<input name="duration_unit" type="radio" value="i">' . $langs->trans("Minute") . '&nbsp;';

-            print '<input name="duration_unit" type="radio" value="h">' . $langs->trans("Hour") . '&nbsp;';

-            print '<input name="duration_unit" type="radio" value="d">' . $langs->trans("Day") . '&nbsp;';

-            print '<input name="duration_unit" type="radio" value="w">' . $langs->trans("Week") . '&nbsp;';

-            print '<input name="duration_unit" type="radio" value="m">' . $langs->trans("Month") . '&nbsp;';

-            print '<input name="duration_unit" type="radio" value="y">' . $langs->trans("Year") . '&nbsp;';

+            print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="6" maxlength="5" value="'.$duration_value.'"> &nbsp;';

+            print '<input name="duration_unit" type="radio" value="i">'.$langs->trans("Minute").'&nbsp;';

+            print '<input name="duration_unit" type="radio" value="h">'.$langs->trans("Hour").'&nbsp;';

+            print '<input name="duration_unit" type="radio" value="d">'.$langs->trans("Day").'&nbsp;';

+            print '<input name="duration_unit" type="radio" value="w">'.$langs->trans("Week").'&nbsp;';

+            print '<input name="duration_unit" type="radio" value="m">'.$langs->trans("Month").'&nbsp;';

+            print '<input name="duration_unit" type="radio" value="y">'.$langs->trans("Year").'&nbsp;';

             print '</td></tr>';

         }

 

         if ($type != 1) { // Le poids et le volume ne concerne que les produits et pas les services

             // Weight

-            print '<tr><td>' . $langs->trans("Weight") . '</td><td colspan="3">';

-            print '<input name="weight" size="4" value="' . GETPOST('weight') . '">';

+            print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';

+            print '<input name="weight" size="4" value="'.GETPOST('weight').'">';

             print $formproduct->select_measuring_units("weight_units", "weight");

             print '</td></tr>';

             // Length

             if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {

-                print '<tr><td>' . $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . '</td><td colspan="3">';

-                print '<input name="size" size="4" value="' . GETPOST('size') . '"> x ';

-                print '<input name="sizewidth" size="4" value="' . GETPOST('sizewidth') . '"> x ';

-                print '<input name="sizeheight" size="4" value="' . GETPOST('sizeheight') . '">';

+                print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';

+                print '<input name="size" size="4" value="'.GETPOST('size').'"> x ';

+                print '<input name="sizewidth" size="4" value="'.GETPOST('sizewidth').'"> x ';

+                print '<input name="sizeheight" size="4" value="'.GETPOST('sizeheight').'">';

                 print $formproduct->select_measuring_units("size_units", "size");

                 print '</td></tr>';

             }

             if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {

                 // Surface

-                print '<tr><td>' . $langs->trans("Surface") . '</td><td colspan="3">';

-                print '<input name="surface" size="4" value="' . GETPOST('surface') . '">';

+                print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';

+                print '<input name="surface" size="4" value="'.GETPOST('surface').'">';

                 print $formproduct->select_measuring_units("surface_units", "surface");

                 print '</td></tr>';

             }

             if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {

                 // Volume

-                print '<tr><td>' . $langs->trans("Volume") . '</td><td colspan="3">';

-                print '<input name="volume" size="4" value="' . GETPOST('volume') . '">';

+                print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';

+                print '<input name="volume" size="4" value="'.GETPOST('volume').'">';

                 print $formproduct->select_measuring_units("volume_units", "volume");

                 print '</td></tr>';

             }

@@ -1004,7 +1004,7 @@ 
 

         // Units

         if ($conf->global->PRODUCT_USE_UNITS) {

-            print '<tr><td>' . $langs->trans('DefaultUnitToShow') . '</td>';

+            print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';

             print '<td colspan="3">';

             print $form->selectUnits('', 'units');

             print '</td></tr>';

@@ -1012,9 +1012,9 @@ 
 

         // Custom code

         if (empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO) && empty($type)) {

-            print '<tr><td>' . $langs->trans("CustomCode") . '</td><td><input name="customcode" class="maxwidth100onsmartphone" value="' . GETPOST('customcode') . '"></td>';

+            print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.GETPOST('customcode').'"></td>';

             // Origin country

-            print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

+            print '<td>'.$langs->trans("CountryOrigin").'</td><td>';

             print $form->select_country(GETPOST('country_id', 'int'), 'country_id');

             if ($user->admin)

                 print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -1023,7 +1023,7 @@ 
 

         // Other attributes

         $parameters = array('colspan' => 3);

-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

         print $hookmanager->resPrint;

         if (empty($reshook)) {

             print $object->showOptionals($extrafields, 'edit', $parameters);

@@ -1032,7 +1032,7 @@ 
         // Note (private, no output on invoices, propales...)

         //if (! empty($conf->global->MAIN_DISABLE_NOTES_TAB))       available in create mode

         //{

-        print '<tr><td class="tdtop">' . $langs->trans("NoteNotVisibleOnBill") . '</td><td colspan="3">';

+        print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';

 

         // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.

         $doleditor = new DolEditor('note_private', GETPOST('note_private', 'none'), '', 140, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_8, '90%');

@@ -1043,7 +1043,7 @@ 
 

         if ($conf->categorie->enabled) {

             // Categories

-            print '<tr><td>' . $langs->trans("Categories") . '</td><td colspan="3">';

+            print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';

             $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);

             print $form->multiselectarray('categories', $cate_arbo, GETPOST('categories', 'array'), '', 0, '', 0, '100%');

             print "</td></tr>";

@@ -1058,7 +1058,7 @@ 
             // We must set them on prices tab.

             print '<table class="border" width="100%">';

             // VAT

-            print '<tr><td class="titlefieldcreate">' . $langs->trans("VATRate") . '</td><td>';

+            print '<tr><td class="titlefieldcreate">'.$langs->trans("VATRate").'</td><td>';

             $defaultva = get_default_tva($mysoc, $mysoc);

             print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);

             print '</td></tr>';

@@ -1068,18 +1068,18 @@ 
             print '<table class="border" width="100%">';

 

             // Price

-            print '<tr><td class="titlefieldcreate">' . $langs->trans("SellingPrice") . '</td>';

-            print '<td><input name="price" class="maxwidth50" value="' . $object->price . '">';

+            print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td>';

+            print '<td><input name="price" class="maxwidth50" value="'.$object->price.'">';

             print $form->selectPriceBaseType($object->price_base_type, "price_base_type");

             print '</td></tr>';

 

             // Min price

-            print '<tr><td>' . $langs->trans("MinPrice") . '</td>';

-            print '<td><input name="price_min" class="maxwidth50" value="' . $object->price_min . '">';

+            print '<tr><td>'.$langs->trans("MinPrice").'</td>';

+            print '<td><input name="price_min" class="maxwidth50" value="'.$object->price_min.'">';

             print '</td></tr>';

 

             // VAT

-            print '<tr><td>' . $langs->trans("VATRate") . '</td><td>';

+            print '<tr><td>'.$langs->trans("VATRate").'</td><td>';

             $defaultva = get_default_tva($mysoc, $mysoc);

             print $form->load_tva("tva_tx", $defaultva, $mysoc, $mysoc, 0, 0, '', false, 1);

             print '</td></tr>';

@@ -1094,7 +1094,7 @@ 
 

         if (!empty($conf->accounting->enabled)) {

             // Accountancy_code_sell

-            print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellCode") . '</td>';

+            print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';

             print '<td>';

             print $formaccounting->select_account(GETPOST('accountancy_code_sell'), 'accountancy_code_sell', 1, null, 1, 1, '');

             print '</td></tr>';

@@ -1102,47 +1102,47 @@ 
             if ($conf->global->MAIN_FEATURES_LEVEL) {

                 // Accountancy_code_sell_intra

                 if ($mysoc->isInEEC()) {

-                    print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellIntraCode") . '</td>';

+                    print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';

                     print '<td>';

                     print $formaccounting->select_account(GETPOST('accountancy_code_sell_intra'), 'accountancy_code_sell_intra', 1, null, 1, 1, '');

                     print '</td></tr>';

                 }

 

                 // Accountancy_code_sell_export

-                print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellExportCode") . '</td>';

+                print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';

                 print '<td>';

                 print $formaccounting->select_account(GETPOST('accountancy_code_sell_export'), 'accountancy_code_sell_export', 1, null, 1, 1, '');

                 print '</td></tr>';

             }

 

             // Accountancy_code_buy

-            print '<tr><td>' . $langs->trans("ProductAccountancyBuyCode") . '</td>';

+            print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';

             print '<td>';

             print $formaccounting->select_account(GETPOST('accountancy_code_buy'), 'accountancy_code_buy', 1, null, 1, 1, '');

             print '</td></tr>';

         } else { // For external software

             // Accountancy_code_sell

-            print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellCode") . '</td>';

-            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="' . $object->accountancy_code_sell . '">';

+            print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';

+            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell" value="'.$object->accountancy_code_sell.'">';

             print '</td></tr>';

 

             if ($conf->global->MAIN_FEATURES_LEVEL) {

                 // Accountancy_code_sell_intra

                 if ($mysoc->isInEEC()) {

-                    print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellIntraCode") . '</td>';

-                    print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_intra" value="' . $object->accountancy_code_sell_intra . '">';

+                    print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';

+                    print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_intra" value="'.$object->accountancy_code_sell_intra.'">';

                     print '</td></tr>';

                 }

 

                 // Accountancy_code_sell_export

-                print '<tr><td class="titlefieldcreate">' . $langs->trans("ProductAccountancySellExportCode") . '</td>';

-                print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_export" value="' . $object->accountancy_code_sell_export . '">';

+                print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';

+                print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_sell_export" value="'.$object->accountancy_code_sell_export.'">';

                 print '</td></tr>';

             }

 

             // Accountancy_code_buy

-            print '<tr><td>' . $langs->trans("ProductAccountancyBuyCode") . '</td>';

-            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="' . $object->accountancy_code_buy . '">';

+            print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';

+            print '<td class="maxwidthonsmartphone"><input class="minwidth100" name="accountancy_code_buy" value="'.$object->accountancy_code_buy.'">';

             print '</td></tr>';

         }

         print '</table>';

@@ -1150,9 +1150,9 @@ 
         dol_fiche_end();

 

         print '<div class="center">';

-        print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';

+        print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';

         print ' &nbsp; &nbsp; ';

-        print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';

+        print '<input type="button" class="button" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)">';

         print '</div>';

 

         print '</form>';

@@ -1164,7 +1164,7 @@ 
         // Fiche en mode edition

         if ($action == 'edit' && $usercancreate) {

             //WYSIWYG Editor

-            require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

 

             $type = $langs->trans('Product');

             if ($object->isService())

@@ -1172,47 +1172,47 @@ 
             //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");

             // Main official, simple, and not duplicated code

             // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";

-            print '<form href="' . BASE_URI . '?controller=product&method=card&id=' . $object->id . '" method="POST">' . "\n";

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<form href="'.BASE_URI.'?controller=product&method=card&id='.$object->id.'" method="POST">'."\n";

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print '<input type="hidden" name="action" value="update">';

-            print '<input type="hidden" name="id" value="' . $object->id . '">';

-            print '<input type="hidden" name="canvas" value="' . $object->canvas . '">';

+            print '<input type="hidden" name="id" value="'.$object->id.'">';

+            print '<input type="hidden" name="canvas" value="'.$object->canvas.'">';

 

             $head = product_prepare_head($object);

-            $titre = $langs->trans("CardProduct" . $object->type);

+            $titre = $langs->trans("CardProduct".$object->type);

             $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');

             dol_fiche_head($head, 'card', $titre, 0, $picto);

 

             print '<table class="border allwidth">';

 

             // Ref

-            print '<tr><td class="titlefield fieldrequired">' . $langs->trans("Ref") . '</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="' . dol_escape_htmltag($object->ref) . '"></td></tr>';

+            print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="ref" class="maxwidth200" maxlength="128" value="'.dol_escape_htmltag($object->ref).'"></td></tr>';

 

             // Label

-            print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="' . dol_escape_htmltag($object->label) . '"></td></tr>';

+            print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td colspan="3"><input name="label" class="minwidth300 maxwidth400onsmartphone" maxlength="255" value="'.dol_escape_htmltag($object->label).'"></td></tr>';

 

             // Status To sell

-            print '<tr><td class="fieldrequired">' . $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')</td><td colspan="3">';

+            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Sell").')</td><td colspan="3">';

             print '<select class="flat" name="statut">';

             if ($object->status) {

-                print '<option value="1" selected>' . $langs->trans("OnSell") . '</option>';

-                print '<option value="0">' . $langs->trans("NotOnSell") . '</option>';

+                print '<option value="1" selected>'.$langs->trans("OnSell").'</option>';

+                print '<option value="0">'.$langs->trans("NotOnSell").'</option>';

             } else {

-                print '<option value="1">' . $langs->trans("OnSell") . '</option>';

-                print '<option value="0" selected>' . $langs->trans("NotOnSell") . '</option>';

+                print '<option value="1">'.$langs->trans("OnSell").'</option>';

+                print '<option value="0" selected>'.$langs->trans("NotOnSell").'</option>';

             }

             print '</select>';

             print '</td></tr>';

 

             // Status To Buy

-            print '<tr><td class="fieldrequired">' . $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')</td><td colspan="3">';

+            print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Buy").')</td><td colspan="3">';

             print '<select class="flat" name="statut_buy">';

             if ($object->status_buy) {

-                print '<option value="1" selected>' . $langs->trans("ProductStatusOnBuy") . '</option>';

-                print '<option value="0">' . $langs->trans("ProductStatusNotOnBuy") . '</option>';

+                print '<option value="1" selected>'.$langs->trans("ProductStatusOnBuy").'</option>';

+                print '<option value="0">'.$langs->trans("ProductStatusNotOnBuy").'</option>';

             } else {

-                print '<option value="1">' . $langs->trans("ProductStatusOnBuy") . '</option>';

-                print '<option value="0" selected>' . $langs->trans("ProductStatusNotOnBuy") . '</option>';

+                print '<option value="1">'.$langs->trans("ProductStatusOnBuy").'</option>';

+                print '<option value="0" selected>'.$langs->trans("ProductStatusNotOnBuy").'</option>';

             }

             print '</select>';

             print '</td></tr>';

@@ -1220,7 +1220,7 @@ 
             // Batch number managment

             if ($conf->productbatch->enabled) {

                 if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {

-                    print '<tr><td>' . $langs->trans("ManageLotSerial") . '</td><td colspan="3">';

+                    print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="3">';

                     $statutarray = array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));

                     print $form->selectarray('status_batch', $statutarray, $object->status_batch);

                     print '</td></tr>';

@@ -1233,7 +1233,7 @@ 
                 $showbarcode = 0;

 

             if ($showbarcode) {

-                print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

+                print '<tr><td>'.$langs->trans('BarcodeType').'</td><td>';

                 if (isset($_POST['fk_barcode_type'])) {

                     $fk_barcode_type = GETPOST('fk_barcode_type');

                 } else {

@@ -1241,19 +1241,19 @@ 
                     if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

                         $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

                 }

-                require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';

                 $formbarcode = new FormBarCode($db);

                 print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

-                print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

+                print '</td><td>'.$langs->trans("BarcodeValue").'</td><td>';

                 $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

                 if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

                     $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

-                print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

+                print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.dol_escape_htmltag($tmpcode).'">';

                 print '</td></tr>';

             }

 

             // Description (used in invoice, propal...)

-            print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td colspan="3">';

+            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';

 

             // We use dolibarr_details as type of DolEditor here, because we must not accept images as description is included into PDF and not accepted by TCPDF.

             $doleditor = new DolEditor('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');

@@ -1263,16 +1263,16 @@ 
             print "\n";

 

             // Public Url

-            print '<tr><td>' . $langs->trans("PublicUrl") . '</td><td colspan="3">';

-            print '<input type="text" name="url" class="quatrevingtpercent" value="' . $object->url . '">';

+            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="3">';

+            print '<input type="text" name="url" class="quatrevingtpercent" value="'.$object->url.'">';

             print '</td></tr>';

 

             // Stock

             if ($object->isProduct() && !empty($conf->stock->enabled)) {

                 // Default warehouse

-                print '<tr><td>' . $langs->trans("DefaultWarehouse") . '</td><td>';

+                print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';

                 print $formproduct->selectWarehouses($object->fk_default_warehouse, 'fk_default_warehouse', 'warehouseopen', 1);

-                print ' <a href="' . DOL_URL_ROOT . '/product/stock/card.php?action=create&amp;backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create&type=' . GETPOST('type', 'int')) . '">' . $langs->trans("AddWarehouse") . '</a>';

+                print ' <a href="'.DOL_URL_ROOT.'/product/stock/card.php?action=create&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].'?action=create&type='.GETPOST('type', 'int')).'">'.$langs->trans("AddWarehouse").'</a>';

                 print '</td>';

                 /*

                   print "<tr>".'<td>'.$langs->trans("StockLimit").'</td><td>';

@@ -1293,7 +1293,7 @@ 
 

             // Nature

             if ($object->type != Product::TYPE_SERVICE) {

-                print '<tr><td>' . $langs->trans("Nature") . '</td><td colspan="3">';

+                print '<tr><td>'.$langs->trans("Nature").'</td><td colspan="3">';

                 $statutarray = array('-1' => '&nbsp;', '1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));

                 print $form->selectarray('finished', $statutarray, $object->finished);

                 print '</td></tr>';

@@ -1301,53 +1301,53 @@ 
 

             if ($object->isService()) {

                 // Duration

-                print '<tr><td>' . $langs->trans("Duration") . '</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="' . $object->duration_value . '">';

+                print '<tr><td>'.$langs->trans("Duration").'</td><td colspan="3"><input name="duration_value" size="3" maxlength="5" value="'.$object->duration_value.'">';

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="i"' . ($object->duration_unit == 'i' ? ' checked' : '') . '>' . $langs->trans("Minute");

+                print '<input name="duration_unit" type="radio" value="i"'.($object->duration_unit == 'i' ? ' checked' : '').'>'.$langs->trans("Minute");

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="h"' . ($object->duration_unit == 'h' ? ' checked' : '') . '>' . $langs->trans("Hour");

+                print '<input name="duration_unit" type="radio" value="h"'.($object->duration_unit == 'h' ? ' checked' : '').'>'.$langs->trans("Hour");

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="d"' . ($object->duration_unit == 'd' ? ' checked' : '') . '>' . $langs->trans("Day");

+                print '<input name="duration_unit" type="radio" value="d"'.($object->duration_unit == 'd' ? ' checked' : '').'>'.$langs->trans("Day");

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="w"' . ($object->duration_unit == 'w' ? ' checked' : '') . '>' . $langs->trans("Week");

+                print '<input name="duration_unit" type="radio" value="w"'.($object->duration_unit == 'w' ? ' checked' : '').'>'.$langs->trans("Week");

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="m"' . ($object->duration_unit == 'm' ? ' checked' : '') . '>' . $langs->trans("Month");

+                print '<input name="duration_unit" type="radio" value="m"'.($object->duration_unit == 'm' ? ' checked' : '').'>'.$langs->trans("Month");

                 print '&nbsp; ';

-                print '<input name="duration_unit" type="radio" value="y"' . ($object->duration_unit == 'y' ? ' checked' : '') . '>' . $langs->trans("Year");

+                print '<input name="duration_unit" type="radio" value="y"'.($object->duration_unit == 'y' ? ' checked' : '').'>'.$langs->trans("Year");

                 print '</td></tr>';

             } else {

                 // Weight

-                print '<tr><td>' . $langs->trans("Weight") . '</td><td colspan="3">';

-                print '<input name="weight" size="5" value="' . $object->weight . '"> ';

+                print '<tr><td>'.$langs->trans("Weight").'</td><td colspan="3">';

+                print '<input name="weight" size="5" value="'.$object->weight.'"> ';

                 print $formproduct->select_measuring_units("weight_units", "weight", $object->weight_units);

                 print '</td></tr>';

                 if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {

                     // Length

-                    print '<tr><td>' . $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . '</td><td colspan="3">';

-                    print '<input name="size" size="5" value="' . $object->length . '">x';

-                    print '<input name="sizewidth" size="5" value="' . $object->width . '">x';

-                    print '<input name="sizeheight" size="5" value="' . $object->height . '"> ';

+                    print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="3">';

+                    print '<input name="size" size="5" value="'.$object->length.'">x';

+                    print '<input name="sizewidth" size="5" value="'.$object->width.'">x';

+                    print '<input name="sizeheight" size="5" value="'.$object->height.'"> ';

                     print $formproduct->select_measuring_units("size_units", "size", $object->length_units);

                     print '</td></tr>';

                 }

                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {

                     // Surface

-                    print '<tr><td>' . $langs->trans("Surface") . '</td><td colspan="3">';

-                    print '<input name="surface" size="5" value="' . $object->surface . '"> ';

+                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="3">';

+                    print '<input name="surface" size="5" value="'.$object->surface.'"> ';

                     print $formproduct->select_measuring_units("surface_units", "surface", $object->surface_units);

                     print '</td></tr>';

                 }

                 if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {

                     // Volume

-                    print '<tr><td>' . $langs->trans("Volume") . '</td><td colspan="3">';

-                    print '<input name="volume" size="5" value="' . $object->volume . '"> ';

+                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="3">';

+                    print '<input name="volume" size="5" value="'.$object->volume.'"> ';

                     print $formproduct->select_measuring_units("volume_units", "volume", $object->volume_units);

                     print '</td></tr>';

                 }

             }

             // Units

             if ($conf->global->PRODUCT_USE_UNITS) {

-                print '<tr><td>' . $langs->trans('DefaultUnitToShow') . '</td>';

+                print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td>';

                 print '<td colspan="3">';

                 print $form->selectUnits($object->fk_unit, 'units');

                 print '</td></tr>';

@@ -1355,9 +1355,9 @@ 
 

             // Custom code

             if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {

-                print '<tr><td>' . $langs->trans("CustomCode") . '</td><td><input name="customcode" class="maxwidth100onsmartphone" value="' . $object->customcode . '"></td>';

+                print '<tr><td>'.$langs->trans("CustomCode").'</td><td><input name="customcode" class="maxwidth100onsmartphone" value="'.$object->customcode.'"></td>';

                 // Origin country

-                print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

+                print '<td>'.$langs->trans("CountryOrigin").'</td><td>';

                 print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');

                 if ($user->admin)

                     print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

@@ -1366,7 +1366,7 @@ 
 

             // Other attributes

             $parameters = array('colspan' => ' colspan="3"', 'cols' => 3);

-            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+            $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

             print $hookmanager->resPrint;

             if (empty($reshook)) {

                 print $object->showOptionals($extrafields, 'edit');

@@ -1374,7 +1374,7 @@ 
 

             // Tags-Categories

             if ($conf->categorie->enabled) {

-                print '<tr><td class="tdtop">' . $langs->trans("Categories") . '</td><td colspan="3">';

+                print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';

                 $cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);

                 $c = new Categorie($db);

                 $cats = $c->containing($object->id, Categorie::TYPE_PRODUCT);

@@ -1388,7 +1388,7 @@ 
 

             // Note private

             if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

-                print '<tr><td class="tdtop">' . $langs->trans("NoteNotVisibleOnBill") . '</td><td colspan="3">';

+                print '<tr><td class="tdtop">'.$langs->trans("NoteNotVisibleOnBill").'</td><td colspan="3">';

 

                 $doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');

                 $doleditor->Create();

@@ -1404,7 +1404,7 @@ 
 

             if (!empty($conf->accounting->enabled)) {

                 // Accountancy_code_sell

-                print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellCode") . '</td>';

+                print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';

                 print '<td>';

                 print $formaccounting->select_account($object->accountancy_code_sell, 'accountancy_code_sell', 1, '', 1, 1);

                 print '</td></tr>';

@@ -1412,47 +1412,47 @@ 
                 if ($conf->global->MAIN_FEATURES_LEVEL) {

                     // Accountancy_code_sell_intra

                     if ($mysoc->isInEEC()) {

-                        print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellIntraCode") . '</td>';

+                        print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';

                         print '<td>';

                         print $formaccounting->select_account($object->accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, '', 1, 1);

                         print '</td></tr>';

                     }

 

                     // Accountancy_code_sell_export

-                    print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellExportCode") . '</td>';

+                    print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellExportCode").'</td>';

                     print '<td>';

                     print $formaccounting->select_account($object->accountancy_code_sell_export, 'accountancy_code_sell_export', 1, '', 1, 1);

                     print '</td></tr>';

                 }

 

                 // Accountancy_code_buy

-                print '<tr><td>' . $langs->trans("ProductAccountancyBuyCode") . '</td>';

+                print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';

                 print '<td>';

                 print $formaccounting->select_account($object->accountancy_code_buy, 'accountancy_code_buy', 1, '', 1, 1);

                 print '</td></tr>';

             } else { // For external software

                 // Accountancy_code_sell

-                print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellCode") . '</td>';

-                print '<td><input name="accountancy_code_sell" class="maxwidth200" value="' . $object->accountancy_code_sell . '">';

+                print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellCode").'</td>';

+                print '<td><input name="accountancy_code_sell" class="maxwidth200" value="'.$object->accountancy_code_sell.'">';

                 print '</td></tr>';

 

                 if ($conf->global->MAIN_FEATURES_LEVEL) {

                     // Accountancy_code_sell_intra

                     if ($mysoc->isInEEC()) {

-                        print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellIntraCode") . '</td>';

-                        print '<td><input name="accountancy_code_sell_intra" class="maxwidth200" value="' . $object->accountancy_code_sell_intra . '">';

+                        print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';

+                        print '<td><input name="accountancy_code_sell_intra" class="maxwidth200" value="'.$object->accountancy_code_sell_intra.'">';

                         print '</td></tr>';

                     }

 

                     // Accountancy_code_sell_export

-                    print '<tr><td class="titlefield">' . $langs->trans("ProductAccountancySellExportCode") . '</td>';

-                    print '<td><input name="accountancy_code_sell_export" class="maxwidth200" value="' . $object->accountancy_code_sell_export . '">';

+                    print '<tr><td class="titlefield">'.$langs->trans("ProductAccountancySellExportCode").'</td>';

+                    print '<td><input name="accountancy_code_sell_export" class="maxwidth200" value="'.$object->accountancy_code_sell_export.'">';

                     print '</td></tr>';

                 }

 

                 // Accountancy_code_buy

-                print '<tr><td>' . $langs->trans("ProductAccountancyBuyCode") . '</td>';

-                print '<td><input name="accountancy_code_buy" class="maxwidth200" value="' . $object->accountancy_code_buy . '">';

+                print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';

+                print '<td><input name="accountancy_code_buy" class="maxwidth200" value="'.$object->accountancy_code_buy.'">';

                 print '</td></tr>';

             }

             print '</table>';

@@ -1460,9 +1460,9 @@ 
             dol_fiche_end();

 

             print '<div class="center">';

-            print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';

+            print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';

             print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-            print '<input type="submit" class="button" name="cancel" value="' . $langs->trans("Cancel") . '">';

+            print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

             print '</div>';

 

             print '</form>';

@@ -1474,13 +1474,13 @@ 
                 $showbarcode = 0;

 

             $head = product_prepare_head($object);

-            $titre = $langs->trans("CardProduct" . $object->type);

+            $titre = $langs->trans("CardProduct".$object->type);

             $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');

 

             dol_fiche_head($head, 'card', $titre, -1, $picto);

 

-            $linkback = '<a href="' . DOL_URL_ROOT . '/product/list.php?restore_lastsearch_values=1&type=' . $object->type . '">' . $langs->trans("BackToList") . '</a>';

-            $object->next_prev_filter = " fk_product_type = " . $object->type;

+            $linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1&type='.$object->type.'">'.$langs->trans("BackToList").'</a>';

+            $object->next_prev_filter = " fk_product_type = ".$object->type;

 

             $shownav = 1;

             if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL)))

@@ -1498,8 +1498,8 @@ 
             // Type

             if (!empty($conf->produit->enabled) && !empty($conf->service->enabled)) {

                 // TODO change for compatibility with edit in place

-                $typeformat = 'select;0:' . $langs->trans("Product") . ',1:' . $langs->trans("Service");

-                print '<tr><td class="titlefield">' . $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) . '</td><td colspan="2">';

+                $typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");

+                print '<tr><td class="titlefield">'.$form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat).'</td><td colspan="2">';

                 print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);

                 print '</td></tr>';

             }

@@ -1511,20 +1511,20 @@ 
                 print $langs->trans("BarcodeType");

                 print '</td>';

                 if (($action != 'editbarcodetype') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcodetype&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcodetype&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';

                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcodetype' || $action == 'editbarcode') {

-                    require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

+                    require_once DOL_DOCUMENT_ROOT.'/core/class/html.formbarcode.class.php';

                     $formbarcode = new FormBarCode($db);

                 }

                 if ($action == 'editbarcodetype') {

-                    print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->barcode_type, 'fk_barcode_type');

+                    print $formbarcode->formBarcodeType($_SERVER['PHP_SELF'].'?id='.$object->id, $object->barcode_type, 'fk_barcode_type');

                 } else {

                     $object->fetch_barcode();

-                    print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">' . $langs->trans("SetDefaultBarcodeType") . '<div>' : '');

+                    print $object->barcode_type_label ? $object->barcode_type_label : ($object->barcode ? '<div class="warning">'.$langs->trans("SetDefaultBarcodeType").'<div>' : '');

                 }

-                print '</td></tr>' . "\n";

+                print '</td></tr>'."\n";

 

                 // Barcode value

                 print '<tr><td class="nowrap">';

@@ -1532,7 +1532,7 @@ 
                 print $langs->trans("BarcodeValue");

                 print '</td>';

                 if (($action != 'editbarcode') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcode&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                    print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editbarcode&amp;id='.$object->id.'">'.img_edit($langs->trans('Edit'), 1).'</a></td>';

                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcode') {

@@ -1541,18 +1541,18 @@ 
                         $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

 

                     // print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';

-                    print '<form method="POST" href="' . BASE_URI . '?controller=product&method=card&id=' . $object->id . '">';

-                    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+                    print '<form method="POST" href="'.BASE_URI.'?controller=product&method=card&id='.$object->id.'">';

+                    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

                     print '<input type="hidden" name="action" value="setbarcode">';

-                    print '<input type="hidden" name="barcode_type_code" value="' . $object->barcode_type_code . '">';

-                    print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . $tmpcode . '">';

-                    print '&nbsp;<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+                    print '<input type="hidden" name="barcode_type_code" value="'.$object->barcode_type_code.'">';

+                    print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="'.$tmpcode.'">';

+                    print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

                     print '</form>';

                 }

                 else {

                     print $object->barcode;

                 }

-                print '</td></tr>' . "\n";

+                print '</td></tr>'."\n";

             }

 

             // Accountancy sell code

@@ -1626,7 +1626,7 @@ 
             // Batch number management (to batch)

             if (!empty($conf->productbatch->enabled)) {

                 if ($object->isProduct() || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {

-                    print '<tr><td>' . $langs->trans("ManageLotSerial") . '</td><td colspan="2">';

+                    print '<tr><td>'.$langs->trans("ManageLotSerial").'</td><td colspan="2">';

                     if (!empty($conf->use_javascript_ajax) && $usercancreate && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

                         print ajax_object_onoff($object, 'status_batch', 'tobatch', 'ProductStatusOnBatch', 'ProductStatusNotOnBatch');

                     } else {

@@ -1637,10 +1637,10 @@ 
             }

 

             // Description

-            print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td colspan="2">' . (dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)) . '</td></tr>';

+            print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td colspan="2">'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';

 

             // Public URL

-            print '<tr><td>' . $langs->trans("PublicUrl") . '</td><td colspan="2">';

+            print '<tr><td>'.$langs->trans("PublicUrl").'</td><td colspan="2">';

             print dol_print_url($object->url);

             print '</td></tr>';

 

@@ -1649,7 +1649,7 @@ 
                 $warehouse = new Entrepot($db);

                 $warehouse->fetch($object->fk_default_warehouse);

 

-                print '<tr><td>' . $langs->trans("DefaultWarehouse") . '</td><td>';

+                print '<tr><td>'.$langs->trans("DefaultWarehouse").'</td><td>';

                 print (!empty($warehouse->id) ? $warehouse->getNomUrl(1) : '');

                 print '</td>';

             }

@@ -1664,7 +1664,7 @@ 
                     $prodstatic->fetch($combination->fk_product_parent);

 

                     // Parent product

-                    print '<tr><td>' . $langs->trans("ParentProduct") . '</td><td colspan="2">';

+                    print '<tr><td>'.$langs->trans("ParentProduct").'</td><td colspan="2">';

                     print $prodstatic->getNomUrl(1);

                     print '</td></tr>';

                 }

@@ -1679,41 +1679,41 @@ 
 

             // Nature

             if ($object->type != Product::TYPE_SERVICE) {

-                print '<tr><td class="titlefield">' . $langs->trans("Nature") . '</td><td colspan="2">';

+                print '<tr><td class="titlefield">'.$langs->trans("Nature").'</td><td colspan="2">';

                 print $object->getLibFinished();

                 print '</td></tr>';

             }

 

             if ($object->isService()) {

                 // Duration

-                print '<tr><td class="titlefield">' . $langs->trans("Duration") . '</td><td colspan="2">' . $object->duration_value . '&nbsp;';

+                print '<tr><td class="titlefield">'.$langs->trans("Duration").'</td><td colspan="2">'.$object->duration_value.'&nbsp;';

                 if ($object->duration_value > 1) {

                     $dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hours"), "d" => $langs->trans("Days"), "w" => $langs->trans("Weeks"), "m" => $langs->trans("Months"), "y" => $langs->trans("Years"));

                 } else if ($object->duration_value > 0) {

                     $dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));

                 }

-                print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '') . "&nbsp;";

+                print (!empty($object->duration_unit) && isset($dur[$object->duration_unit]) ? $langs->trans($dur[$object->duration_unit]) : '')."&nbsp;";

 

                 print '</td></tr>';

             } else {

                 // Weight

-                print '<tr><td class="titlefield">' . $langs->trans("Weight") . '</td><td colspan="2">';

+                print '<tr><td class="titlefield">'.$langs->trans("Weight").'</td><td colspan="2">';

                 if ($object->weight != '') {

-                    print $object->weight . " " . measuring_units_string($object->weight_units, "weight");

+                    print $object->weight." ".measuring_units_string($object->weight_units, "weight");

                 } else {

                     print '&nbsp;';

                 }

                 print "</td></tr>\n";

                 if (empty($conf->global->PRODUCT_DISABLE_SIZE)) {

                     // Length

-                    print '<tr><td>' . $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . '</td><td colspan="2">';

+                    print '<tr><td>'.$langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").'</td><td colspan="2">';

                     if ($object->length != '' || $object->width != '' || $object->height != '') {

                         print $object->length;

                         if ($object->width)

-                            print " x " . $object->width;

+                            print " x ".$object->width;

                         if ($object->height)

-                            print " x " . $object->height;

-                        print ' ' . measuring_units_string($object->length_units, "size");

+                            print " x ".$object->height;

+                        print ' '.measuring_units_string($object->length_units, "size");

                     }

                     else {

                         print '&nbsp;';

@@ -1722,9 +1722,9 @@ 
                 }

                 if (empty($conf->global->PRODUCT_DISABLE_SURFACE)) {

                     // Surface

-                    print '<tr><td>' . $langs->trans("Surface") . '</td><td colspan="2">';

+                    print '<tr><td>'.$langs->trans("Surface").'</td><td colspan="2">';

                     if ($object->surface != '') {

-                        print $object->surface . " " . measuring_units_string($object->surface_units, "surface");

+                        print $object->surface." ".measuring_units_string($object->surface_units, "surface");

                     } else {

                         print '&nbsp;';

                     }

@@ -1732,9 +1732,9 @@ 
                 }

                 if (empty($conf->global->PRODUCT_DISABLE_VOLUME)) {

                     // Volume

-                    print '<tr><td>' . $langs->trans("Volume") . '</td><td colspan="2">';

+                    print '<tr><td>'.$langs->trans("Volume").'</td><td colspan="2">';

                     if ($object->volume != '') {

-                        print $object->volume . " " . measuring_units_string($object->volume_units, "volume");

+                        print $object->volume." ".measuring_units_string($object->volume_units, "volume");

                     } else {

                         print '&nbsp;';

                     }

@@ -1746,7 +1746,7 @@ 
             if (!empty($conf->global->PRODUCT_USE_UNITS)) {

                 $unit = $object->getLabelOfUnit();

 

-                print '<tr><td>' . $langs->trans('DefaultUnitToShow') . '</td><td>';

+                print '<tr><td>'.$langs->trans('DefaultUnitToShow').'</td><td>';

                 if ($unit !== '') {

                     print $langs->trans($unit);

                 }

@@ -1755,28 +1755,28 @@ 
 

             // Custom code

             if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {

-                print '<tr><td>' . $langs->trans("CustomCode") . '</td><td colspan="2">' . $object->customcode . '</td>';

+                print '<tr><td>'.$langs->trans("CustomCode").'</td><td colspan="2">'.$object->customcode.'</td>';

 

                 // Origin country code

-                print '<tr><td>' . $langs->trans("CountryOrigin") . '</td><td colspan="2">' . getCountry($object->country_id, 0, $db) . '</td>';

+                print '<tr><td>'.$langs->trans("CountryOrigin").'</td><td colspan="2">'.getCountry($object->country_id, 0, $db).'</td>';

             }

 

             // Other attributes

-            $parameters = array('colspan' => ' colspan="' . (2 + (($showphoto || $showbarcode) ? 1 : 0)) . '"');

-            include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';

+            $parameters = array('colspan' => ' colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'"');

+            include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

 

             // Categories

             if ($conf->categorie->enabled) {

-                print '<tr><td valign="middle">' . $langs->trans("Categories") . '</td><td colspan="3">';

+                print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';

                 print $form->showCategories($object->id, 'product', 1);

                 print "</td></tr>";

             }

 

             // Note private

             if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

-                print '<!-- show Note --> ' . "\n";

-                print '<tr><td class="tdtop">' . $langs->trans("NotePrivate") . '</td><td colspan="' . (2 + (($showphoto || $showbarcode) ? 1 : 0)) . '">' . (dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)) . '</td></tr>' . "\n";

-                print '<!-- End show Note --> ' . "\n";

+                print '<!-- show Note --> '."\n";

+                print '<tr><td class="tdtop">'.$langs->trans("NotePrivate").'</td><td colspan="'.(2 + (($showphoto || $showbarcode) ? 1 : 0)).'">'.(dol_textishtml($object->note_private) ? $object->note_private : dol_nl2br($object->note_private, 1, true)).'</td></tr>'."\n";

+                print '<!-- End show Note --> '."\n";

             }

 

             print "</table>\n";

@@ -1797,7 +1797,7 @@ 
 if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {

     $module = substr($module, 0, dol_strlen($module) - 4);

 }

-$result = dol_include_once('/core/modules/product/' . $module . '.php');

+$result = dol_include_once('/core/modules/product/'.$module.'.php');

 if ($result > 0) {

     $modCodeProduct = new $module();

 }

@@ -1809,9 +1809,9 @@ 
 // Define confirmation messages

 $formquestionclone = array(

     'text' => $langs->trans("ConfirmClone"),

-    array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf") . ' ' . $object->ref : $tmpcode, 'size' => 24),

+    array('type' => 'text', 'name' => 'clone_ref', 'label' => $langs->trans("NewRefForClone"), 'value' => empty($tmpcode) ? $langs->trans("CopyOf").' '.$object->ref : $tmpcode, 'size' => 24),

     array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneContentProduct"), 'value' => 1),

-    array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct") . ' (' . $langs->trans("FeatureNotYetAvailable") . ')', 'value' => 0, 'disabled' => true),

+    array('type' => 'checkbox', 'name' => 'clone_prices', 'label' => $langs->trans("ClonePricesProduct").' ('.$langs->trans("FeatureNotYetAvailable").')', 'value' => 0, 'disabled' => true),

 );

 if (!empty($conf->global->PRODUIT_SOUSPRODUITS)) {

     $formquestionclone[] = array('type' => 'checkbox', 'name' => 'clone_composition', 'label' => $langs->trans('CloneCompositionProduct'), 'value' => 1);

@@ -1820,13 +1820,13 @@ 
 // Confirm delete product

 if (($action == 'delete' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile))) // Output when action = clone if jmobile or no js

     || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {       // Always output when not jmobile nor js

-    print $form->formconfirm("card.php?id=" . $object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");

+    print $form->formconfirm("card.php?id=".$object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");

 }

 

 // Clone confirmation

 if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))  // Output when action = clone if jmobile or no js

     || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {       // Always output when not jmobile nor js

-    print $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('CloneProduct'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 260, 600);

+    print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('CloneProduct'), $langs->trans('ConfirmCloneProduct', $object->ref), 'confirm_clone', $formquestionclone, 'yes', 'action-clone', 260, 600);

 }

 

 

@@ -1836,20 +1836,20 @@ 
 /*                                                                            */

 /* * ************************************************************************* */

 if ($action != 'create' && $action != 'edit') {

-    print "\n" . '<div class="tabsAction">' . "\n";

+    print "\n".'<div class="tabsAction">'."\n";

 

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+    $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

     if (empty($reshook)) {

         if ($usercancreate) {

             if (!isset($object->no_button_edit) || $object->no_button_edit <> 1)

-                print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&amp;id=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';

+                print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&amp;id='.$object->id.'">'.$langs->trans("Modify").'</a></div>';

 

             if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {

                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {

-                    print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">' . $langs->trans('ToClone') . '</span></div>' . "\n";

+                    print '<div class="inline-block divButAction"><span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span></div>'."\n";

                 } else {

-                    print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=clone&amp;id=' . $object->id . '">' . $langs->trans("ToClone") . '</a></div>';

+                    print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&amp;id='.$object->id.'">'.$langs->trans("ToClone").'</a></div>';

                 }

             }

         }

@@ -1858,15 +1858,15 @@ 
         if ($usercandelete) {

             if (empty($object_is_used) && (!isset($object->no_button_delete) || $object->no_button_delete <> 1)) {

                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {

-                    print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">' . $langs->trans('Delete') . '</span></div>' . "\n";

+                    print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";

                 } else {

-                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=delete&amp;id=' . $object->id . '">' . $langs->trans("Delete") . '</a></div>';

+                    print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&amp;id='.$object->id.'">'.$langs->trans("Delete").'</a></div>';

                 }

             } else {

-                print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . $langs->trans("ProductIsUsed") . '">' . $langs->trans("Delete") . '</a></div>';

+                print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a></div>';

             }

         } else {

-            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . $langs->trans("NotEnoughPermissions") . '">' . $langs->trans("Delete") . '</a></div>';

+            print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a></div>';

         }

     }

 

@@ -1891,12 +1891,12 @@ 
 

         if (is_array($otherprop) && count($otherprop)) {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftProposals") . '</td><td>';

+            $html .= $langs->trans("AddToDraftProposals").'</td><td>';

             $html .= $form->selectarray("propalid", $otherprop, 0, 1);

             $html .= '</td></tr>';

         } else {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftProposals") . '</td><td>';

+            $html .= $langs->trans("AddToDraftProposals").'</td><td>';

             $html .= $langs->trans("NoDraftProposals");

             $html .= '</td></tr>';

         }

@@ -1911,12 +1911,12 @@ 
         $othercom = $commande->liste_array(2, 1, null);

         if (is_array($othercom) && count($othercom)) {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftOrders") . '</td><td>';

+            $html .= $langs->trans("AddToDraftOrders").'</td><td>';

             $html .= $form->selectarray("commandeid", $othercom, 0, 1);

             $html .= '</td></tr>';

         } else {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftOrders") . '</td><td>';

+            $html .= $langs->trans("AddToDraftOrders").'</td><td>';

             $html .= $langs->trans("NoDraftOrders");

             $html .= '</td></tr>';

         }

@@ -1931,12 +1931,12 @@ 
         $otherinvoice = $invoice->liste_array(2, 1, null);

         if (is_array($otherinvoice) && count($otherinvoice)) {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftInvoices") . '</td><td>';

+            $html .= $langs->trans("AddToDraftInvoices").'</td><td>';

             $html .= $form->selectarray("factureid", $otherinvoice, 0, 1);

             $html .= '</td></tr>';

         } else {

             $html .= '<tr><td style="width: 200px;">';

-            $html .= $langs->trans("AddToDraftInvoices") . '</td><td>';

+            $html .= $langs->trans("AddToDraftInvoices").'</td><td>';

             $html .= $langs->trans("NoDraftInvoices");

             $html .= '</td></tr>';

         }

@@ -1945,17 +1945,17 @@ 
     //If any text is going to be printed, then we show the table

     if (!empty($html)) {

         // print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';

-        print '<form method="POST" href="' . BASE_URI . '?controller=product&method=card&id=' . $object->id . '">';

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+        print '<form method="POST" href="'.BASE_URI.'?controller=product&method=card&id='.$object->id.'">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

         print '<input type="hidden" name="action" value="addin">';

 

         print load_fiche_titre($langs->trans("AddToDraft"), '', '');

 

         dol_fiche_head('');

 

-        $html .= '<tr><td class="nowrap">' . $langs->trans("Quantity") . ' ';

+        $html .= '<tr><td class="nowrap">'.$langs->trans("Quantity").' ';

         $html .= '<input type="text" class="flat" name="qty" size="1" value="1"></td>';

-        $html .= '<td class="nowrap">' . $langs->trans("ReductionShort") . '(%) ';

+        $html .= '<td class="nowrap">'.$langs->trans("ReductionShort").'(%) ';

         $html .= '<input type="text" class="flat" name="remise_percent" size="1" value="0">';

         $html .= '</td></tr>';

 

@@ -1964,7 +1964,7 @@ 
         print '</table>';

 

         print '<div class="center">';

-        print '<input type="submit" class="button" value="' . $langs->trans("Add") . '">';

+        print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';

         print '</div>';

 

         dol_fiche_end();

@@ -1983,9 +1983,9 @@ 
     print '<a name="builddoc"></a>'; // ancre

     // Documents

     $objectref = dol_sanitizeFileName($object->ref);

-    $relativepath = $comref . '/' . $objectref . '.pdf';

-    $filedir = $conf->produit->dir_output . '/' . $objectref;

-    $urlsource = $_SERVER["PHP_SELF"] . "?id=" . $object->id;

+    $relativepath = $comref.'/'.$objectref.'.pdf';

+    $filedir = $conf->produit->dir_output.'/'.$objectref;

+    $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;

     $genallowed = $usercanread;

     $delallowed = $usercancreate;

 

@@ -1996,14 +1996,14 @@ 
 

     $MAXEVENT = 10;

 

-    $morehtmlright = '<a href="' . DOL_URL_ROOT . '/product/agenda.php?id=' . $object->id . '">';

+    $morehtmlright = '<a href="'.DOL_URL_ROOT.'/product/agenda.php?id='.$object->id.'">';

     $morehtmlright .= $langs->trans("SeeAll");

     $morehtmlright .= '</a>';

 

     // List of actions on element

-    include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';

+    include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';

     $formactions = new FormActions($db);

-    $somethingshown = $formactions->showactions($object, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlright);  // Show all action for product

+    $somethingshown = $formactions->showactions($object, 'product', 0, 1, '', $MAXEVENT, '', $morehtmlright); // Show all action for product

 

     print '</div></div></div>';

 }

Braces +132 added lines, -100 removed lines

@@ -110,16 +110,18 @@ 
 if ($id > 0 || !empty($ref)) {

     $result = $object->fetch($id, $ref);

 

-    if (!empty($conf->product->enabled))

-        $upload_dir = $conf->product->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

-    elseif (!empty($conf->service->enabled))

-        $upload_dir = $conf->service->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);

+    if (!empty($conf->product->enabled)) {
+            $upload_dir = $conf->product->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);
+    } elseif (!empty($conf->service->enabled)) {
+            $upload_dir = $conf->service->multidir_output[$object->entity] . '/' . get_exdir(0, 0, 0, 0, $object, 'product') . dol_sanitizeFileName($object->ref);
+    }
 

     if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {    // For backward compatiblity, we scan also old dirs

-        if (!empty($conf->product->enabled))

-            $upload_dirold = $conf->product->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

-        else

-            $upload_dirold = $conf->service->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";

+        if (!empty($conf->product->enabled)) {
+                    $upload_dirold = $conf->product->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";
+        } else {
+                    $upload_dirold = $conf->service->multidir_output[$object->entity] . '/' . substr(substr("000" . $object->id, -2), 1, 1) . '/' . substr(substr("000" . $object->id, -2), 0, 1) . '/' . $object->id . "/photos";
+        }
     }

 }

 

@@ -148,20 +150,23 @@ 
  * Actions

  */

 

-if ($cancel)

-    $action = '';

+if ($cancel) {
+    $action = '';
+}
 

 $usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));

 $usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));

 $usercandelete = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer));

 $createbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance))

-    $createbarcode = 0;

+if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->creer_advance)) {
+    $createbarcode = 0;
+}
 

 $parameters = array('id' => $id, 'ref' => $ref, 'objcanvas' => $objcanvas);

 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

-if ($reshook < 0)

-    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 

 if (empty($reshook)) {

     // Type

@@ -195,14 +200,15 @@ 
             exit;

         } else {

             $langs->load("errors");

-            if ($result == -1)

-                $errors[] = 'ErrorBadBarCodeSyntax';

-            else if ($result == -2)

-                $errors[] = 'ErrorBarCodeRequired';

-            else if ($result == -3)

-                $errors[] = 'ErrorBarCodeAlreadyUsed';

-            else

-                $errors[] = 'FailedToValidateBarCode';

+            if ($result == -1) {
+                            $errors[] = 'ErrorBadBarCodeSyntax';
+            } else if ($result == -2) {
+                            $errors[] = 'ErrorBarCodeRequired';
+            } else if ($result == -3) {
+                            $errors[] = 'ErrorBarCodeAlreadyUsed';
+            } else {
+                            $errors[] = 'FailedToValidateBarCode';
+            }
 

             $error++;

             setEventMessages($errors, null, 'errors');

@@ -236,14 +242,16 @@ 
             $object->label = GETPOST('label');

             $object->price_base_type = GETPOST('price_base_type');

 

-            if ($object->price_base_type == 'TTC')

-                $object->price_ttc = GETPOST('price');

-            else

-                $object->price = GETPOST('price');

-            if ($object->price_base_type == 'TTC')

-                $object->price_min_ttc = GETPOST('price_min');

-            else

-                $object->price_min = GETPOST('price_min');

+            if ($object->price_base_type == 'TTC') {
+                            $object->price_ttc = GETPOST('price');
+            } else {
+                            $object->price = GETPOST('price');
+            }
+            if ($object->price_base_type == 'TTC') {
+                            $object->price_min_ttc = GETPOST('price_min');
+            } else {
+                            $object->price_min = GETPOST('price_min');
+            }
 

             $tva_tx_txt = GETPOST('tva_tx', 'alpha');           // tva_tx can be '8.5'  or  '8.5*'  or  '8.5 (XXX)' or '8.5* (XXX)'

             // We must define tva_tx, npr and local taxes

@@ -369,8 +377,9 @@ 
 

             // Fill array 'array_options' with data from add form

             $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-            if ($ret < 0)

-                $error++;

+            if ($ret < 0) {
+                            $error++;
+            }
 

             if (!$error) {

                 $id = $object->create($user);

@@ -384,10 +393,11 @@ 
                 header("Location: " . $_SERVER['PHP_SELF'] . "?id=" . $id);

                 exit;

             } else {

-                if (count($object->errors))

-                    setEventMessages($object->error, $object->errors, 'errors');

-                else

-                    setEventMessages($langs->trans($object->error), null, 'errors');

+                if (count($object->errors)) {
+                                    setEventMessages($object->error, $object->errors, 'errors');
+                } else {
+                                    setEventMessages($langs->trans($object->error), null, 'errors');
+                }
                 $action = "create";

             }

         }

@@ -489,8 +499,9 @@ 
 

                 // Fill array 'array_options' with data from add form

                 $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-                if ($ret < 0)

-                    $error++;

+                if ($ret < 0) {
+                                    $error++;
+                }
 

                 if (!$error && $object->check()) {

                     if ($object->update($object->id, $user) > 0) {

@@ -500,18 +511,19 @@ 
 

                         $action = 'view';

                     } else {

-                        if (count($object->errors))

-                            setEventMessages($object->error, $object->errors, 'errors');

-                        else

-                            setEventMessages($langs->trans($object->error), null, 'errors');

+                        if (count($object->errors)) {
+                                                    setEventMessages($object->error, $object->errors, 'errors');
+                        } else {
+                                                    setEventMessages($langs->trans($object->error), null, 'errors');
+                        }
                         $action = 'edit';

                     }

-                }

-                else {

-                    if (count($object->errors))

-                        setEventMessages($object->error, $object->errors, 'errors');

-                    else

-                        setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');

+                } else {

+                    if (count($object->errors)) {
+                                            setEventMessages($object->error, $object->errors, 'errors');
+                    } else {
+                                            setEventMessages($langs->trans("ErrorProductBadRefOrLabel"), null, 'errors');
+                    }
                     $action = 'edit';

                 }

             }

@@ -648,8 +660,9 @@ 
 

             $tva_tx = get_default_tva($mysoc, $soc, $object->id);

             $tva_npr = get_default_npr($mysoc, $soc, $object->id);

-            if (empty($tva_tx))

-                $tva_npr = 0;

+            if (empty($tva_tx)) {
+                            $tva_npr = 0;
+            }
             $localtax1_tx = get_localtax($tva_tx, 1, $soc, $mysoc, $tva_npr);

             $localtax2_tx = get_localtax($tva_tx, 2, $soc, $mysoc, $tva_npr);

 

@@ -783,8 +796,9 @@ 
 $form = new Form($db);

 $formfile = new FormFile($db);

 $formproduct = new FormProduct($db);

-if (!empty($conf->accounting->enabled))

-    $formaccounting = new FormAccounting($db);

+if (!empty($conf->accounting->enabled)) {
+    $formaccounting = new FormAccounting($db);
+}
 

 // Load object modBarCodeProduct

 $res = 0;

@@ -793,8 +807,9 @@ 
     $dirbarcode = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);

     foreach ($dirbarcode as $dirroot) {

         $res = dol_include_once($dirroot . $module . '.php');

-        if ($res)

-            break;

+        if ($res) {
+                    break;
+        }
     }

     if ($res > 0) {

         $modBarCodeProduct = new $module();

@@ -809,13 +824,13 @@ 
     if (empty($object->error) && $id) {

         $object = new Product($db);

         $result = $object->fetch($id);

-        if ($result <= 0)

-            dol_print_error('', $object->error);

+        if ($result <= 0) {
+                    dol_print_error('', $object->error);
+        }
     }

     $objcanvas->assign_values($action, $object->id, $object->ref); // Set value for templates

     $objcanvas->display_canvas($action);       // Show template

-}

-else {

+} else {

     // -----------------------------------------

     // When used in standard mode

     // -----------------------------------------

@@ -865,8 +880,9 @@ 
 

         print '<tr>';

         $tmpcode = '';

-        if (!empty($modCodeProduct->code_auto))

-            $tmpcode = $modCodeProduct->getNextValue($object, $type);

+        if (!empty($modCodeProduct->code_auto)) {
+                    $tmpcode = $modCodeProduct->getNextValue($object, $type);
+        }
         print '<td class="titlefieldcreate fieldrequired">' . $langs->trans("Ref") . '</td><td colspan="3"><input id="ref" name="ref" class="maxwidth200" maxlength="128" value="' . dol_escape_htmltag(GETPOST('ref') ? GETPOST('ref') : $tmpcode) . '">';

         if ($refalreadyexists) {

             print $langs->trans("RefAlreadyExists");

@@ -897,24 +913,27 @@ 
         }

 

         $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-            $showbarcode = 0;

+        if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                    $showbarcode = 0;
+        }
 

         if ($showbarcode) {

             print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

             if (isset($_POST['fk_barcode_type'])) {

                 $fk_barcode_type = GETPOST('fk_barcode_type');

             } else {

-                if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

-                    $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+                if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+                                    $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+                }
             }

             require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

             $formbarcode = new FormBarCode($db);

             print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

             print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

             $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-            if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+            if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                            $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+            }
             print '<input class="maxwidth100" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

             print '</td></tr>';

         }

@@ -1016,8 +1035,9 @@ 
             // Origin country

             print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

             print $form->select_country(GETPOST('country_id', 'int'), 'country_id');

-            if ($user->admin)

-                print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+            if ($user->admin) {
+                            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+            }
             print '</td></tr>';

         }

 

@@ -1167,8 +1187,9 @@ 
             require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

 

             $type = $langs->trans('Product');

-            if ($object->isService())

-                $type = $langs->trans('Service');

+            if ($object->isService()) {
+                            $type = $langs->trans('Service');
+            }
             //print load_fiche_titre($langs->trans('Modify').' '.$type.' : '.(is_object($object->oldcopy)?$object->oldcopy->ref:$object->ref), "");

             // Main official, simple, and not duplicated code

             // print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">'."\n";

@@ -1229,8 +1250,9 @@ 
 

             // Barcode

             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-                $showbarcode = 0;

+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                            $showbarcode = 0;
+            }
 

             if ($showbarcode) {

                 print '<tr><td>' . $langs->trans('BarcodeType') . '</td><td>';

@@ -1238,16 +1260,18 @@ 
                     $fk_barcode_type = GETPOST('fk_barcode_type');

                 } else {

                     $fk_barcode_type = $object->barcode_type;

-                    if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE))

-                        $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;

+                    if (empty($fk_barcode_type) && !empty($conf->global->PRODUIT_DEFAULT_BARCODE_TYPE)) {
+                                            $fk_barcode_type = $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE;
+                    }
                 }

                 require_once DOL_DOCUMENT_ROOT . '/core/class/html.formbarcode.class.php';

                 $formbarcode = new FormBarCode($db);

                 print $formbarcode->selectBarcodeType($fk_barcode_type, 'fk_barcode_type', 1);

                 print '</td><td>' . $langs->trans("BarcodeValue") . '</td><td>';

                 $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-                if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                    $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+                if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                                    $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+                }
                 print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . dol_escape_htmltag($tmpcode) . '">';

                 print '</td></tr>';

             }

@@ -1359,8 +1383,9 @@ 
                 // Origin country

                 print '<td>' . $langs->trans("CountryOrigin") . '</td><td>';

                 print $form->select_country($object->country_id, 'country_id', '', 0, 'minwidth100 maxwidthonsmartphone');

-                if ($user->admin)

-                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if ($user->admin) {
+                                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                }
                 print '</td></tr>';

             }

 

@@ -1470,8 +1495,9 @@ 
         // Fiche en mode visu

         else {

             $showbarcode = empty($conf->barcode->enabled) ? 0 : 1;

-            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-                $showbarcode = 0;

+            if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+                            $showbarcode = 0;
+            }
 

             $head = product_prepare_head($object);

             $titre = $langs->trans("CardProduct" . $object->type);

@@ -1483,8 +1509,9 @@ 
             $object->next_prev_filter = " fk_product_type = " . $object->type;

 

             $shownav = 1;

-            if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL)))

-                $shownav = 0;

+            if ($user->societe_id && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+                            $shownav = 0;
+            }
 

             dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');

 

@@ -1510,8 +1537,9 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';

                 print $langs->trans("BarcodeType");

                 print '</td>';

-                if (($action != 'editbarcodetype') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcodetype&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                if (($action != 'editbarcodetype') && $usercancreate && $createbarcode) {
+                                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcodetype&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+                }
                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcodetype' || $action == 'editbarcode') {

@@ -1531,14 +1559,16 @@ 
                 print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';

                 print $langs->trans("BarcodeValue");

                 print '</td>';

-                if (($action != 'editbarcode') && $usercancreate && $createbarcode)

-                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcode&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';

+                if (($action != 'editbarcode') && $usercancreate && $createbarcode) {
+                                    print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editbarcode&amp;id=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+                }
                 print '</tr></table>';

                 print '</td><td colspan="2">';

                 if ($action == 'editbarcode') {

                     $tmpcode = isset($_POST['barcode']) ? GETPOST('barcode') : $object->barcode;

-                    if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto))

-                        $tmpcode = $modBarCodeProduct->getNextValue($object, $type);

+                    if (empty($tmpcode) && !empty($modBarCodeProduct->code_auto)) {
+                                            $tmpcode = $modBarCodeProduct->getNextValue($object, $type);
+                    }
 

                     // print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'">';

                     print '<form method="POST" href="' . BASE_URI . '?controller=product&method=card&id=' . $object->id . '">';

@@ -1548,8 +1578,7 @@ 
                     print '<input size="40" class="maxwidthonsmartphone" type="text" name="barcode" value="' . $tmpcode . '">';

                     print '&nbsp;<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

                     print '</form>';

-                }

-                else {

+                } else {

                     print $object->barcode;

                 }

                 print '</td></tr>' . "\n";

@@ -1709,13 +1738,14 @@ 
                     print '<tr><td>' . $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . '</td><td colspan="2">';

                     if ($object->length != '' || $object->width != '' || $object->height != '') {

                         print $object->length;

-                        if ($object->width)

-                            print " x " . $object->width;

-                        if ($object->height)

-                            print " x " . $object->height;

+                        if ($object->width) {
+                                                    print " x " . $object->width;
+                        }
+                        if ($object->height) {
+                                                    print " x " . $object->height;
+                        }
                         print ' ' . measuring_units_string($object->length_units, "size");

-                    }

-                    else {

+                    } else {

                         print '&nbsp;';

                     }

                     print "</td></tr>\n";

@@ -1803,8 +1833,9 @@ 
 }

 

 $tmpcode = '';

-if (!empty($modCodeProduct->code_auto))

-    $tmpcode = $modCodeProduct->getNextValue($object, $object->type);

+if (!empty($modCodeProduct->code_auto)) {
+    $tmpcode = $modCodeProduct->getNextValue($object, $object->type);
+}
 

 // Define confirmation messages

 $formquestionclone = array(

@@ -1842,8 +1873,9 @@ 
     $reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

     if (empty($reshook)) {

         if ($usercancreate) {

-            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1)

-                print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&amp;id=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';

+            if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) {
+                            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=edit&amp;id=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';
+            }
 

             if (!isset($object->no_button_copy) || $object->no_button_copy <> 1) {

                 if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {

dolibarr/htdocs/product/class/product.class.php

Spacing +561 added lines, -561 removed lines

@@ -34,9 +34,9 @@ 
  *    \ingroup    produit

  *    \brief      File of class to manage predefined products or services

  */

-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';

-require_once DOL_DOCUMENT_ROOT . '/product/class/productbatch.class.php';

-require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';

+require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';

+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

 

 /**

  * Class to manage products or services

@@ -58,7 +58,7 @@ 
      * @var int Field with ID of parent key if this field has a parent

      */

     public $fk_element = 'fk_product';

-    protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet');    // To test if we can delete object

+    protected $childtables = array('supplier_proposaldet', 'propaldet', 'commandedet', 'facturedet', 'contratdet', 'facture_fourn_det', 'commande_fournisseurdet'); // To test if we can delete object

 

     /**

      * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe

@@ -105,7 +105,7 @@ 
      *

      * @var float

      */

-    public $price;            // Price net

+    public $price; // Price net

 

     /**

      * Price with tax

@@ -505,7 +505,7 @@ 
                 if (substr($module, 0, 16) == 'mod_codeproduct_' && substr($module, -3) == 'php') {

                     $module = substr($module, 0, dol_strlen($module) - 4);

                 }

-                dol_include_once('/core/modules/product/' . $module . '.php');

+                dol_include_once('/core/modules/product/'.$module.'.php');

                 $modCodeProduct = new $module;

                 if (!empty($modCodeProduct->code_auto)) {

                     $this->ref = $modCodeProduct->getNextValue($this, $this->type);

@@ -519,7 +519,7 @@ 
             }

         }

 

-        dol_syslog(get_class($this) . "::create ref=" . $this->ref . " price=" . $this->price . " price_ttc=" . $this->price_ttc . " tva_tx=" . $this->tva_tx . " price_base_type=" . $this->price_base_type, LOG_DEBUG);

+        dol_syslog(get_class($this)."::create ref=".$this->ref." price=".$this->price." price_ttc=".$this->price_ttc." tva_tx=".$this->tva_tx." price_base_type=".$this->price_base_type, LOG_DEBUG);

 

         $now = dol_now();

 

@@ -536,16 +536,16 @@ 
 

         if ($result >= 0) {

             $sql = "SELECT count(*) as nb";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "product";

-            $sql .= " WHERE entity IN (" . getEntity('product') . ")";

-            $sql .= " AND ref = '" . $this->db->escape($this->ref) . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."product";

+            $sql .= " WHERE entity IN (".getEntity('product').")";

+            $sql .= " AND ref = '".$this->db->escape($this->ref)."'";

 

             $result = $this->db->query($sql);

             if ($result) {

                 $obj = $this->db->fetch_object($result);

                 if ($obj->nb == 0) {

                     // Produit non deja existant

-                    $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product (";

+                    $sql = "INSERT INTO ".MAIN_DB_PREFIX."product (";

                     $sql .= "datec";

                     $sql .= ", entity";

                     $sql .= ", ref";

@@ -569,34 +569,34 @@ 
                     $sql .= ", tobatch";

                     $sql .= ", fk_unit";

                     $sql .= ") VALUES (";

-                    $sql .= "'" . $this->db->idate($now) . "'";

-                    $sql .= ", " . $conf->entity;

-                    $sql .= ", '" . $this->db->escape($this->ref) . "'";

-                    $sql .= ", " . (!empty($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : "null");

-                    $sql .= ", " . price2num($price_min_ht);

-                    $sql .= ", " . price2num($price_min_ttc);

-                    $sql .= ", " . (!empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : "null");

-                    $sql .= ", " . $user->id;

-                    $sql .= ", " . $this->type;

-                    $sql .= ", " . price2num($price_ht);

-                    $sql .= ", " . price2num($price_ttc);

-                    $sql .= ", '" . $this->db->escape($this->price_base_type) . "'";

-                    $sql .= ", " . $this->status;

-                    $sql .= ", " . $this->status_buy;

-                    $sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";

-                    $sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";

-                    $sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";

-                    $sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";

-                    $sql .= ", '" . $this->db->escape($this->canvas) . "'";

-                    $sql .= ", " . ((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);

-                    $sql .= ", " . ((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);

-                    $sql .= ", " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);

+                    $sql .= "'".$this->db->idate($now)."'";

+                    $sql .= ", ".$conf->entity;

+                    $sql .= ", '".$this->db->escape($this->ref)."'";

+                    $sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");

+                    $sql .= ", ".price2num($price_min_ht);

+                    $sql .= ", ".price2num($price_min_ttc);

+                    $sql .= ", ".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");

+                    $sql .= ", ".$user->id;

+                    $sql .= ", ".$this->type;

+                    $sql .= ", ".price2num($price_ht);

+                    $sql .= ", ".price2num($price_ttc);

+                    $sql .= ", '".$this->db->escape($this->price_base_type)."'";

+                    $sql .= ", ".$this->status;

+                    $sql .= ", ".$this->status_buy;

+                    $sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";

+                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";

+                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";

+                    $sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";

+                    $sql .= ", '".$this->db->escape($this->canvas)."'";

+                    $sql .= ", ".((!isset($this->finished) || $this->finished < 0 || $this->finished == '') ? 'null' : (int) $this->finished);

+                    $sql .= ", ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);

+                    $sql .= ", ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);

                     $sql .= ")";

 

-                    dol_syslog(get_class($this) . "::Create", LOG_DEBUG);

+                    dol_syslog(get_class($this)."::Create", LOG_DEBUG);

                     $result = $this->db->query($sql);

                     if ($result) {

-                        $id = $this->db->last_insert_id(MAIN_DB_PREFIX . "product");

+                        $id = $this->db->last_insert_id(MAIN_DB_PREFIX."product");

 

                         if ($id > 0) {

                             $this->id = $id;

@@ -651,7 +651,7 @@ 
             }

         } else {

             $this->db->rollback();

-            dol_syslog(get_class($this) . "::Create fails verify " . join(',', $this->errors), LOG_WARNING);

+            dol_syslog(get_class($this)."::Create fails verify ".join(',', $this->errors), LOG_WARNING);

             return -3;

         }

     }

@@ -711,7 +711,7 @@ 
 

             $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);

             foreach ($dirsociete as $dirroot) {

-                $res = dol_include_once($dirroot . $module . '.php');

+                $res = dol_include_once($dirroot.$module.'.php');

                 if ($res) {

                     break;

                 }

@@ -719,7 +719,7 @@ 
 

             $mod = new $module();

 

-            dol_syslog(get_class($this) . "::check_barcode value=" . $valuetotest . " type=" . $typefortest . " module=" . $module);

+            dol_syslog(get_class($this)."::check_barcode value=".$valuetotest." type=".$typefortest." module=".$module);

             $result = $mod->verif($this->db, $valuetotest, $this, 0, $typefortest);

             return $result;

         } else {

@@ -763,10 +763,10 @@ 
         $this->height_units = trim($this->height_units);

         // set unit not defined

         if ($this->length_units) {

-            $this->width_units = $this->length_units;    // Not used yet

+            $this->width_units = $this->length_units; // Not used yet

         }

         if ($this->length_units) {

-            $this->height_units = $this->length_units;    // Not used yet

+            $this->height_units = $this->length_units; // Not used yet

         }

         // Automated compute surface and volume if not filled

         if (empty($this->surface) && !empty($this->length) && !empty($this->width) && $this->length_units == $this->width_units) {

@@ -825,7 +825,7 @@ 
         // Check name is required and codes are ok or unique.

         // If error, this->errors[] is filled

         if ($action != 'add') {

-            $result = $this->verify();    // We don't check when update called during a create because verify was already done

+            $result = $this->verify(); // We don't check when update called during a create because verify was already done

         }

 

         if ($result >= 0) {

@@ -841,7 +841,7 @@ 
                 //$valueforundefinedlot = 'Undefined';  // In previous version, 39 and lower

                 $valueforundefinedlot = '000000';

 

-                dol_syslog("Flag batch of product id=" . $this->id . " is set to ON, so we will create missing records into product_batch");

+                dol_syslog("Flag batch of product id=".$this->id." is set to ON, so we will create missing records into product_batch");

 

                 $this->load_stock();

                 foreach ($this->stock_warehouse as $idW => $ObjW) {   // For each warehouse where we have stocks defined for this product (for each lines in product_stock)

@@ -849,7 +849,7 @@ 
                     foreach ($ObjW->detail_batch as $detail) {    // Each lines of detail in product_batch of the current $ObjW = product_stock

                         if ($detail->batch == $valueforundefinedlot || $detail->batch == 'Undefined') {

                             // We discard this line, we will create it later

-                            $sqlclean = "DELETE FROM " . MAIN_DB_PREFIX . "product_batch WHERE batch in('Undefined', '" . $valueforundefinedlot . "') AND fk_product_stock = " . $ObjW->id;

+                            $sqlclean = "DELETE FROM ".MAIN_DB_PREFIX."product_batch WHERE batch in('Undefined', '".$valueforundefinedlot."') AND fk_product_stock = ".$ObjW->id;

                             $result = $this->db->query($sqlclean);

                             if (!$result) {

                                 dol_print_error($this->db);

@@ -881,59 +881,59 @@ 
                 $this->barcode = $this->get_barcode($this, $this->barcode_type_code);

             }

 

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "product";

-            $sql .= " SET label = '" . $this->db->escape($this->label) . "'";

-            $sql .= ", ref = '" . $this->db->escape($this->ref) . "'";

-            $sql .= ", ref_ext = " . (!empty($this->ref_ext) ? "'" . $this->db->escape($this->ref_ext) . "'" : "null");

-            $sql .= ", default_vat_code = " . ($this->default_vat_code ? "'" . $this->db->escape($this->default_vat_code) . "'" : "null");

-            $sql .= ", tva_tx = " . $this->tva_tx;

-            $sql .= ", recuperableonly = " . $this->tva_npr;

-            $sql .= ", localtax1_tx = " . $this->localtax1_tx;

-            $sql .= ", localtax2_tx = " . $this->localtax2_tx;

-            $sql .= ", localtax1_type = " . ($this->localtax1_type != '' ? "'" . $this->db->escape($this->localtax1_type) . "'" : "'0'");

-            $sql .= ", localtax2_type = " . ($this->localtax2_type != '' ? "'" . $this->db->escape($this->localtax2_type) . "'" : "'0'");

-

-            $sql .= ", barcode = " . (empty($this->barcode) ? "null" : "'" . $this->db->escape($this->barcode) . "'");

-            $sql .= ", fk_barcode_type = " . (empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));

-

-            $sql .= ", tosell = " . $this->status;

-            $sql .= ", tobuy = " . $this->status_buy;

-            $sql .= ", tobatch = " . ((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);

-            $sql .= ", finished = " . ((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);

-            $sql .= ", weight = " . ($this->weight != '' ? "'" . $this->db->escape($this->weight) . "'" : 'null');

-            $sql .= ", weight_units = " . ($this->weight_units != '' ? "'" . $this->db->escape($this->weight_units) . "'" : 'null');

-            $sql .= ", length = " . ($this->length != '' ? "'" . $this->db->escape($this->length) . "'" : 'null');

-            $sql .= ", length_units = " . ($this->length_units != '' ? "'" . $this->db->escape($this->length_units) . "'" : 'null');

-            $sql .= ", width= " . ($this->width != '' ? "'" . $this->db->escape($this->width) . "'" : 'null');

-            $sql .= ", width_units = " . ($this->width_units != '' ? "'" . $this->db->escape($this->width_units) . "'" : 'null');

-            $sql .= ", height = " . ($this->height != '' ? "'" . $this->db->escape($this->height) . "'" : 'null');

-            $sql .= ", height_units = " . ($this->height_units != '' ? "'" . $this->db->escape($this->height_units) . "'" : 'null');

-            $sql .= ", surface = " . ($this->surface != '' ? "'" . $this->db->escape($this->surface) . "'" : 'null');

-            $sql .= ", surface_units = " . ($this->surface_units != '' ? "'" . $this->db->escape($this->surface_units) . "'" : 'null');

-            $sql .= ", volume = " . ($this->volume != '' ? "'" . $this->db->escape($this->volume) . "'" : 'null');

-            $sql .= ", volume_units = " . ($this->volume_units != '' ? "'" . $this->db->escape($this->volume_units) . "'" : 'null');

-            $sql .= ", fk_default_warehouse = " . ($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');

-            $sql .= ", seuil_stock_alerte = " . ((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'" . $this->db->escape($this->seuil_stock_alerte) . "'" : "null");

-            $sql .= ", description = '" . $this->db->escape($this->description) . "'";

-            $sql .= ", url = " . ($this->url ? "'" . $this->db->escape($this->url) . "'" : 'null');

-            $sql .= ", customcode = '" . $this->db->escape($this->customcode) . "'";

-            $sql .= ", fk_country = " . ($this->country_id > 0 ? $this->country_id : 'null');

-            $sql .= ", note = " . (isset($this->note) ? "'" . $this->db->escape($this->note) . "'" : 'null');

-            $sql .= ", duration = '" . $this->db->escape($this->duration_value . $this->duration_unit) . "'";

-            $sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";

-            $sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";

-            $sql .= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";

-            $sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";

-            $sql .= ", desiredstock = " . ((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");

-            $sql .= ", cost_price = " . ($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');

-            $sql .= ", fk_unit= " . (!$this->fk_unit ? 'NULL' : $this->fk_unit);

-            $sql .= ", price_autogen = " . (!$this->price_autogen ? 0 : 1);

-            $sql .= ", fk_price_expression = " . ($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');

-            $sql .= ", fk_user_modif = " . ($user->id > 0 ? $user->id : 'NULL');

+            $sql = "UPDATE ".MAIN_DB_PREFIX."product";

+            $sql .= " SET label = '".$this->db->escape($this->label)."'";

+            $sql .= ", ref = '".$this->db->escape($this->ref)."'";

+            $sql .= ", ref_ext = ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");

+            $sql .= ", default_vat_code = ".($this->default_vat_code ? "'".$this->db->escape($this->default_vat_code)."'" : "null");

+            $sql .= ", tva_tx = ".$this->tva_tx;

+            $sql .= ", recuperableonly = ".$this->tva_npr;

+            $sql .= ", localtax1_tx = ".$this->localtax1_tx;

+            $sql .= ", localtax2_tx = ".$this->localtax2_tx;

+            $sql .= ", localtax1_type = ".($this->localtax1_type != '' ? "'".$this->db->escape($this->localtax1_type)."'" : "'0'");

+            $sql .= ", localtax2_type = ".($this->localtax2_type != '' ? "'".$this->db->escape($this->localtax2_type)."'" : "'0'");

+

+            $sql .= ", barcode = ".(empty($this->barcode) ? "null" : "'".$this->db->escape($this->barcode)."'");

+            $sql .= ", fk_barcode_type = ".(empty($this->barcode_type) ? "null" : $this->db->escape($this->barcode_type));

+

+            $sql .= ", tosell = ".$this->status;

+            $sql .= ", tobuy = ".$this->status_buy;

+            $sql .= ", tobatch = ".((empty($this->status_batch) || $this->status_batch < 0) ? '0' : $this->status_batch);

+            $sql .= ", finished = ".((!isset($this->finished) || $this->finished < 0) ? "null" : (int) $this->finished);

+            $sql .= ", weight = ".($this->weight != '' ? "'".$this->db->escape($this->weight)."'" : 'null');

+            $sql .= ", weight_units = ".($this->weight_units != '' ? "'".$this->db->escape($this->weight_units)."'" : 'null');

+            $sql .= ", length = ".($this->length != '' ? "'".$this->db->escape($this->length)."'" : 'null');

+            $sql .= ", length_units = ".($this->length_units != '' ? "'".$this->db->escape($this->length_units)."'" : 'null');

+            $sql .= ", width= ".($this->width != '' ? "'".$this->db->escape($this->width)."'" : 'null');

+            $sql .= ", width_units = ".($this->width_units != '' ? "'".$this->db->escape($this->width_units)."'" : 'null');

+            $sql .= ", height = ".($this->height != '' ? "'".$this->db->escape($this->height)."'" : 'null');

+            $sql .= ", height_units = ".($this->height_units != '' ? "'".$this->db->escape($this->height_units)."'" : 'null');

+            $sql .= ", surface = ".($this->surface != '' ? "'".$this->db->escape($this->surface)."'" : 'null');

+            $sql .= ", surface_units = ".($this->surface_units != '' ? "'".$this->db->escape($this->surface_units)."'" : 'null');

+            $sql .= ", volume = ".($this->volume != '' ? "'".$this->db->escape($this->volume)."'" : 'null');

+            $sql .= ", volume_units = ".($this->volume_units != '' ? "'".$this->db->escape($this->volume_units)."'" : 'null');

+            $sql .= ", fk_default_warehouse = ".($this->fk_default_warehouse > 0 ? $this->db->escape($this->fk_default_warehouse) : 'null');

+            $sql .= ", seuil_stock_alerte = ".((isset($this->seuil_stock_alerte) && $this->seuil_stock_alerte != '') ? "'".$this->db->escape($this->seuil_stock_alerte)."'" : "null");

+            $sql .= ", description = '".$this->db->escape($this->description)."'";

+            $sql .= ", url = ".($this->url ? "'".$this->db->escape($this->url)."'" : 'null');

+            $sql .= ", customcode = '".$this->db->escape($this->customcode)."'";

+            $sql .= ", fk_country = ".($this->country_id > 0 ? $this->country_id : 'null');

+            $sql .= ", note = ".(isset($this->note) ? "'".$this->db->escape($this->note)."'" : 'null');

+            $sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";

+            $sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";

+            $sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";

+            $sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";

+            $sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";

+            $sql .= ", desiredstock = ".((isset($this->desiredstock) && $this->desiredstock != '') ? $this->desiredstock : "null");

+            $sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');

+            $sql .= ", fk_unit= ".(!$this->fk_unit ? 'NULL' : $this->fk_unit);

+            $sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);

+            $sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? $this->fk_price_expression : 'NULL');

+            $sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');

             // stock field is not here because it is a denormalized value from product_stock.

-            $sql .= " WHERE rowid = " . $id;

+            $sql .= " WHERE rowid = ".$id;

 

-            dol_syslog(get_class($this) . "::update", LOG_DEBUG);

+            dol_syslog(get_class($this)."::update", LOG_DEBUG);

 

             $resql = $this->db->query($sql);

             if ($resql) {

@@ -942,7 +942,7 @@ 
                 // Multilangs

                 if (!empty($conf->global->MAIN_MULTILANGS)) {

                     if ($this->setMultiLangs($user) < 0) {

-                        $this->error = $langs->trans("Error") . " : " . $this->db->error() . " - " . $sql;

+                        $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;

                         return -2;

                     }

                 }

@@ -969,8 +969,8 @@ 
                 if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {

                     // We remove directory

                     if ($conf->product->dir_output) {

-                        $olddir = $conf->product->dir_output . "/" . dol_sanitizeFileName($this->oldcopy->ref);

-                        $newdir = $conf->product->dir_output . "/" . dol_sanitizeFileName($this->ref);

+                        $olddir = $conf->product->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);

+                        $newdir = $conf->product->dir_output."/".dol_sanitizeFileName($this->ref);

                         if (file_exists($olddir)) {

                             //include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

                             //$res = dol_move($olddir, $newdir);

@@ -988,7 +988,7 @@ 
                 if (!$error) {

                     if ($conf->variants->enabled) {

 

-                        include_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';

+                        include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';

 

                         $comb = new ProductCombination($this->db);

 

@@ -1007,15 +1007,15 @@ 
                 if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {

                     $langs->load("errors");

                     if (empty($conf->barcode->enabled) || empty($this->barcode)) {

-                        $this->error = $langs->trans("Error") . " : " . $langs->trans("ErrorProductAlreadyExists", $this->ref);

+                        $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductAlreadyExists", $this->ref);

                     } else {

-                        $this->error = $langs->trans("Error") . " : " . $langs->trans("ErrorProductBarCodeAlreadyExists", $this->barcode);

+                        $this->error = $langs->trans("Error")." : ".$langs->trans("ErrorProductBarCodeAlreadyExists", $this->barcode);

                     }

                     $this->errors[] = $this->error;

                     $this->db->rollback();

                     return -1;

                 } else {

-                    $this->error = $langs->trans("Error") . " : " . $this->db->error() . " - " . $sql;

+                    $this->error = $langs->trans("Error")." : ".$this->db->error()." - ".$sql;

                     $this->errors[] = $this->error;

                     $this->db->rollback();

                     return -2;

@@ -1023,7 +1023,7 @@ 
             }

         } else {

             $this->db->rollback();

-            dol_syslog(get_class($this) . "::Update fails verify " . join(',', $this->errors), LOG_WARNING);

+            dol_syslog(get_class($this)."::Update fails verify ".join(',', $this->errors), LOG_WARNING);

             return -3;

         }

     }

@@ -1039,11 +1039,11 @@ 
     {

         // Deprecation warning

         if ($id > 0) {

-            dol_syslog(__METHOD__ . " with parameter is deprecated", LOG_WARNING);

+            dol_syslog(__METHOD__." with parameter is deprecated", LOG_WARNING);

         }

 

         global $conf, $langs;

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

         $error = 0;

 

@@ -1079,10 +1079,10 @@ 
 

             // Delete from product_batch on product delete

             if (!$error) {

-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . 'product_batch';

+                $sql = "DELETE FROM ".MAIN_DB_PREFIX.'product_batch';

                 $sql .= " WHERE fk_product_stock IN (";

-                $sql .= "SELECT rowid FROM " . MAIN_DB_PREFIX . 'product_stock';

-                $sql .= " WHERE fk_product = " . $id . ")";

+                $sql .= "SELECT rowid FROM ".MAIN_DB_PREFIX.'product_stock';

+                $sql .= " WHERE fk_product = ".$id.")";

 

                 $result = $this->db->query($sql);

                 if (!$result) {

@@ -1093,11 +1093,11 @@ 
 

             // Delete all child tables

             if (!$error) {

-                $elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot');  // product_batch is done before

+                $elements = array('product_fournisseur_price', 'product_price', 'product_lang', 'categorie_product', 'product_stock', 'product_customer_price', 'product_lot'); // product_batch is done before

                 foreach ($elements as $table) {

                     if (!$error) {

-                        $sql = "DELETE FROM " . MAIN_DB_PREFIX . $table;

-                        $sql .= " WHERE fk_product = " . $id;

+                        $sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;

+                        $sql .= " WHERE fk_product = ".$id;

 

                         $result = $this->db->query($sql);

                         if (!$result) {

@@ -1110,8 +1110,8 @@ 
 

             if (!$error) {

 

-                include_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination.class.php';

-                include_once DOL_DOCUMENT_ROOT . '/variants/class/ProductCombination2ValuePair.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination2ValuePair.class.php';

 

                 //If it is a parent product, then we remove the association with child products

                 $prodcomb = new ProductCombination($this->db);

@@ -1130,8 +1130,8 @@ 
 

             // Delete from product_association

             if (!$error) {

-                $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_association";

-                $sql .= " WHERE fk_product_pere = " . $id . " OR fk_product_fils = " . $id;

+                $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";

+                $sql .= " WHERE fk_product_pere = ".$id." OR fk_product_fils = ".$id;

 

                 $result = $this->db->query($sql);

                 if (!$result) {

@@ -1142,8 +1142,8 @@ 
 

             // Delete product

             if (!$error) {

-                $sqlz = "DELETE FROM " . MAIN_DB_PREFIX . "product";

-                $sqlz .= " WHERE rowid = " . $id;

+                $sqlz = "DELETE FROM ".MAIN_DB_PREFIX."product";

+                $sqlz .= " WHERE rowid = ".$id;

 

                 $resultz = $this->db->query($sqlz);

                 if (!$resultz) {

@@ -1156,7 +1156,7 @@ 
                 // We remove directory

                 $ref = dol_sanitizeFileName($this->ref);

                 if ($conf->product->dir_output) {

-                    $dir = $conf->product->dir_output . "/" . $ref;

+                    $dir = $conf->product->dir_output."/".$ref;

                     if (file_exists($dir)) {

                         $res = @dol_delete_dir_recursive($dir);

                         if (!$res) {

@@ -1172,7 +1172,7 @@ 
                 $result = $this->deleteExtraFields();

                 if ($result < 0) {

                     $error++;

-                    dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);

+                    dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);

                 }

             }

 

@@ -1181,8 +1181,8 @@ 
                 return 1;

             } else {

                 foreach ($this->errors as $errmsg) {

-                    dol_syslog(get_class($this) . "::delete " . $errmsg, LOG_ERR);

-                    $this->error .= ($this->error ? ', ' . $errmsg : $errmsg);

+                    dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);

+                    $this->error .= ($this->error ? ', '.$errmsg : $errmsg);

                 }

                 $this->db->rollback();

                 return -$error;

@@ -1209,66 +1209,66 @@ 
         foreach ($langs_available as $key => $value) {

             if ($key == $current_lang) {

                 $sql = "SELECT rowid";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "product_lang";

-                $sql .= " WHERE fk_product=" . $this->id;

-                $sql .= " AND lang='" . $key . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";

+                $sql .= " WHERE fk_product=".$this->id;

+                $sql .= " AND lang='".$key."'";

 

                 $result = $this->db->query($sql);

 

                 if ($this->db->num_rows($result)) { // if there is already a description line for this language

-                    $sql2 = "UPDATE " . MAIN_DB_PREFIX . "product_lang";

+                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";

                     $sql2 .= " SET ";

-                    $sql2 .= " label='" . $this->db->escape($this->label) . "',";

-                    $sql2 .= " description='" . $this->db->escape($this->description) . "'";

+                    $sql2 .= " label='".$this->db->escape($this->label)."',";

+                    $sql2 .= " description='".$this->db->escape($this->description)."'";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

-                        $sql2 .= ", note='" . $this->db->escape($this->other) . "'";

+                        $sql2 .= ", note='".$this->db->escape($this->other)."'";

                     }

-                    $sql2 .= " WHERE fk_product=" . $this->id . " AND lang='" . $this->db->escape($key) . "'";

+                    $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";

                 } else {

-                    $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "product_lang (fk_product, lang, label, description";

+                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

                         $sql2 .= ", note";

                     }

                     $sql2 .= ")";

-                    $sql2 .= " VALUES(" . $this->id . ",'" . $this->db->escape($key) . "','" . $this->db->escape($this->label) . "',";

-                    $sql2 .= " '" . $this->db->escape($this->description) . "'";

+                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->label)."',";

+                    $sql2 .= " '".$this->db->escape($this->description)."'";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

-                        $sql2 .= ", '" . $this->db->escape($this->other) . "'";

+                        $sql2 .= ", '".$this->db->escape($this->other)."'";

                     }

                     $sql2 .= ")";

                 }

-                dol_syslog(get_class($this) . '::setMultiLangs key = current_lang = ' . $key);

+                dol_syslog(get_class($this).'::setMultiLangs key = current_lang = '.$key);

                 if (!$this->db->query($sql2)) {

                     $this->error = $this->db->lasterror();

                     return -1;

                 }

             } else if (isset($this->multilangs[$key])) {

                 $sql = "SELECT rowid";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "product_lang";

-                $sql .= " WHERE fk_product=" . $this->id;

-                $sql .= " AND lang='" . $key . "'";

+                $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";

+                $sql .= " WHERE fk_product=".$this->id;

+                $sql .= " AND lang='".$key."'";

 

                 $result = $this->db->query($sql);

 

                 if ($this->db->num_rows($result)) { // if there is already a description line for this language

-                    $sql2 = "UPDATE " . MAIN_DB_PREFIX . "product_lang";

+                    $sql2 = "UPDATE ".MAIN_DB_PREFIX."product_lang";

                     $sql2 .= " SET ";

-                    $sql2 .= " label='" . $this->db->escape($this->multilangs["$key"]["label"]) . "',";

-                    $sql2 .= " description='" . $this->db->escape($this->multilangs["$key"]["description"]) . "'";

+                    $sql2 .= " label='".$this->db->escape($this->multilangs["$key"]["label"])."',";

+                    $sql2 .= " description='".$this->db->escape($this->multilangs["$key"]["description"])."'";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

-                        $sql2 .= ", note='" . $this->db->escape($this->multilangs["$key"]["other"]) . "'";

+                        $sql2 .= ", note='".$this->db->escape($this->multilangs["$key"]["other"])."'";

                     }

-                    $sql2 .= " WHERE fk_product=" . $this->id . " AND lang='" . $this->db->escape($key) . "'";

+                    $sql2 .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($key)."'";

                 } else {

-                    $sql2 = "INSERT INTO " . MAIN_DB_PREFIX . "product_lang (fk_product, lang, label, description";

+                    $sql2 = "INSERT INTO ".MAIN_DB_PREFIX."product_lang (fk_product, lang, label, description";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

                         $sql2 .= ", note";

                     }

                     $sql2 .= ")";

-                    $sql2 .= " VALUES(" . $this->id . ",'" . $this->db->escape($key) . "','" . $this->db->escape($this->multilangs["$key"]["label"]) . "',";

-                    $sql2 .= " '" . $this->db->escape($this->multilangs["$key"]["description"]) . "'";

+                    $sql2 .= " VALUES(".$this->id.",'".$this->db->escape($key)."','".$this->db->escape($this->multilangs["$key"]["label"])."',";

+                    $sql2 .= " '".$this->db->escape($this->multilangs["$key"]["description"])."'";

                     if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {

-                        $sql2 .= ", '" . $this->db->escape($this->multilangs["$key"]["other"]) . "'";

+                        $sql2 .= ", '".$this->db->escape($this->multilangs["$key"]["other"])."'";

                     }

                     $sql2 .= ")";

                 }

@@ -1306,24 +1306,24 @@ 
      */

     function delMultiLangs($langtodelete, $user)

     {

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_lang";

-        $sql .= " WHERE fk_product=" . $this->id . " AND lang='" . $this->db->escape($langtodelete) . "'";

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_lang";

+        $sql .= " WHERE fk_product=".$this->id." AND lang='".$this->db->escape($langtodelete)."'";

 

-        dol_syslog(get_class($this) . '::delMultiLangs', LOG_DEBUG);

+        dol_syslog(get_class($this).'::delMultiLangs', LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             // Call trigger

             $result = $this->call_trigger('PRODUCT_DEL_MULTILANGS', $user);

             if ($result < 0) {

                 $this->error = $this->db->lasterror();

-                dol_syslog(get_class($this) . '::delMultiLangs error=' . $this->error, LOG_ERR);

+                dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);

                 return -1;

             }

             // End call triggers

             return 1;

         } else {

             $this->error = $this->db->lasterror();

-            dol_syslog(get_class($this) . '::delMultiLangs error=' . $this->error, LOG_ERR);

+            dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);

             return -1;

         }

     }

@@ -1354,16 +1354,16 @@ 
             return -1;

         }

 

-        $sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET ";

-        $sql .= "$field = '" . $this->db->escape($value) . "'";

-        $sql .= " WHERE rowid = " . $this->id;

+        $sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ";

+        $sql .= "$field = '".$this->db->escape($value)."'";

+        $sql .= " WHERE rowid = ".$this->id;

 

-        dol_syslog(get_class($this) . "::" . __FUNCTION__ . " sql=" . $sql, LOG_DEBUG);

+        dol_syslog(get_class($this)."::".__FUNCTION__." sql=".$sql, LOG_DEBUG);

         $resql = $this->db->query($sql);

 

         if ($resql) {

             // Call triggers

-            include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';

             $interface = new Interfaces($this->db);

             $result = $interface->run_triggers('PRODUCT_MODIFY', $this, $user, $langs, $conf);

             if ($result < 0) {

@@ -1396,8 +1396,8 @@ 
         $current_lang = $langs->getDefaultLang();

 

         $sql = "SELECT lang, label, description, note as other";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_lang";

-        $sql .= " WHERE fk_product=" . $this->id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";

+        $sql .= " WHERE fk_product=".$this->id;

 

         $result = $this->db->query($sql);

         if ($result) {

@@ -1414,7 +1414,7 @@ 
             }

             return 1;

         } else {

-            $this->error = "Error: " . $this->db->lasterror() . " - " . $sql;

+            $this->error = "Error: ".$this->db->lasterror()." - ".$sql;

             return -1;

         }

     }

@@ -1440,13 +1440,13 @@ 
         }

 

         // Add new price

-        $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";

+        $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_price(price_level,date_price, fk_product, fk_user_author, price, price_ttc, price_base_type,tosell, tva_tx, default_vat_code, recuperableonly,";

         $sql .= " localtax1_tx, localtax2_tx, localtax1_type, localtax2_type, price_min,price_min_ttc,price_by_qty,entity,fk_price_expression) ";

-        $sql .= " VALUES(" . ($level ? $level : 1) . ", '" . $this->db->idate($now) . "'," . $this->id . "," . $user->id . "," . $this->price . "," . $this->price_ttc . ",'" . $this->db->escape($this->price_base_type) . "'," . $this->status . "," . $this->tva_tx . ", " . ($this->default_vat_code ? ("'" . $this->db->escape($this->default_vat_code) . "'") : "null") . "," . $this->tva_npr . ",";

-        $sql .= " " . $this->localtax1_tx . ", " . $this->localtax2_tx . ", '" . $this->db->escape($this->localtax1_type) . "', '" . $this->db->escape($this->localtax2_type) . "', " . $this->price_min . "," . $this->price_min_ttc . "," . $this->price_by_qty . "," . $conf->entity . "," . ($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');

+        $sql .= " VALUES(".($level ? $level : 1).", '".$this->db->idate($now)."',".$this->id.",".$user->id.",".$this->price.",".$this->price_ttc.",'".$this->db->escape($this->price_base_type)."',".$this->status.",".$this->tva_tx.", ".($this->default_vat_code ? ("'".$this->db->escape($this->default_vat_code)."'") : "null").",".$this->tva_npr.",";

+        $sql .= " ".$this->localtax1_tx.", ".$this->localtax2_tx.", '".$this->db->escape($this->localtax1_type)."', '".$this->db->escape($this->localtax2_type)."', ".$this->price_min.",".$this->price_min_ttc.",".$this->price_by_qty.",".$conf->entity.",".($this->fk_price_expression > 0 ? $this->fk_price_expression : 'null');

         $sql .= ")";

 

-        dol_syslog(get_class($this) . "::_log_price", LOG_DEBUG);

+        dol_syslog(get_class($this)."::_log_price", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if (!$resql) {

             $this->error = $this->db->lasterror();

@@ -1468,12 +1468,12 @@ 
     function log_price_delete($user, $rowid)

     {

         // phpcs:enable

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price_by_qty";

-        $sql .= " WHERE fk_product_price=" . $rowid;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price_by_qty";

+        $sql .= " WHERE fk_product_price=".$rowid;

         $resql = $this->db->query($sql);

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_price";

-        $sql .= " WHERE rowid=" . $rowid;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_price";

+        $sql .= " WHERE rowid=".$rowid;

         $resql = $this->db->query($sql);

         if ($resql) {

             return 1;

@@ -1507,20 +1507,20 @@ 
         $sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression";

         $sql .= " ,pfp.default_vat_code";

         $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp";

-        $sql .= " WHERE pfp.rowid = " . $prodfournprice;

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";

+        $sql .= " WHERE pfp.rowid = ".$prodfournprice;

         if ($qty > 0) {

-            $sql .= " AND pfp.quantity <= " . $qty;

+            $sql .= " AND pfp.quantity <= ".$qty;

         }

         $sql .= " ORDER BY pfp.quantity DESC";

 

-        dol_syslog(get_class($this) . "::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);

+        dol_syslog(get_class($this)."::get_buyprice first search by prodfournprice/qty", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $obj = $this->db->fetch_object($resql);

             if ($obj && $obj->quantity > 0) {        // If we found a supplier prices from the id of supplier price

                 if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {

-                    include_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

                     $prod_supplier = new ProductFournisseur($this->db);

                     $prod_supplier->product_fourn_price_id = $obj->rowid;

                     $prod_supplier->id = $obj->fk_product;

@@ -1534,16 +1534,16 @@ 
                     }

                 }

                 $this->product_fourn_price_id = $obj->rowid;

-                $this->buyprice = $obj->price;                      // deprecated

-                $this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product of supplier

-                $this->fourn_price_base_type = 'HT';                // Price base type

-                $this->fourn_socid = $obj->fk_soc;                  // Company that offer this price

-                $this->ref_fourn = $obj->ref_fourn;                 // deprecated

-                $this->ref_supplier = $obj->ref_fourn;              // Ref supplier

-                $this->desc_supplier = $obj->desc_fourn;            // desc supplier

-                $this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed

-                $this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier

-                $this->default_vat_code = $obj->default_vat_code;   // Vat code supplier

+                $this->buyprice = $obj->price; // deprecated

+                $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product of supplier

+                $this->fourn_price_base_type = 'HT'; // Price base type

+                $this->fourn_socid = $obj->fk_soc; // Company that offer this price

+                $this->ref_fourn = $obj->ref_fourn; // deprecated

+                $this->ref_supplier = $obj->ref_fourn; // Ref supplier

+                $this->desc_supplier = $obj->desc_fourn; // desc supplier

+                $this->remise_percent = $obj->remise_percent; // remise percent if present and not typed

+                $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier

+                $this->default_vat_code = $obj->default_vat_code; // Vat code supplier

                 $this->fourn_multicurrency_price = $obj->multicurrency_price;

                 $this->fourn_multicurrency_unitprice = $obj->multicurrency_unitprice;

                 $this->fourn_multicurrency_tx = $obj->multicurrency_tx;

@@ -1557,27 +1557,27 @@ 
                 $sql .= " pfp.fk_product, pfp.ref_fourn as ref_supplier, pfp.desc_fourn as desc_supplier, pfp.tva_tx, pfp.fk_supplier_price_expression";

                 $sql .= " ,pfp.default_vat_code";

                 $sql .= " ,pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";

-                $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp";

-                $sql .= " WHERE pfp.fk_product = " . $product_id;

+                $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";

+                $sql .= " WHERE pfp.fk_product = ".$product_id;

                 if ($fourn_ref != 'none') {

-                    $sql .= " AND pfp.ref_fourn = '" . $fourn_ref . "'";

+                    $sql .= " AND pfp.ref_fourn = '".$fourn_ref."'";

                 }

                 if ($fk_soc > 0) {

-                    $sql .= " AND pfp.fk_soc = " . $fk_soc;

+                    $sql .= " AND pfp.fk_soc = ".$fk_soc;

                 }

                 if ($qty > 0) {

-                    $sql .= " AND pfp.quantity <= " . $qty;

+                    $sql .= " AND pfp.quantity <= ".$qty;

                 }

                 $sql .= " ORDER BY pfp.quantity DESC";

                 $sql .= " LIMIT 1";

 

-                dol_syslog(get_class($this) . "::get_buyprice second search from qty/ref/product_id", LOG_DEBUG);

+                dol_syslog(get_class($this)."::get_buyprice second search from qty/ref/product_id", LOG_DEBUG);

                 $resql = $this->db->query($sql);

                 if ($resql) {

                     $obj = $this->db->fetch_object($resql);

                     if ($obj && $obj->quantity > 0) {        // If found

                         if (!empty($conf->dynamicprices->enabled) && !empty($obj->fk_supplier_price_expression)) {

-                            include_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+                            include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

                             $prod_supplier = new ProductFournisseur($this->db);

                             $prod_supplier->product_fourn_price_id = $obj->rowid;

                             $prod_supplier->id = $obj->fk_product;

@@ -1591,17 +1591,17 @@ 
                             }

                         }

                         $this->product_fourn_price_id = $obj->rowid;

-                        $this->buyprice = $obj->price;                      // deprecated

-                        $this->fourn_qty = $obj->quantity;                    // min quantity for price for a virtual supplier

-                        $this->fourn_pu = $obj->price / $obj->quantity;     // Unit price of product for a virtual supplier

-                        $this->fourn_price_base_type = 'HT';                // Price base type for a virtual supplier

-                        $this->fourn_socid = $obj->fk_soc;                  // Company that offer this price

-                        $this->ref_fourn = $obj->ref_supplier;              // deprecated

-                        $this->ref_supplier = $obj->ref_supplier;           // Ref supplier

-                        $this->desc_supplier = $obj->desc_supplier;         // desc supplier

-                        $this->remise_percent = $obj->remise_percent;       // remise percent if present and not typed

-                        $this->vatrate_supplier = $obj->tva_tx;             // Vat ref supplier

-                        $this->default_vat_code = $obj->default_vat_code;   // Vat code supplier

+                        $this->buyprice = $obj->price; // deprecated

+                        $this->fourn_qty = $obj->quantity; // min quantity for price for a virtual supplier

+                        $this->fourn_pu = $obj->price / $obj->quantity; // Unit price of product for a virtual supplier

+                        $this->fourn_price_base_type = 'HT'; // Price base type for a virtual supplier

+                        $this->fourn_socid = $obj->fk_soc; // Company that offer this price

+                        $this->ref_fourn = $obj->ref_supplier; // deprecated

+                        $this->ref_supplier = $obj->ref_supplier; // Ref supplier

+                        $this->desc_supplier = $obj->desc_supplier; // desc supplier

+                        $this->remise_percent = $obj->remise_percent; // remise percent if present and not typed

+                        $this->vatrate_supplier = $obj->tva_tx; // Vat ref supplier

+                        $this->default_vat_code = $obj->default_vat_code; // Vat code supplier

                         $this->fourn_multicurrency_price = $obj->multicurrency_price;

                         $this->fourn_multicurrency_unitprice = $obj->multicurrency_unitprice;

                         $this->fourn_multicurrency_tx = $obj->multicurrency_tx;

@@ -1610,7 +1610,7 @@ 
                         $result = $obj->fk_product;

                         return $result;

                     } else {

-                        return -1;    // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.

+                        return -1; // Ce produit n'existe pas avec cet id tarif fournisseur ou existe mais qte insuffisante, ni pour le couple produit/ref fournisseur dans la quantité.

                     }

                 } else {

                     $this->error = $this->db->lasterror();

@@ -1645,7 +1645,7 @@ 
 

         $id = $this->id;

 

-        dol_syslog(get_class($this) . "::update_price id=" . $id . " newprice=" . $newprice . " newpricebase=" . $newpricebase . " newminprice=" . $newminprice . " level=" . $level . " npr=" . $newnpr . " newdefaultvatcode=" . $newdefaultvatcode);

+        dol_syslog(get_class($this)."::update_price id=".$id." newprice=".$newprice." newpricebase=".$newpricebase." newminprice=".$newminprice." level=".$level." npr=".$newnpr." newdefaultvatcode=".$newdefaultvatcode);

 

         // Clean parameters

         if (empty($this->tva_tx)) {

@@ -1687,7 +1687,7 @@ 
                 }

             } else {

                 $price = price2num($newprice, 'MU');

-                $price_ttc = ( $newnpr != 1 ) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;

+                $price_ttc = ($newnpr != 1) ? price2num($newprice) * (1 + ($newvat / 100)) : $price;

                 $price_ttc = price2num($price_ttc, 'MU');

 

                 if ($newminprice !== '' || $newminprice === 0) {

@@ -1714,32 +1714,32 @@ 
                 $localtax2 = get_localtax($newvat, 2);

             }

             if (empty($localtax1)) {

-                $localtax1 = 0;    // If = '' then = 0

+                $localtax1 = 0; // If = '' then = 0

             }

             if (empty($localtax2)) {

-                $localtax2 = 0;    // If = '' then = 0

+                $localtax2 = 0; // If = '' then = 0

             }

 

             $this->db->begin();

 

             // Ne pas mettre de quote sur les numeriques decimaux.

             // Ceci provoque des stockages avec arrondis en base au lieu des valeurs exactes.

-            $sql = "UPDATE " . MAIN_DB_PREFIX . "product SET";

-            $sql .= " price_base_type='" . $newpricebase . "',";

-            $sql .= " price=" . $price . ",";

-            $sql .= " price_ttc=" . $price_ttc . ",";

-            $sql .= " price_min=" . $price_min . ",";

-            $sql .= " price_min_ttc=" . $price_min_ttc . ",";

-            $sql .= " localtax1_tx=" . ($localtax1 >= 0 ? $localtax1 : 'NULL') . ",";

-            $sql .= " localtax2_tx=" . ($localtax2 >= 0 ? $localtax2 : 'NULL') . ",";

-            $sql .= " localtax1_type=" . ($localtaxtype1 != '' ? "'" . $localtaxtype1 . "'" : "'0'") . ",";

-            $sql .= " localtax2_type=" . ($localtaxtype2 != '' ? "'" . $localtaxtype2 . "'" : "'0'") . ",";

-            $sql .= " default_vat_code=" . ($newdefaultvatcode ? "'" . $this->db->escape($newdefaultvatcode) . "'" : "null") . ",";

-            $sql .= " tva_tx='" . price2num($newvat) . "',";

-            $sql .= " recuperableonly='" . $newnpr . "'";

-            $sql .= " WHERE rowid = " . $id;

-

-            dol_syslog(get_class($this) . "::update_price", LOG_DEBUG);

+            $sql = "UPDATE ".MAIN_DB_PREFIX."product SET";

+            $sql .= " price_base_type='".$newpricebase."',";

+            $sql .= " price=".$price.",";

+            $sql .= " price_ttc=".$price_ttc.",";

+            $sql .= " price_min=".$price_min.",";

+            $sql .= " price_min_ttc=".$price_min_ttc.",";

+            $sql .= " localtax1_tx=".($localtax1 >= 0 ? $localtax1 : 'NULL').",";

+            $sql .= " localtax2_tx=".($localtax2 >= 0 ? $localtax2 : 'NULL').",";

+            $sql .= " localtax1_type=".($localtaxtype1 != '' ? "'".$localtaxtype1."'" : "'0'").",";

+            $sql .= " localtax2_type=".($localtaxtype2 != '' ? "'".$localtaxtype2."'" : "'0'").",";

+            $sql .= " default_vat_code=".($newdefaultvatcode ? "'".$this->db->escape($newdefaultvatcode)."'" : "null").",";

+            $sql .= " tva_tx='".price2num($newvat)."',";

+            $sql .= " recuperableonly='".$newnpr."'";

+            $sql .= " WHERE rowid = ".$id;

+

+            dol_syslog(get_class($this)."::update_price", LOG_DEBUG);

             $resql = $this->db->query($sql);

             if ($resql) {

                 $this->multiprices[$level] = $price;

@@ -1768,9 +1768,9 @@ 
                 // Price by quantity

                 $this->price_by_qty = $newpbq;

 

-                $this->_log_price($user, $level);    // Save price for level into table product_price

+                $this->_log_price($user, $level); // Save price for level into table product_price

 

-                $this->level = $level;                // Store level of price edited for trigger

+                $this->level = $level; // Store level of price edited for trigger

                 // Call trigger

                 $result = $this->call_trigger('PRODUCT_PRICE_MODIFY', $user);

                 if ($result < 0) {

@@ -1817,16 +1817,16 @@ 
      */

     function fetch($id = '', $ref = '', $ref_ext = '', $barcode = '', $ignore_expression = 0)

     {

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

 

         global $langs, $conf;

 

-        dol_syslog(get_class($this) . "::fetch id=" . $id . " ref=" . $ref . " ref_ext=" . $ref_ext);

+        dol_syslog(get_class($this)."::fetch id=".$id." ref=".$ref." ref_ext=".$ref_ext);

 

         // Check parameters

         if (!$id && !$ref && !$ref_ext && !$barcode) {

             $this->error = 'ErrorWrongParameters';

-            dol_syslog(get_class($this) . "::fetch " . $this->error);

+            dol_syslog(get_class($this)."::fetch ".$this->error);

             return -1;

         }

 

@@ -1838,17 +1838,17 @@ 
         $sql .= " accountancy_code_buy, accountancy_code_sell, accountancy_code_sell_intra, accountancy_code_sell_export, stock, pmp,";

         $sql .= " datec, tms, import_key, entity, desiredstock, tobatch, fk_unit,";

         $sql .= " fk_price_expression, price_autogen";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product";

         if ($id) {

-            $sql .= " WHERE rowid = " . $this->db->escape($id);

+            $sql .= " WHERE rowid = ".$this->db->escape($id);

         } else {

-            $sql .= " WHERE entity IN (" . getEntity($this->element) . ")";

+            $sql .= " WHERE entity IN (".getEntity($this->element).")";

             if ($ref) {

-                $sql .= " AND ref = '" . $this->db->escape($ref) . "'";

+                $sql .= " AND ref = '".$this->db->escape($ref)."'";

             } else if ($ref_ext) {

-                $sql .= " AND ref_ext = '" . $this->db->escape($ref_ext) . "'";

+                $sql .= " AND ref_ext = '".$this->db->escape($ref_ext)."'";

             } else if ($barcode) {

-                $sql .= " AND barcode = '" . $this->db->escape($barcode) . "'";

+                $sql .= " AND barcode = '".$this->db->escape($barcode)."'";

             }

         }

 

@@ -1864,7 +1864,7 @@ 
                 $this->description = $obj->description;

                 $this->url = $obj->url;

                 $this->note_private = $obj->note_private;

-                $this->note = $obj->note_private;  // deprecated

+                $this->note = $obj->note_private; // deprecated

 

                 $this->type = $obj->fk_product_type;

                 $this->status = $obj->tosell;

@@ -1884,7 +1884,7 @@ 
                 $this->tva_tx = $obj->tva_tx;

                 //! French VAT NPR

                 $this->tva_npr = $obj->tva_npr;

-                $this->recuperableonly = $obj->tva_npr;       // For backward compatibility

+                $this->recuperableonly = $obj->tva_npr; // For backward compatibility

                 //! Local taxes

                 $this->localtax1_tx = $obj->localtax1_tx;

                 $this->localtax2_tx = $obj->localtax2_tx;

@@ -1949,10 +1949,10 @@ 
                     for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {

                         $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";

                         $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";

-                        $sql .= " FROM " . MAIN_DB_PREFIX . "product_price";

-                        $sql .= " WHERE entity IN (" . getEntity('productprice') . ")";

-                        $sql .= " AND price_level=" . $i;

-                        $sql .= " AND fk_product = " . $this->id;

+                        $sql .= " FROM ".MAIN_DB_PREFIX."product_price";

+                        $sql .= " WHERE entity IN (".getEntity('productprice').")";

+                        $sql .= " AND price_level=".$i;

+                        $sql .= " AND fk_product = ".$this->id;

                         $sql .= " ORDER BY date_price DESC, rowid DESC";

                         $sql .= " LIMIT 1";

                         $resql = $this->db->query($sql);

@@ -1965,7 +1965,7 @@ 
                             $this->multiprices_min_ttc[$i] = $result["price_min_ttc"];

                             $this->multiprices_base_type[$i] = $result["price_base_type"];

                             // Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on

-                            $this->multiprices_tva_tx[$i] = $result["tva_tx"];     // TODO Add ' ('.$result['default_vat_code'].')'

+                            $this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'

                             $this->multiprices_recuperableonly[$i] = $result["recuperableonly"];

 

                             // Price by quantity

@@ -2013,8 +2013,8 @@ 
                 } else if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {    // prices per quantity

                     $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";

                     $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "product_price";

-                    $sql .= " WHERE fk_product = " . $this->id;

+                    $sql .= " FROM ".MAIN_DB_PREFIX."product_price";

+                    $sql .= " WHERE fk_product = ".$this->id;

                     $sql .= " ORDER BY date_price DESC, rowid DESC";

                     $sql .= " LIMIT 1";

                     $resql = $this->db->query($sql);

@@ -2027,8 +2027,8 @@ 
                         // Récuperation de la liste des prix selon qty si flag positionné

                         if ($this->prices_by_qty[0] == 1) {

                             $sql = "SELECT rowid,price, unitprice, quantity, remise_percent, remise, remise, price_base_type";

-                            $sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty";

-                            $sql .= " WHERE fk_product_price = " . $this->prices_by_qty_id[0];

+                            $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";

+                            $sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[0];

                             $sql .= " ORDER BY quantity ASC";

                             $resultat = array();

                             $resql = $this->db->query($sql);

@@ -2059,10 +2059,10 @@ 
                     for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {

                         $sql = "SELECT price, price_ttc, price_min, price_min_ttc,";

                         $sql .= " price_base_type, tva_tx, default_vat_code, tosell, price_by_qty, rowid, recuperableonly";

-                        $sql .= " FROM " . MAIN_DB_PREFIX . "product_price";

-                        $sql .= " WHERE entity IN (" . getEntity('productprice') . ")";

-                        $sql .= " AND price_level=" . $i;

-                        $sql .= " AND fk_product = " . $this->id;

+                        $sql .= " FROM ".MAIN_DB_PREFIX."product_price";

+                        $sql .= " WHERE entity IN (".getEntity('productprice').")";

+                        $sql .= " AND price_level=".$i;

+                        $sql .= " AND fk_product = ".$this->id;

                         $sql .= " ORDER BY date_price DESC, rowid DESC";

                         $sql .= " LIMIT 1";

                         $resql = $this->db->query($sql);

@@ -2075,7 +2075,7 @@ 
                             $this->multiprices_min_ttc[$i] = $result["price_min_ttc"];

                             $this->multiprices_base_type[$i] = $result["price_base_type"];

                             // Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on

-                            $this->multiprices_tva_tx[$i] = $result["tva_tx"];     // TODO Add ' ('.$result['default_vat_code'].')'

+                            $this->multiprices_tva_tx[$i] = $result["tva_tx"]; // TODO Add ' ('.$result['default_vat_code'].')'

                             $this->multiprices_recuperableonly[$i] = $result["recuperableonly"];

 

                             // Price by quantity

@@ -2084,8 +2084,8 @@ 
                             // Récuperation de la liste des prix selon qty si flag positionné

                             if ($this->prices_by_qty[$i] == 1) {

                                 $sql = "SELECT rowid, price, unitprice, quantity, remise_percent, remise, price_base_type";

-                                $sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty";

-                                $sql .= " WHERE fk_product_price = " . $this->prices_by_qty_id[$i];

+                                $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";

+                                $sql .= " WHERE fk_product_price = ".$this->prices_by_qty_id[$i];

                                 $sql .= " ORDER BY quantity ASC";

                                 $resultat = array();

                                 $resql = $this->db->query($sql);

@@ -2098,7 +2098,7 @@ 
                                         $resultat[$ii]["unitprice"] = $result["unitprice"];

                                         $resultat[$ii]["quantity"] = $result["quantity"];

                                         $resultat[$ii]["remise_percent"] = $result["remise_percent"];

-                                        $resultat[$ii]["remise"] = $result["remise"];                    // deprecated

+                                        $resultat[$ii]["remise"] = $result["remise"]; // deprecated

                                         $resultat[$ii]["price_base_type"] = $result["price_base_type"];

                                         $ii++;

                                     }

@@ -2116,7 +2116,7 @@ 
                 }

 

                 if (!empty($conf->dynamicprices->enabled) && !empty($this->fk_price_expression) && empty($ignore_expression)) {

-                    include_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+                    include_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

                     $priceparser = new PriceParser($this->db);

                     $price_result = $priceparser->parseProduct($this);

                     if ($price_result >= 0) {

@@ -2156,22 +2156,22 @@ 
 

         $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";

         $sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "propaldet as pd";

-        $sql .= ", " . MAIN_DB_PREFIX . "propal as p";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as pd";

+        $sql .= ", ".MAIN_DB_PREFIX."propal as p";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE p.rowid = pd.fk_propal";

         $sql .= " AND p.fk_soc = s.rowid";

-        $sql .= " AND p.entity IN (" . getEntity('propal') . ")";

-        $sql .= " AND pd.fk_product = " . $this->id;

+        $sql .= " AND p.entity IN (".getEntity('propal').")";

+        $sql .= " AND pd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         //$sql.= " AND pr.fk_statut != 0";

         if ($socid > 0) {

-            $sql .= " AND p.fk_soc = " . $socid;

+            $sql .= " AND p.fk_soc = ".$socid;

         }

 

         $result = $this->db->query($sql);

@@ -2203,22 +2203,22 @@ 
 

         $sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_suppliers, COUNT(DISTINCT p.rowid) as nb,";

         $sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "supplier_proposaldet as pd";

-        $sql .= ", " . MAIN_DB_PREFIX . "supplier_proposal as p";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as pd";

+        $sql .= ", ".MAIN_DB_PREFIX."supplier_proposal as p";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE p.rowid = pd.fk_supplier_proposal";

         $sql .= " AND p.fk_soc = s.rowid";

-        $sql .= " AND p.entity IN (" . getEntity('supplier_proposal') . ")";

-        $sql .= " AND pd.fk_product = " . $this->id;

+        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";

+        $sql .= " AND pd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         //$sql.= " AND pr.fk_statut != 0";

         if ($socid > 0) {

-            $sql .= " AND p.fk_soc = " . $socid;

+            $sql .= " AND p.fk_soc = ".$socid;

         }

 

         $result = $this->db->query($sql);

@@ -2251,24 +2251,24 @@ 
 

         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";

         $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd";

-        $sql .= ", " . MAIN_DB_PREFIX . "commande as c";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd";

+        $sql .= ", ".MAIN_DB_PREFIX."commande as c";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE c.rowid = cd.fk_commande";

         $sql .= " AND c.fk_soc = s.rowid";

-        $sql .= " AND c.entity IN (" . getEntity('commande') . ")";

-        $sql .= " AND cd.fk_product = " . $this->id;

+        $sql .= " AND c.entity IN (".getEntity('commande').")";

+        $sql .= " AND cd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND c.fk_soc = " . $socid;

+            $sql .= " AND c.fk_soc = ".$socid;

         }

         if ($filtrestatut <> '') {

-            $sql .= " AND c.fk_statut in (" . $filtrestatut . ")";

+            $sql .= " AND c.fk_statut in (".$filtrestatut.")";

         }

 

         $result = $this->db->query($sql);

@@ -2306,12 +2306,12 @@ 
             if (!empty($conf->global->STOCK_CALCULATE_ON_BILL)) {

                 if (!empty($conf->global->DECREASE_ONLY_UNINVOICEDPRODUCTS)) {

                     $adeduire = 0;

-                    $sql = "SELECT sum(fd.qty) as count FROM " . MAIN_DB_PREFIX . "facturedet fd ";

-                    $sql .= " JOIN " . MAIN_DB_PREFIX . "facture f ON fd.fk_facture = f.rowid ";

-                    $sql .= " JOIN " . MAIN_DB_PREFIX . "element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";

-                    $sql .= " JOIN " . MAIN_DB_PREFIX . "commande c ON el.fk_source = c.rowid ";

-                    $sql .= " WHERE c.fk_statut IN (" . $filtrestatut . ") AND c.facture = 0 AND fd.fk_product = " . $this->id;

-                    dol_syslog(__METHOD__ . ":: sql $sql", LOG_NOTICE);

+                    $sql = "SELECT sum(fd.qty) as count FROM ".MAIN_DB_PREFIX."facturedet fd ";

+                    $sql .= " JOIN ".MAIN_DB_PREFIX."facture f ON fd.fk_facture = f.rowid ";

+                    $sql .= " JOIN ".MAIN_DB_PREFIX."element_element el ON el.fk_target = f.rowid and el.targettype = 'facture' and sourcetype = 'commande'";

+                    $sql .= " JOIN ".MAIN_DB_PREFIX."commande c ON el.fk_source = c.rowid ";

+                    $sql .= " WHERE c.fk_statut IN (".$filtrestatut.") AND c.facture = 0 AND fd.fk_product = ".$this->id;

+                    dol_syslog(__METHOD__.":: sql $sql", LOG_NOTICE);

 

                     $resql = $this->db->query($sql);

                     if ($resql) {

@@ -2348,24 +2348,24 @@ 
 

         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_suppliers, COUNT(DISTINCT c.rowid) as nb,";

         $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "commande_fournisseurdet as cd";

-        $sql .= ", " . MAIN_DB_PREFIX . "commande_fournisseur as c";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd";

+        $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as c";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE c.rowid = cd.fk_commande";

         $sql .= " AND c.fk_soc = s.rowid";

-        $sql .= " AND c.entity IN (" . getEntity('supplier_order') . ")";

-        $sql .= " AND cd.fk_product = " . $this->id;

+        $sql .= " AND c.entity IN (".getEntity('supplier_order').")";

+        $sql .= " AND cd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND c.fk_soc = " . $socid;

+            $sql .= " AND c.fk_soc = ".$socid;

         }

         if ($filtrestatut != '') {

-            $sql .= " AND c.fk_statut in (" . $filtrestatut . ")"; // Peut valoir 0

+            $sql .= " AND c.fk_statut in (".$filtrestatut.")"; // Peut valoir 0

         }

 

         $result = $this->db->query($sql);

@@ -2377,7 +2377,7 @@ 
             $this->stats_commande_fournisseur['qty'] = $obj->qty ? $obj->qty : 0;

             return 1;

         } else {

-            $this->error = $this->db->error() . ' sql=' . $sql;

+            $this->error = $this->db->error().' sql='.$sql;

             return -1;

         }

     }

@@ -2398,28 +2398,28 @@ 
 

         $sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";

         $sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "expeditiondet as ed";

-        $sql .= ", " . MAIN_DB_PREFIX . "commandedet as cd";

-        $sql .= ", " . MAIN_DB_PREFIX . "commande as c";

-        $sql .= ", " . MAIN_DB_PREFIX . "expedition as e";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."expeditiondet as ed";

+        $sql .= ", ".MAIN_DB_PREFIX."commandedet as cd";

+        $sql .= ", ".MAIN_DB_PREFIX."commande as c";

+        $sql .= ", ".MAIN_DB_PREFIX."expedition as e";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE e.rowid = ed.fk_expedition";

         $sql .= " AND c.rowid = cd.fk_commande";

         $sql .= " AND e.fk_soc = s.rowid";

-        $sql .= " AND e.entity IN (" . getEntity('expedition') . ")";

+        $sql .= " AND e.entity IN (".getEntity('expedition').")";

         $sql .= " AND ed.fk_origin_line = cd.rowid";

-        $sql .= " AND cd.fk_product = " . $this->id;

+        $sql .= " AND cd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND e.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND e.fk_soc = " . $socid;

+            $sql .= " AND e.fk_soc = ".$socid;

         }

         if ($filtrestatut <> '') {

-            $sql .= " AND c.fk_statut in (" . $filtrestatut . ")";

+            $sql .= " AND c.fk_statut in (".$filtrestatut.")";

         }

 

         $result = $this->db->query($sql);

@@ -2452,24 +2452,24 @@ 
 

         $sql = "SELECT COUNT(DISTINCT cf.fk_soc) as nb_customers, COUNT(DISTINCT cf.rowid) as nb,";

         $sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "commande_fournisseur_dispatch as fd";

-        $sql .= ", " . MAIN_DB_PREFIX . "commande_fournisseur as cf";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as fd";

+        $sql .= ", ".MAIN_DB_PREFIX."commande_fournisseur as cf";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE cf.rowid = fd.fk_commande";

         $sql .= " AND cf.fk_soc = s.rowid";

-        $sql .= " AND cf.entity IN (" . getEntity('supplier_order') . ")";

-        $sql .= " AND fd.fk_product = " . $this->id;

+        $sql .= " AND cf.entity IN (".getEntity('supplier_order').")";

+        $sql .= " AND fd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid && !$forVirtualStock) {

-            $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND cf.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND cf.fk_soc = " . $socid;

+            $sql .= " AND cf.fk_soc = ".$socid;

         }

         if ($filtrestatut <> '') {

-            $sql .= " AND cf.fk_statut in (" . $filtrestatut . ")";

+            $sql .= " AND cf.fk_statut in (".$filtrestatut.")";

         }

 

         $result = $this->db->query($sql);

@@ -2501,22 +2501,22 @@ 
 

         $sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";

         $sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "contratdet as cd";

-        $sql .= ", " . MAIN_DB_PREFIX . "contrat as c";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."contratdet as cd";

+        $sql .= ", ".MAIN_DB_PREFIX."contrat as c";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE c.rowid = cd.fk_contrat";

         $sql .= " AND c.fk_soc = s.rowid";

-        $sql .= " AND c.entity IN (" . getEntity('contract') . ")";

-        $sql .= " AND cd.fk_product = " . $this->id;

+        $sql .= " AND c.entity IN (".getEntity('contract').")";

+        $sql .= " AND cd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         //$sql.= " AND c.statut != 0";

         if ($socid > 0) {

-            $sql .= " AND c.fk_soc = " . $socid;

+            $sql .= " AND c.fk_soc = ".$socid;

         }

 

         $result = $this->db->query($sql);

@@ -2528,7 +2528,7 @@ 
             $this->stats_contrat['qty'] = $obj->qty ? $obj->qty : 0;

             return 1;

         } else {

-            $this->error = $this->db->error() . ' sql=' . $sql;

+            $this->error = $this->db->error().' sql='.$sql;

             return -1;

         }

     }

@@ -2548,22 +2548,22 @@ 
 

         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";

         $sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as fd";

-        $sql .= ", " . MAIN_DB_PREFIX . "facture as f";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as fd";

+        $sql .= ", ".MAIN_DB_PREFIX."facture as f";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE f.rowid = fd.fk_facture";

         $sql .= " AND f.fk_soc = s.rowid";

-        $sql .= " AND f.entity IN (" . getEntity('invoice') . ")";

-        $sql .= " AND fd.fk_product = " . $this->id;

+        $sql .= " AND f.entity IN (".getEntity('invoice').")";

+        $sql .= " AND fd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         //$sql.= " AND f.fk_statut != 0";

         if ($socid > 0) {

-            $sql .= " AND f.fk_soc = " . $socid;

+            $sql .= " AND f.fk_soc = ".$socid;

         }

 

         $result = $this->db->query($sql);

@@ -2595,22 +2595,22 @@ 
 

         $sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_suppliers, COUNT(DISTINCT f.rowid) as nb,";

         $sql .= " COUNT(fd.rowid) as nb_rows, SUM(fd.qty) as qty";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as fd";

-        $sql .= ", " . MAIN_DB_PREFIX . "facture_fourn as f";

-        $sql .= ", " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as fd";

+        $sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";

+        $sql .= ", ".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE f.rowid = fd.fk_facture_fourn";

         $sql .= " AND f.fk_soc = s.rowid";

-        $sql .= " AND f.entity IN (" . getEntity('facture_fourn') . ")";

-        $sql .= " AND fd.fk_product = " . $this->id;

+        $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";

+        $sql .= " AND fd.fk_product = ".$this->id;

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         //$sql.= " AND f.fk_statut != 0";

         if ($socid > 0) {

-            $sql .= " AND f.fk_soc = " . $socid;

+            $sql .= " AND f.fk_soc = ".$socid;

         }

 

         $result = $this->db->query($sql);

@@ -2646,15 +2646,15 @@ 
             while ($i < $num) {

                 $arr = $this->db->fetch_array($resql);

                 if ($mode == 'byunit') {

-                    $tab[$arr[1]] = $arr[0];    // 1st field

+                    $tab[$arr[1]] = $arr[0]; // 1st field

                 }

                 if ($mode == 'bynumber') {

-                    $tab[$arr[1]] = $arr[2];    // 3rd field

+                    $tab[$arr[1]] = $arr[2]; // 3rd field

                 }

                 $i++;

             }

         } else {

-            $this->error = $this->db->error() . ' sql=' . $sql;

+            $this->error = $this->db->error().' sql='.$sql;

             return -1;

         }

 

@@ -2662,7 +2662,7 @@ 
             $year = strftime('%Y', time());

             $month = strftime('%m', time());

         } else {

-            $month = 12;    // We imagine we are at end of year, so we get last 12 month before, so all correct year.

+            $month = 12; // We imagine we are at end of year, so we get last 12 month before, so all correct year.

         }

         $result = array();

 

@@ -2670,10 +2670,10 @@ 
             $idx = ucfirst(dol_trunc(dol_print_date(dol_mktime(12, 0, 0, $month, 1, $year), "%b"), 3, 'right', 'UTF-8', 1));

             $monthnum = sprintf("%02s", $month);

 

-            $result[$j] = array($idx, isset($tab[$year . $month]) ? $tab[$year . $month] : 0);

+            $result[$j] = array($idx, isset($tab[$year.$month]) ? $tab[$year.$month] : 0);

             //            $result[$j] = array($monthnum,isset($tab[$year.$month])?$tab[$year.$month]:0);

 

-            $month = "0" . ($month - 1);

+            $month = "0".($month - 1);

             if (dol_strlen($month) == 3) {

                 $month = substr($month, 1);

             }

@@ -2707,26 +2707,26 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT f.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "facturedet as d, " . MAIN_DB_PREFIX . "facture as f, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."facturedet as d, ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as p";

+            $sql .= ", ".MAIN_DB_PREFIX."product as p";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE f.rowid = d.fk_facture";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND f.fk_soc = s.rowid";

-        $sql .= " AND f.entity IN (" . getEntity('invoice') . ")";

+        $sql .= " AND f.entity IN (".getEntity('invoice').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

             $sql .= " AND f.fk_soc = $socid";

@@ -2759,26 +2759,26 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT f.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "facture_fourn_det as d, " . MAIN_DB_PREFIX . "facture_fourn as f, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn_det as d, ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as p";

+            $sql .= ", ".MAIN_DB_PREFIX."product as p";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE f.rowid = d.fk_facture_fourn";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND f.fk_soc = s.rowid";

-        $sql .= " AND f.entity IN (" . getEntity('facture_fourn') . ")";

+        $sql .= " AND f.entity IN (".getEntity('facture_fourn').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

             $sql .= " AND f.fk_soc = $socid";

@@ -2811,29 +2811,29 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT p.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "propaldet as d, " . MAIN_DB_PREFIX . "propal as p, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as prod";

+            $sql .= ", ".MAIN_DB_PREFIX."product as prod";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE p.rowid = d.fk_propal";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND p.fk_soc = s.rowid";

-        $sql .= " AND p.entity IN (" . getEntity('propal') . ")";

+        $sql .= " AND p.entity IN (".getEntity('propal').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND p.fk_soc = " . $socid;

+            $sql .= " AND p.fk_soc = ".$socid;

         }

         $sql .= $morefilter;

         $sql .= " GROUP BY date_format(p.datep,'%Y%m')";

@@ -2863,29 +2863,29 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT p.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "supplier_proposaldet as d, " . MAIN_DB_PREFIX . "supplier_proposal as p, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."supplier_proposaldet as d, ".MAIN_DB_PREFIX."supplier_proposal as p, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as prod";

+            $sql .= ", ".MAIN_DB_PREFIX."product as prod";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE p.rowid = d.fk_supplier_proposal";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND prod.rowid = d.fk_product AND prod.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND p.fk_soc = s.rowid";

-        $sql .= " AND p.entity IN (" . getEntity('supplier_proposal') . ")";

+        $sql .= " AND p.entity IN (".getEntity('supplier_proposal').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND p.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND p.fk_soc = " . $socid;

+            $sql .= " AND p.fk_soc = ".$socid;

         }

         $sql .= $morefilter;

         $sql .= " GROUP BY date_format(p.date_valid,'%Y%m')";

@@ -2914,29 +2914,29 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT c.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as d, " . MAIN_DB_PREFIX . "commande as c, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."commandedet as d, ".MAIN_DB_PREFIX."commande as c, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as p";

+            $sql .= ", ".MAIN_DB_PREFIX."product as p";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE c.rowid = d.fk_commande";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND c.fk_soc = s.rowid";

-        $sql .= " AND c.entity IN (" . getEntity('commande') . ")";

+        $sql .= " AND c.entity IN (".getEntity('commande').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND c.fk_soc = " . $socid;

+            $sql .= " AND c.fk_soc = ".$socid;

         }

         $sql .= $morefilter;

         $sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";

@@ -2965,29 +2965,29 @@ 
         if ($mode == 'bynumber') {

             $sql .= ", count(DISTINCT c.rowid)";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "commande_fournisseurdet as d, " . MAIN_DB_PREFIX . "commande_fournisseur as c, " . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as d, ".MAIN_DB_PREFIX."commande_fournisseur as c, ".MAIN_DB_PREFIX."societe as s";

         if ($filteronproducttype >= 0) {

-            $sql .= ", " . MAIN_DB_PREFIX . "product as p";

+            $sql .= ", ".MAIN_DB_PREFIX."product as p";

         }

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         }

         $sql .= " WHERE c.rowid = d.fk_commande";

         if ($this->id > 0) {

-            $sql .= " AND d.fk_product =" . $this->id;

+            $sql .= " AND d.fk_product =".$this->id;

         } else {

             $sql .= " AND d.fk_product > 0";

         }

         if ($filteronproducttype >= 0) {

-            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =" . $filteronproducttype;

+            $sql .= " AND p.rowid = d.fk_product AND p.fk_product_type =".$filteronproducttype;

         }

         $sql .= " AND c.fk_soc = s.rowid";

-        $sql .= " AND c.entity IN (" . getEntity('supplier_order') . ")";

+        $sql .= " AND c.entity IN (".getEntity('supplier_order').")";

         if (!$user->rights->societe->client->voir && !$socid) {

-            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND c.fk_soc = sc.fk_soc AND sc.fk_user = ".$user->id;

         }

         if ($socid > 0) {

-            $sql .= " AND c.fk_soc = " . $socid;

+            $sql .= " AND c.fk_soc = ".$socid;

         }

         $sql .= $morefilter;

         $sql .= " GROUP BY date_format(c.date_commande,'%Y%m')";

@@ -3026,8 +3026,8 @@ 
         }

 

         // Check not already father of id_pere (to avoid father -> child -> father links)

-        $sql = 'SELECT fk_product_pere from ' . MAIN_DB_PREFIX . 'product_association';

-        $sql .= ' WHERE fk_product_pere  = ' . $id_fils . ' AND fk_product_fils = ' . $id_pere;

+        $sql = 'SELECT fk_product_pere from '.MAIN_DB_PREFIX.'product_association';

+        $sql .= ' WHERE fk_product_pere  = '.$id_fils.' AND fk_product_fils = '.$id_pere;

         if (!$this->db->query($sql)) {

             dol_print_error($this->db);

             return -1;

@@ -3039,8 +3039,8 @@ 
                     $this->error = "isFatherOfThis";

                     return -1;

                 } else {

-                    $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'product_association(fk_product_pere,fk_product_fils,qty,incdec)';

-                    $sql .= ' VALUES (' . $id_pere . ', ' . $id_fils . ', ' . $qty . ', ' . $incdec . ')';

+                    $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association(fk_product_pere,fk_product_fils,qty,incdec)';

+                    $sql .= ' VALUES ('.$id_pere.', '.$id_fils.', '.$qty.', '.$incdec.')';

                     if (!$this->db->query($sql)) {

                         dol_print_error($this->db);

                         return -1;

@@ -3079,10 +3079,10 @@ 
             $qty = 1;

         }

 

-        $sql = 'UPDATE ' . MAIN_DB_PREFIX . 'product_association SET ';

-        $sql .= 'qty=' . $qty;

-        $sql .= ',incdec=' . $incdec;

-        $sql .= ' WHERE fk_product_pere=' . $id_pere . ' AND fk_product_fils=' . $id_fils;

+        $sql = 'UPDATE '.MAIN_DB_PREFIX.'product_association SET ';

+        $sql .= 'qty='.$qty;

+        $sql .= ',incdec='.$incdec;

+        $sql .= ' WHERE fk_product_pere='.$id_pere.' AND fk_product_fils='.$id_fils;

 

         if (!$this->db->query($sql)) {

             dol_print_error($this->db);

@@ -3110,11 +3110,11 @@ 
             $fk_child = 0;

         }

 

-        $sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_association";

-        $sql .= " WHERE fk_product_pere  = " . $fk_parent;

-        $sql .= " AND fk_product_fils = " . $fk_child;

+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."product_association";

+        $sql .= " WHERE fk_product_pere  = ".$fk_parent;

+        $sql .= " AND fk_product_fils = ".$fk_child;

 

-        dol_syslog(get_class($this) . '::del_sousproduit', LOG_DEBUG);

+        dol_syslog(get_class($this).'::del_sousproduit', LOG_DEBUG);

         if (!$this->db->query($sql)) {

             dol_print_error($this->db);

             return -1;

@@ -3135,9 +3135,9 @@ 
     {

         // phpcs:enable

         $sql = "SELECT fk_product_pere, qty, incdec";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_association";

-        $sql .= " WHERE fk_product_pere  = '" . $fk_parent . "'";

-        $sql .= " AND fk_product_fils = '" . $fk_child . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_association";

+        $sql .= " WHERE fk_product_pere  = '".$fk_parent."'";

+        $sql .= " AND fk_product_fils = '".$fk_child."'";

 

         $result = $this->db->query($sql);

         if ($result) {

@@ -3176,15 +3176,15 @@ 
 

         $now = dol_now();

 

-        dol_syslog(get_class($this) . "::add_fournisseur id_fourn = " . $id_fourn . " ref_fourn=" . $ref_fourn . " quantity=" . $quantity, LOG_DEBUG);

+        dol_syslog(get_class($this)."::add_fournisseur id_fourn = ".$id_fourn." ref_fourn=".$ref_fourn." quantity=".$quantity, LOG_DEBUG);

 

         if ($ref_fourn) {

             $sql = "SELECT rowid, fk_product";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price";

-            $sql .= " WHERE fk_soc = " . $id_fourn;

-            $sql .= " AND ref_fourn = '" . $this->db->escape($ref_fourn) . "'";

-            $sql .= " AND fk_product != " . $this->id;

-            $sql .= " AND entity IN (" . getEntity('productsupplierprice') . ")";

+            $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";

+            $sql .= " WHERE fk_soc = ".$id_fourn;

+            $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";

+            $sql .= " AND fk_product != ".$this->id;

+            $sql .= " AND entity IN (".getEntity('productsupplierprice').")";

 

             $resql = $this->db->query($sql);

             if ($resql) {

@@ -3199,16 +3199,16 @@ 
         }

 

         $sql = "SELECT rowid";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price";

-        $sql .= " WHERE fk_soc = " . $id_fourn;

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";

+        $sql .= " WHERE fk_soc = ".$id_fourn;

         if ($ref_fourn) {

-            $sql .= " AND ref_fourn = '" . $this->db->escape($ref_fourn) . "'";

+            $sql .= " AND ref_fourn = '".$this->db->escape($ref_fourn)."'";

         } else {

             $sql .= " AND (ref_fourn = '' OR ref_fourn IS NULL)";

         }

-        $sql .= " AND quantity = '" . $quantity . "'";

-        $sql .= " AND fk_product = " . $this->id;

-        $sql .= " AND entity IN (" . getEntity('productsupplierprice') . ")";

+        $sql .= " AND quantity = '".$quantity."'";

+        $sql .= " AND fk_product = ".$this->id;

+        $sql .= " AND entity IN (".getEntity('productsupplierprice').")";

 

         $resql = $this->db->query($sql);

         if ($resql) {

@@ -3216,7 +3216,7 @@ 
 

             // The reference supplier does not exist, we create it for this product.

             if (!$obj) {

-                $sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_fournisseur_price(";

+                $sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";

                 $sql .= "datec";

                 $sql .= ", entity";

                 $sql .= ", fk_product";

@@ -3226,18 +3226,18 @@ 
                 $sql .= ", fk_user";

                 $sql .= ", tva_tx";

                 $sql .= ") VALUES (";

-                $sql .= "'" . $this->db->idate($now) . "'";

-                $sql .= ", " . $conf->entity;

-                $sql .= ", " . $this->id;

-                $sql .= ", " . $id_fourn;

-                $sql .= ", '" . $this->db->escape($ref_fourn) . "'";

-                $sql .= ", " . $quantity;

-                $sql .= ", " . $user->id;

+                $sql .= "'".$this->db->idate($now)."'";

+                $sql .= ", ".$conf->entity;

+                $sql .= ", ".$this->id;

+                $sql .= ", ".$id_fourn;

+                $sql .= ", '".$this->db->escape($ref_fourn)."'";

+                $sql .= ", ".$quantity;

+                $sql .= ", ".$user->id;

                 $sql .= ", 0";

                 $sql .= ")";

 

                 if ($this->db->query($sql)) {

-                    $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX . "product_fournisseur_price");

+                    $this->product_fourn_price_id = $this->db->last_insert_id(MAIN_DB_PREFIX."product_fournisseur_price");

                     return 1;

                 } else {

                     $this->error = $this->db->lasterror();

@@ -3269,9 +3269,9 @@ 
         $list = array();

 

         $sql = "SELECT DISTINCT p.fk_soc";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price as p";

-        $sql .= " WHERE p.fk_product = " . $this->id;

-        $sql .= " AND p.entity = " . $conf->entity;

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as p";

+        $sql .= " WHERE p.fk_product = ".$this->id;

+        $sql .= " AND p.entity = ".$conf->entity;

 

         $result = $this->db->query($sql);

         if ($result) {

@@ -3301,13 +3301,13 @@ 
         $this->db->begin();

 

         // les prix

-        $sql = "INSERT " . MAIN_DB_PREFIX . "product_price (";

+        $sql = "INSERT ".MAIN_DB_PREFIX."product_price (";

         $sql .= " fk_product, date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell)";

-        $sql .= " SELECT " . $toId . ", date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_price ";

-        $sql .= " WHERE fk_product = " . $fromId;

+        $sql .= " SELECT ".$toId.", date_price, price, tva_tx, localtax1_tx, localtax2_tx, fk_user_author, tosell";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_price ";

+        $sql .= " WHERE fk_product = ".$fromId;

 

-        dol_syslog(get_class($this) . '::clone_price', LOG_DEBUG);

+        dol_syslog(get_class($this).'::clone_price', LOG_DEBUG);

         if (!$this->db->query($sql)) {

             $this->db->rollback();

             return -1;

@@ -3329,11 +3329,11 @@ 
         // phpcs:enable

         $this->db->begin();

 

-        $sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'product_association (fk_product_pere, fk_product_fils, qty)';

-        $sql .= " SELECT " . $toId . ", fk_product_fils, qty FROM " . MAIN_DB_PREFIX . "product_association";

-        $sql .= " WHERE fk_product_pere = " . $fromId;

+        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'product_association (fk_product_pere, fk_product_fils, qty)';

+        $sql .= " SELECT ".$toId.", fk_product_fils, qty FROM ".MAIN_DB_PREFIX."product_association";

+        $sql .= " WHERE fk_product_pere = ".$fromId;

 

-        dol_syslog(get_class($this) . '::clone_association', LOG_DEBUG);

+        dol_syslog(get_class($this).'::clone_association', LOG_DEBUG);

         if (!$this->db->query($sql)) {

             $this->db->rollback();

             return -1;

@@ -3372,13 +3372,13 @@ 
           } */

 

         // les prix de fournisseurs.

-        $sql = "INSERT " . MAIN_DB_PREFIX . "product_fournisseur_price (";

+        $sql = "INSERT ".MAIN_DB_PREFIX."product_fournisseur_price (";

         $sql .= " datec, fk_product, fk_soc, price, quantity, fk_user)";

-        $sql .= " SELECT '" . $this->db->idate($now) . "', " . $toId . ", fk_soc, price, quantity, fk_user";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_fournisseur_price";

-        $sql .= " WHERE fk_product = " . $fromId;

+        $sql .= " SELECT '".$this->db->idate($now)."', ".$toId.", fk_soc, price, quantity, fk_user";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price";

+        $sql .= " WHERE fk_product = ".$fromId;

 

-        dol_syslog(get_class($this) . '::clone_fournisseurs', LOG_DEBUG);

+        dol_syslog(get_class($this).'::clone_fournisseurs', LOG_DEBUG);

         $resql = $this->db->query($sql);

         if (!$resql) {

             $this->db->rollback();

@@ -3421,8 +3421,8 @@ 
                 }

 

                 //print "XXX We add id=".$id." - label=".$label." - nb=".$nb." - multiply=".$multiply." fullpath=".$compl_path.$label."\n";

-                $this->fetch($id);        // Load product

-                $this->load_stock('nobatch,novirtual');    // Load stock to get true this->stock_reel

+                $this->fetch($id); // Load product

+                $this->load_stock('nobatch,novirtual'); // Load stock to get true this->stock_reel

                 $this->res[] = array(

                     'id' => $id, // Id product

                     'id_parent' => $id_parent,

@@ -3432,7 +3432,7 @@ 
                     'stock' => $this->stock_reel, // Stock

                     'stock_alert' => $this->seuil_stock_alerte, // Stock alert

                     'label' => $label,

-                    'fullpath' => $compl_path . $label, // Label

+                    'fullpath' => $compl_path.$label, // Label

                     'type' => $type, // Nb of units that compose parent product

                     'desiredstock' => $this->desiredstock,

                     'level' => $level,

@@ -3443,7 +3443,7 @@ 
                 // Recursive call if there is childs to child

                 if (is_array($desc_pere['childs'])) {

                     //print 'YYY We go down for '.$desc_pere[3]." -> \n";

-                    $this->fetch_prod_arbo($desc_pere['childs'], $compl_path . $desc_pere[3] . " -> ", $desc_pere[1] * $multiply, $level + 1, $id);

+                    $this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id);

                 }

             }

         }

@@ -3482,8 +3482,8 @@ 
         $nb = 0;

 

         $sql = "SELECT COUNT(pa.rowid) as nb";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_association as pa";

-        $sql .= " WHERE pa.fk_product_fils = " . $this->id . " OR pa.fk_product_pere = " . $this->id;

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa";

+        $sql .= " WHERE pa.fk_product_fils = ".$this->id." OR pa.fk_product_pere = ".$this->id;

         $resql = $this->db->query($sql);

         if ($resql) {

             $obj = $this->db->fetch_object($resql);

@@ -3505,8 +3505,8 @@ 
     public function hasVariants()

     {

         $nb = 0;

-        $sql = "SELECT count(rowid) as nb FROM " . MAIN_DB_PREFIX . "product_attribute_combination WHERE fk_product_parent = " . $this->id;

-        $sql .= " AND entity IN (" . getEntity('product') . ")";

+        $sql = "SELECT count(rowid) as nb FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".$this->id;

+        $sql .= " AND entity IN (".getEntity('product').")";

 

         $resql = $this->db->query($sql);

         if ($resql) {

@@ -3528,7 +3528,7 @@ 
     {

         global $conf;

         if (!empty($conf->variants->enabled)) {

-            $sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . "product_attribute_combination WHERE fk_product_child = " . $this->id . " AND entity IN (" . getEntity('product') . ")";

+            $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_child = ".$this->id." AND entity IN (".getEntity('product').")";

 

             $query = $this->db->query($sql);

 

@@ -3554,10 +3554,10 @@ 
     public function getFather()

     {

         $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec, p.entity";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_association as pa,";

-        $sql .= " " . MAIN_DB_PREFIX . "product as p";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_association as pa,";

+        $sql .= " ".MAIN_DB_PREFIX."product as p";

         $sql .= " WHERE p.rowid = pa.fk_product_pere";

-        $sql .= " AND pa.fk_product_fils = " . $this->id;

+        $sql .= " AND pa.fk_product_fils = ".$this->id;

 

         $res = $this->db->query($sql);

         if ($res) {

@@ -3592,16 +3592,16 @@ 
         global $alreadyfound;

 

         $sql = "SELECT p.rowid, p.label as label, pa.qty as qty, pa.fk_product_fils as id, p.fk_product_type, pa.incdec";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= ", " . MAIN_DB_PREFIX . "product_association as pa";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= ", ".MAIN_DB_PREFIX."product_association as pa";

         $sql .= " WHERE p.rowid = pa.fk_product_fils";

-        $sql .= " AND pa.fk_product_pere = " . $id;

-        $sql .= " AND pa.fk_product_fils != " . $id;    // This should not happens, it is to avoid infinite loop if it happens

+        $sql .= " AND pa.fk_product_pere = ".$id;

+        $sql .= " AND pa.fk_product_fils != ".$id; // This should not happens, it is to avoid infinite loop if it happens

 

-        dol_syslog(get_class($this) . '::getChildsArbo id=' . $id . ' level=' . $level, LOG_DEBUG);

+        dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level, LOG_DEBUG);

 

         if ($level == 1) {

-            $alreadyfound = array($id => 1);    // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly

+            $alreadyfound = array($id => 1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly

         }

         // Protection against infinite loop

         if ($level > 30) {

@@ -3613,7 +3613,7 @@ 
             $prods = array();

             while ($rec = $this->db->fetch_array($res)) {

                 if (!empty($alreadyfound[$rec['rowid']])) {

-                    dol_syslog(get_class($this) . '::getChildsArbo the product id=' . $rec['rowid'] . ' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);

+                    dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);

                     continue;

                 }

                 $alreadyfound[$rec['rowid']] = 1;

@@ -3676,7 +3676,7 @@ 
         global $conf, $langs, $hookmanager;

 

         // include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';

-        include_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+        include_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

         $result = '';

         $newref = $this->ref;

@@ -3685,37 +3685,37 @@ 
         }

 

         if ($this->type == Product::TYPE_PRODUCT) {

-            $label = '<u>' . $langs->trans("ShowProduct") . '</u>';

+            $label = '<u>'.$langs->trans("ShowProduct").'</u>';

         }

         if ($this->type == Product::TYPE_SERVICE) {

-            $label = '<u>' . $langs->trans("ShowService") . '</u>';

+            $label = '<u>'.$langs->trans("ShowService").'</u>';

         }

         if (!empty($this->ref)) {

-            $label .= '<br><b>' . $langs->trans('ProductRef') . ':</b> ' . $this->ref;

+            $label .= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;

         }

         if (!empty($this->label)) {

-            $label .= '<br><b>' . $langs->trans('ProductLabel') . ':</b> ' . $this->label;

+            $label .= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;

         }

 

         if ($this->type == Product::TYPE_PRODUCT) {

             if ($this->weight) {

-                $label .= "<br><b>" . $langs->trans("Weight") . '</b>: ' . $this->weight . ' ' . measuring_units_string($this->weight_units, "weight");

+                $label .= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuring_units_string($this->weight_units, "weight");

             }

             if ($this->length) {

-                $label .= "<br><b>" . $langs->trans("Length") . '</b>: ' . $this->length . ' ' . measuring_units_string($this->length_units, 'length');

+                $label .= "<br><b>".$langs->trans("Length").'</b>: '.$this->length.' '.measuring_units_string($this->length_units, 'length');

             }

             if ($this->surface) {

-                $label .= "<br><b>" . $langs->trans("Surface") . '</b>: ' . $this->surface . ' ' . measuring_units_string($this->surface_units, 'surface');

+                $label .= "<br><b>".$langs->trans("Surface").'</b>: '.$this->surface.' '.measuring_units_string($this->surface_units, 'surface');

             }

             if ($this->volume) {

-                $label .= "<br><b>" . $langs->trans("Volume") . '</b>: ' . $this->volume . ' ' . measuring_units_string($this->volume_units, 'volume');

+                $label .= "<br><b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuring_units_string($this->volume_units, 'volume');

             }

         }

 

         if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {

             if (!empty($conf->productbatch->enabled)) {

                 $langs->load("productbatch");

-                $label .= "<br><b>" . $langs->trans("ManageLotSerial") . '</b>: ' . $this->getLibStatut(0, 2);

+                $label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);

             }

         }

         //if ($this->type == Product::TYPE_SERVICE)

@@ -3723,19 +3723,19 @@ 
         //

         //}

         if (!empty($conf->accounting->enabled) && $this->status) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

-            $label .= '<br><b>' . $langs->trans('ProductAccountancySellCode') . ':</b> ' . length_accountg($this->accountancy_code_sell);

-            $label .= '<br><b>' . $langs->trans('ProductAccountancySellIntraCode') . ':</b> ' . length_accountg($this->accountancy_code_sell_export);

-            $label .= '<br><b>' . $langs->trans('ProductAccountancySellExportCode') . ':</b> ' . length_accountg($this->accountancy_code_sell_intra);

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

+            $label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);

+            $label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_export);

+            $label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);

         }

         if (!empty($conf->accounting->enabled) && $this->status_buy) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';

-            $label .= '<br><b>' . $langs->trans('ProductAccountancyBuyCode') . ':</b> ' . length_accountg($this->accountancy_code_buy);

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';

+            $label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);

         }

         if (!empty($this->entity)) {

             $tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);

             if ($this->nbphoto > 0) {

-                $label .= '<br>' . $tmpphoto;

+                $label .= '<br>'.$tmpphoto;

             }

         }

 

@@ -3743,10 +3743,10 @@ 
         if (empty($notooltip)) {

             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 $label = $langs->trans("ShowProduct");

-                $linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';

+                $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';

             }

 

-            $linkclose .= ' title="' . dol_escape_htmltag($label, 1, 1) . '"';

+            $linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';

             $linkclose .= ' class="classfortooltip"';

 

             /*

@@ -3759,16 +3759,16 @@ 
 

         if ($option == 'supplier' || $option == 'category') {

             // $url = DOL_URL_ROOT . '/product/fournisseurs.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=product&method=fournisseurs&id=' . $this->id;

+            $url = BASE_URI.'?controller=product&method=fournisseurs&id='.$this->id;

         } else if ($option == 'stock') {

             // $url = DOL_URL_ROOT . '/product/stock/product.php?id=' . $this->id;

-            $url = BASE_URI . '?controller/stock=product&method=product&id=' . $this->id;

+            $url = BASE_URI.'?controller/stock=product&method=product&id='.$this->id;

         } else if ($option == 'composition') {

             // $url = DOL_URL_ROOT . '/product/composition/card.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=product/composition&method=card&id=' . $this->id;

+            $url = BASE_URI.'?controller=product/composition&method=card&id='.$this->id;

         } else {

             // $url = DOL_URL_ROOT . '/product/card.php?id=' . $this->id;

-            $url = BASE_URI . '?controller=product&method=card&id=' . $this->id;

+            $url = BASE_URI.'?controller=product&method=card&id='.$this->id;

         }

 

         if ($option !== 'nolink') {

@@ -3782,8 +3782,8 @@ 
             }

         }

 

-        $linkstart = '<a href="' . $url . '"';

-        $linkstart .= $linkclose . '>';

+        $linkstart = '<a href="'.$url.'"';

+        $linkstart .= $linkclose.'>';

         $linkend = '</a>';

 

         $result .= $linkstart;

@@ -3801,7 +3801,7 @@ 
         global $action;

         $hookmanager->initHooks(array('productdao'));

         $parameters = array('id' => $this->id, 'getnomurl' => $result);

-        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+        $reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

         if ($reshook > 0) {

             $result = $hookmanager->resPrint;

         } else {

@@ -3889,16 +3889,16 @@ 
                 case 1:

                     return ($status == 0 ? $langs->trans('ProductStatusNotOnBatchShort') : $langs->trans('ProductStatusOnBatchShort'));

                 case 2:

-                    return $this->LibStatut($status, 3, 2) . ' ' . $this->LibStatut($status, 1, 2);

+                    return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 1, 2);

                 case 3:

                     if ($status == 0) {

                         return img_picto($langs->trans('ProductStatusNotOnBatch'), 'statut5');

                     }

                     return img_picto($langs->trans('ProductStatusOnBatch'), 'statut4');

                 case 4:

-                    return $this->LibStatut($status, 3, 2) . ' ' . $this->LibStatut($status, 0, 2);

+                    return $this->LibStatut($status, 3, 2).' '.$this->LibStatut($status, 0, 2);

                 case 5:

-                    return $this->LibStatut($status, 1, 2) . ' ' . $this->LibStatut($status, 3, 2);

+                    return $this->LibStatut($status, 1, 2).' '.$this->LibStatut($status, 3, 2);

                 default:

                     return $langs->trans('Unknown');

             }

@@ -3917,9 +3917,9 @@ 
             }

         } elseif ($mode == 2) {

             if ($status == 0) {

-                return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"') . ' ' . ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort'));

+                return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort'));

             } elseif ($status == 1) {

-                return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"') . ' ' . ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort'));

+                return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort'));

             }

         } elseif ($mode == 3) {

             if ($status == 0) {

@@ -3929,21 +3929,21 @@ 
             }

         } elseif ($mode == 4) {

             if ($status == 0) {

-                return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"') . ' ' . ($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy'));

+                return img_picto($langs->trans('ProductStatusNotOnSell'), 'statut5', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy'));

             } elseif ($status == 1) {

-                return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"') . ' ' . ($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy'));

+                return img_picto($langs->trans('ProductStatusOnSell'), 'statut4', 'class="pictostatus"').' '.($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy'));

             }

         } elseif ($mode == 5) {

             if ($status == 0) {

-                return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')) . ' ' . img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');

+                return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');

             } elseif ($status == 1) {

-                return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')) . ' ' . img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');

+                return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');

             }

         } elseif ($mode == 6) {

             if ($status == 0) {

-                return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')) . ' ' . img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');

+                return ($type == 0 ? $langs->trans('ProductStatusNotOnSellShort') : $langs->trans('ProductStatusNotOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusNotOnSell') : $langs->trans('ProductStatusNotOnBuy')), 'statut5', 'class="pictostatus"');

             } elseif ($status == 1) {

-                return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')) . ' ' . img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');

+                return ($type == 0 ? $langs->trans('ProductStatusOnSellShort') : $langs->trans('ProductStatusOnBuyShort')).' '.img_picto(($type == 0 ? $langs->trans('ProductStatusOnSell') : $langs->trans('ProductStatusOnBuy')), 'statut4', 'class="pictostatus"');

             }

         }

         return $langs->trans('Unknown');

@@ -3989,10 +3989,10 @@ 
         if ($id_entrepot) {

             $this->db->begin();

 

-            include_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';

 

-            $op[0] = "+" . trim($nbpiece);

-            $op[1] = "-" . trim($nbpiece);

+            $op[0] = "+".trim($nbpiece);

+            $op[1] = "-".trim($nbpiece);

 

             $movementstock = new MouvementStock($this->db);

             $movementstock->setOrigin($origin_element, $origin_id);

@@ -4035,10 +4035,10 @@ 
         if ($id_entrepot) {

             $this->db->begin();

 

-            include_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';

 

-            $op[0] = "+" . trim($nbpiece);

-            $op[1] = "-" . trim($nbpiece);

+            $op[0] = "+".trim($nbpiece);

+            $op[1] = "-".trim($nbpiece);

 

             $movementstock = new MouvementStock($this->db);

             $movementstock->setOrigin($origin_element, $origin_id);

@@ -4089,16 +4089,16 @@ 
         }

 

         $sql = "SELECT ps.rowid, ps.reel, ps.fk_entrepot";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product_stock as ps";

-        $sql .= ", " . MAIN_DB_PREFIX . "entrepot as w";

-        $sql .= " WHERE w.entity IN (" . getEntity('stock') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";

+        $sql .= ", ".MAIN_DB_PREFIX."entrepot as w";

+        $sql .= " WHERE w.entity IN (".getEntity('stock').")";

         $sql .= " AND w.rowid = ps.fk_entrepot";

-        $sql .= " AND ps.fk_product = " . $this->id;

+        $sql .= " AND ps.fk_product = ".$this->id;

         if ($conf->global->ENTREPOT_EXTRA_STATUS && count($warehouseStatus)) {

-            $sql .= " AND w.statut IN (" . $this->db->escape(implode(',', $warehouseStatus)) . ")";

+            $sql .= " AND w.statut IN (".$this->db->escape(implode(',', $warehouseStatus)).")";

         }

 

-        dol_syslog(get_class($this) . "::load_stock", LOG_DEBUG);

+        dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             $num = $this->db->num_rows($result);

@@ -4119,7 +4119,7 @@ 
             $this->db->free($result);

 

             if (!preg_match('/novirtual/', $option)) {

-                $this->load_virtual_stock();        // This also load stats_commande_fournisseur, ...

+                $this->load_virtual_stock(); // This also load stats_commande_fournisseur, ...

             }

 

             return 1;

@@ -4196,7 +4196,7 @@ 
         }

 

         if (!is_object($hookmanager)) {

-            include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

             $hookmanager = new HookManager($this->db);

         }

         $hookmanager->initHooks(array('productdao'));

@@ -4220,10 +4220,10 @@ 
     {

         $result = array();

 

-        $sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM " . MAIN_DB_PREFIX . "product_batch as pb, " . MAIN_DB_PREFIX . "product_stock as ps";

-        $sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = " . $this->id . " AND pb.batch = '" . $this->db->escape($batch) . "'";

+        $sql = "SELECT pb.batch, pb.eatby, pb.sellby, SUM(pb.qty) FROM ".MAIN_DB_PREFIX."product_batch as pb, ".MAIN_DB_PREFIX."product_stock as ps";

+        $sql .= " WHERE pb.fk_product_stock = ps.rowid AND ps.fk_product = ".$this->id." AND pb.batch = '".$this->db->escape($batch)."'";

         $sql .= " GROUP BY pb.batch, pb.eatby, pb.sellby";

-        dol_syslog(get_class($this) . "::loadBatchInfo load first entry found for lot/serial = " . $batch, LOG_DEBUG);

+        dol_syslog(get_class($this)."::loadBatchInfo load first entry found for lot/serial = ".$batch, LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $num = $this->db->num_rows($resql);

@@ -4254,15 +4254,15 @@ 
         // phpcs:enable

         global $conf;

 

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

         $result = 0;

 

         $dir = $sdir;

         if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

-            $dir .= '/' . get_exdir($this->id, 2, 0, 0, $this, 'product') . $this->id . "/photos";

+            $dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos";

         } else {

-            $dir .= '/' . get_exdir(0, 0, 0, 0, $this, 'product') . dol_sanitizeFileName($this->ref);

+            $dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref);

         }

 

         dol_mkdir($dir);

@@ -4270,7 +4270,7 @@ 
         $dir_osencoded = $dir;

 

         if (is_dir($dir_osencoded)) {

-            $originImage = $dir . '/' . $file['name'];

+            $originImage = $dir.'/'.$file['name'];

 

             // Cree fichier en taille origine

             $result = dol_move_uploaded_file($file['tmp_name'], $originImage, 1);

@@ -4298,16 +4298,16 @@ 
     function is_photo_available($sdir)

     {

         // phpcs:enable

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

         global $conf;

 

         $dir = $sdir;

         if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {

-            $dir .= '/' . get_exdir($this->id, 2, 0, 0, $this, 'product') . $this->id . "/photos/";

+            $dir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'product').$this->id."/photos/";

         } else {

-            $dir .= '/' . get_exdir(0, 0, 0, 0, $this, 'product') . dol_sanitizeFileName($this->ref) . '/';

+            $dir .= '/'.get_exdir(0, 0, 0, 0, $this, 'product').dol_sanitizeFileName($this->ref).'/';

         }

 

         $nbphoto = 0;

@@ -4318,9 +4318,9 @@ 
             if (is_resource($handle)) {

                 while (($file = readdir($handle)) !== false) {

                     if (!utf8_check($file)) {

-                        $file = utf8_encode($file);    // To be sure data is stored in UTF8 in memory

+                        $file = utf8_encode($file); // To be sure data is stored in UTF8 in memory

                     }

-                    if (dol_is_file($dir . $file) && image_format_supported($file) > 0) {

+                    if (dol_is_file($dir.$file) && image_format_supported($file) > 0) {

                         return true;

                     }

                 }

@@ -4340,8 +4340,8 @@ 
     function liste_photos($dir, $nbmax = 0)

     {

         // phpcs:enable

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

         $nbphoto = 0;

         $tabobj = array();

@@ -4351,25 +4351,25 @@ 
         if (is_resource($handle)) {

             while (($file = readdir($handle)) !== false) {

                 if (!utf8_check($file)) {

-                    $file = utf8_encode($file);    // readdir returns ISO

+                    $file = utf8_encode($file); // readdir returns ISO

                 }

-                if (dol_is_file($dir . $file) && image_format_supported($file) >= 0) {

+                if (dol_is_file($dir.$file) && image_format_supported($file) >= 0) {

                     $nbphoto++;

 

                     // On determine nom du fichier vignette

                     $photo = $file;

                     $photo_vignette = '';

-                    if (preg_match('/(' . $this->regeximgext . ')$/i', $photo, $regs)) {

-                        $photo_vignette = preg_replace('/' . $regs[0] . '/i', '', $photo) . '_small' . $regs[0];

+                    if (preg_match('/('.$this->regeximgext.')$/i', $photo, $regs)) {

+                        $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $photo).'_small'.$regs[0];

                     }

 

-                    $dirthumb = $dir . 'thumbs/';

+                    $dirthumb = $dir.'thumbs/';

 

                     // Objet

                     $obj = array();

                     $obj['photo'] = $photo;

-                    if ($photo_vignette && dol_is_file($dirthumb . $photo_vignette)) {

-                        $obj['photo_vignette'] = 'thumbs/' . $photo_vignette;

+                    if ($photo_vignette && dol_is_file($dirthumb.$photo_vignette)) {

+                        $obj['photo_vignette'] = 'thumbs/'.$photo_vignette;

                     } else {

                         $obj['photo_vignette'] = "";

                     }

@@ -4399,24 +4399,24 @@ 
     function delete_photo($file)

     {

         // phpcs:enable

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';

 

-        $dir = dirname($file) . '/'; // Chemin du dossier contenant l'image d'origine

-        $dirthumb = $dir . '/thumbs/'; // Chemin du dossier contenant la vignette

-        $filename = preg_replace('/' . preg_quote($dir, '/') . '/i', '', $file); // Nom du fichier

+        $dir = dirname($file).'/'; // Chemin du dossier contenant l'image d'origine

+        $dirthumb = $dir.'/thumbs/'; // Chemin du dossier contenant la vignette

+        $filename = preg_replace('/'.preg_quote($dir, '/').'/i', '', $file); // Nom du fichier

         // On efface l'image d'origine

         dol_delete_file($file, 0, 0, 0, $this); // For triggers

         // Si elle existe, on efface la vignette

-        if (preg_match('/(' . $this->regeximgext . ')$/i', $filename, $regs)) {

-            $photo_vignette = preg_replace('/' . $regs[0] . '/i', '', $filename) . '_small' . $regs[0];

-            if (file_exists(dol_osencode($dirthumb . $photo_vignette))) {

-                dol_delete_file($dirthumb . $photo_vignette);

+        if (preg_match('/('.$this->regeximgext.')$/i', $filename, $regs)) {

+            $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_small'.$regs[0];

+            if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {

+                dol_delete_file($dirthumb.$photo_vignette);

             }

 

-            $photo_vignette = preg_replace('/' . $regs[0] . '/i', '', $filename) . '_mini' . $regs[0];

-            if (file_exists(dol_osencode($dirthumb . $photo_vignette))) {

-                dol_delete_file($dirthumb . $photo_vignette);

+            $photo_vignette = preg_replace('/'.$regs[0].'/i', '', $filename).'_mini'.$regs[0];

+            if (file_exists(dol_osencode($dirthumb.$photo_vignette))) {

+                dol_delete_file($dirthumb.$photo_vignette);

             }

         }

     }

@@ -4451,12 +4451,12 @@ 
         $this->nb = array();

 

         $sql = "SELECT count(p.rowid) as nb, fk_product_type";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= ' WHERE p.entity IN (' . getEntity($this->element, 1) . ')';

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= ' WHERE p.entity IN ('.getEntity($this->element, 1).')';

         // Add where from hooks

         if (is_object($hookmanager)) {

             $parameters = array();

-            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook

             $sql .= $hookmanager->resPrint;

         }

         $sql .= ' GROUP BY fk_product_type';

@@ -4517,7 +4517,7 @@ 
         if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {

             $dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);

             foreach ($dirsociete as $dirroot) {

-                $res = dol_include_once($dirroot . $conf->global->BARCODE_PRODUCT_ADDON_NUM . '.php');

+                $res = dol_include_once($dirroot.$conf->global->BARCODE_PRODUCT_ADDON_NUM.'.php');

                 if ($res) {

                     break;

                 }

@@ -4527,7 +4527,7 @@ 
 

             $result = $mod->getNextValue($object, $type);

 

-            dol_syslog(get_class($this) . "::get_barcode barcode=" . $result . " module=" . $var);

+            dol_syslog(get_class($this)."::get_barcode barcode=".$result." module=".$var);

         }

         return $result;

     }

@@ -4550,7 +4550,7 @@ 
         $this->id = 0;

         $this->ref = 'PRODUCT_SPEC';

         $this->label = 'PRODUCT SPECIMEN';

-        $this->description = 'This is description of this product specimen that was created the ' . dol_print_date($now, 'dayhourlog') . '.';

+        $this->description = 'This is description of this product specimen that was created the '.dol_print_date($now, 'dayhourlog').'.';

         $this->specimen = 1;

         $this->country_id = 1;

         $this->tosell = 1;

@@ -4575,7 +4575,7 @@ 
         $this->volume = 300;

         $this->volume_unit = 0;

 

-        $this->barcode = -1;    // Create barcode automatically

+        $this->barcode = -1; // Create barcode automatically

     }

 

     /**

@@ -4600,7 +4600,7 @@ 
             $label_type = 'short_label';

         }

 

-        $sql = 'select ' . $label_type . ' from ' . MAIN_DB_PREFIX . 'c_units where rowid=' . $this->fk_unit;

+        $sql = 'select '.$label_type.' from '.MAIN_DB_PREFIX.'c_units where rowid='.$this->fk_unit;

         $resql = $this->db->query($sql);

         if ($resql && $this->db->num_rows($resql) > 0) {

             $res = $this->db->fetch_array($resql);

@@ -4608,8 +4608,8 @@ 
             $this->db->free($resql);

             return $label;

         } else {

-            $this->error = $this->db->error() . ' sql=' . $sql;

-            dol_syslog(get_class($this) . "::getLabelOfUnit Error " . $this->error, LOG_ERR);

+            $this->error = $this->db->error().' sql='.$sql;

+            dol_syslog(get_class($this)."::getLabelOfUnit Error ".$this->error, LOG_ERR);

             return -1;

         }

     }

@@ -4638,7 +4638,7 @@ 
         $maxpricesupplier = 0;

 

         if (!empty($conf->global->PRODUCT_MINIMUM_RECOMMENDED_PRICE)) {

-            include_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

             $product_fourn = new ProductFournisseur($this->db);

             $product_fourn_list = $product_fourn->list_product_fournisseur_price($this->id, '', '');

 

@@ -4674,7 +4674,7 @@ 
         }

 

         // Get current categories

-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

         $c = new Categorie($this->db);

         $existing = $c->containing($this->id, Categorie::TYPE_PRODUCT, 'id');

 

@@ -4735,7 +4735,7 @@ 
     {

         global $conf, $db;

 

-        $sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM " . MAIN_DB_PREFIX . "product_pricerules";

+        $sql = "SELECT rowid, level, fk_level, var_percent, var_min_percent FROM ".MAIN_DB_PREFIX."product_pricerules";

         $query = $db->query($sql);

 

         $rules = array();

@@ -4809,8 +4809,8 @@ 
     {

         $sql = "SELECT p.rowid, p.ref, p.datec as date_creation, p.tms as date_modification,";

         $sql .= " p.fk_user_author, p.fk_user_modif";

-        $sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element . " as p";

-        $sql .= " WHERE p.rowid = " . $id;

+        $sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as p";

+        $sql .= " WHERE p.rowid = ".$id;

 

         $result = $this->db->query($sql);

         if ($result) {

Braces +15 added lines, -10 removed lines

@@ -4149,25 +4149,29 @@ 
 

         if (!empty($conf->commande->enabled)) {

             $result = $this->load_stats_commande(0, '1,2', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_commande_client = $this->stats_commande['qty'];

         }

         if (!empty($conf->expedition->enabled)) {

             $result = $this->load_stats_sending(0, '1,2', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_sending_client = $this->stats_expedition['qty'];

         }

         if (!empty($conf->fournisseur->enabled)) {

             $result = $this->load_stats_commande_fournisseur(0, '1,2,3,4', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_commande_fournisseur = $this->stats_commande_fournisseur['qty'];

 

             $result = $this->load_stats_reception(0, '4', 1);

-            if ($result < 0)

-                dol_print_error($this->db, $this->error);

+            if ($result < 0) {
+                            dol_print_error($this->db, $this->error);
+            }
             $stock_reception_fournisseur = $this->stats_reception['qty'];

         }

 

@@ -4203,8 +4207,9 @@ 
         $parameters = array('id' => $this->id);

         // Note that $action and $object may have been modified by some hooks

         $reshook = $hookmanager->executeHooks('loadvirtualstock', $parameters, $this, $action);

-        if ($reshook > 0)

-            $this->stock_theorique = $hookmanager->resArray['stock_theorique'];

+        if ($reshook > 0) {
+                    $this->stock_theorique = $hookmanager->resArray['stock_theorique'];
+        }
 

         return 1;

     }

dolibarr/htdocs/product/list.php

Spacing +127 added lines, -127 removed lines

@@ -34,14 +34,14 @@ 
  */

 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>

 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');

-require DOL_BASE_PATH . '/main.inc.php';

+require DOL_BASE_PATH.'/main.inc.php';

 

-require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';

+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';

 

 if (!empty($conf->categorie->enabled)) {

-    require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 }

 

 // Load translation files required by the page

@@ -80,7 +80,7 @@ 
     $show_childproducts = '';

 }

 

-$diroutputmassaction = $conf->product->dir_output . '/temp/massgeneration/' . $user->id;

+$diroutputmassaction = $conf->product->dir_output.'/temp/massgeneration/'.$user->id;

 

 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;

 $sortfield = GETPOST("sortfield", 'alpha');

@@ -132,7 +132,7 @@ 
 $canvas = GETPOST("canvas");

 $objcanvas = null;

 if (!empty($canvas)) {

-    require_once DOL_DOCUMENT_ROOT . '/core/class/canvas.class.php';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/canvas.class.php';

     $objcanvas = new Canvas($db, $action);

     $objcanvas->getCanvas('product', 'list', $canvas);

 }

@@ -149,7 +149,7 @@ 
 // Define virtualdiffersfromphysical

 $virtualdiffersfromphysical = 0;

 if (!empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION)) {

-    $virtualdiffersfromphysical = 1;  // According to increase/decrease stock options, virtual and physical stock may differs.

+    $virtualdiffersfromphysical = 1; // According to increase/decrease stock options, virtual and physical stock may differs.

 }

 

 // List of fields to search into when doing a "search in all"

@@ -198,14 +198,14 @@ 
     'p.accountancy_code_buy' => array('label' => $langs->trans("ProductAccountancyBuyCode"), 'checked' => 0),

     'p.datec' => array('label' => $langs->trans("DateCreation"), 'checked' => 0, 'position' => 500),

     'p.tms' => array('label' => $langs->trans("DateModificationShort"), 'checked' => 0, 'position' => 500),

-    'p.tosell' => array('label' => $langs->trans("Status") . ' (' . $langs->trans("Sell") . ')', 'checked' => 1, 'position' => 1000),

-    'p.tobuy' => array('label' => $langs->trans("Status") . ' (' . $langs->trans("Buy") . ')', 'checked' => 1, 'position' => 1000)

+    'p.tosell' => array('label' => $langs->trans("Status").' ('.$langs->trans("Sell").')', 'checked' => 1, 'position' => 1000),

+    'p.tobuy' => array('label' => $langs->trans("Status").' ('.$langs->trans("Buy").')', 'checked' => 1, 'position' => 1000)

 );

 // Extra fields

 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {

     foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

         if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {

-            $arrayfields["ef." . $key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => (abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));

+            $arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => (($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1), 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' => (abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]));

         }

     }

 }

@@ -226,14 +226,14 @@ 
 }

 

 $parameters = array();

-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);    // Note that $action and $object may have been modified by some hooks

+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks

 if ($reshook < 0) {

     setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');

 }

 

 if (empty($reshook)) {

     // Selection of new fields

-    include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';

+    include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';

 

     // Purge search criteria

     if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers

@@ -265,7 +265,7 @@ 
     $permtoread = $user->rights->produit->lire;

     $permtodelete = $user->rights->produit->supprimer;

     $uploaddir = $conf->product->dir_output;

-    include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';

+    include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';

 }

 

 

@@ -292,38 +292,38 @@ 
 $sql .= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy,';

 $sql .= ' p.datec as date_creation, p.tms as date_update, p.pmp,';

 $sql .= ' MIN(pfp.unitprice) as minsellprice';

-if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts )) {

+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {

     $sql .= ', pac.rowid prod_comb_id';

 }

 // Add fields from extrafields

 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

     foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {

-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key . ' as options_' . $key : '');

+        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');

     }

 }

 // Add fields from hooks

 $parameters = array();

-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook

+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook

 $sql .= $hookmanager->resPrint;

-$sql .= ' FROM ' . MAIN_DB_PREFIX . 'product as p';

+$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';

 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_extrafields as ef on (p.rowid = ef.fk_object)";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields as ef on (p.rowid = ef.fk_object)";

 }

 if (!empty($search_categ) || !empty($catid)) {

-    $sql .= ' LEFT JOIN ' . MAIN_DB_PREFIX . "categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ

+    $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ

 }

-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

 // multilang

 if (!empty($conf->global->MAIN_MULTILANGS)) {

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '" . $langs->getDefaultLang() . "'";

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang = '".$langs->getDefaultLang()."'";

 }

 

-if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts )) {

-    $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination pac ON pac.fk_product_child = p.rowid";

+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {

+    $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";

 }

 

 

-$sql .= ' WHERE p.entity IN (' . getEntity('product') . ')';

+$sql .= ' WHERE p.entity IN ('.getEntity('product').')';

 if ($sall) {

     $sql .= natural_search(array_keys($fieldstosearchall), $sall);

 }

@@ -336,7 +336,7 @@ 
     }

 }

 

-if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts )) {

+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {

     $sql .= " AND pac.rowid IS NULL";

 }

 

@@ -347,49 +347,49 @@ 
 if ($search_barcode)

     $sql .= natural_search('p.barcode', $search_barcode);

 if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1)

-    $sql .= " AND p.tosell = " . $db->escape($search_tosell);

+    $sql .= " AND p.tosell = ".$db->escape($search_tosell);

 if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)

-    $sql .= " AND p.tobuy = " . $db->escape($search_tobuy);

+    $sql .= " AND p.tobuy = ".$db->escape($search_tobuy);

 if (dol_strlen($canvas) > 0)

-    $sql .= " AND p.canvas = '" . $db->escape($canvas) . "'";

+    $sql .= " AND p.canvas = '".$db->escape($canvas)."'";

 if ($catid > 0)

-    $sql .= " AND cp.fk_categorie = " . $catid;

+    $sql .= " AND cp.fk_categorie = ".$catid;

 if ($catid == -2)

     $sql .= " AND cp.fk_categorie IS NULL";

 if ($search_categ > 0)

-    $sql .= " AND cp.fk_categorie = " . $db->escape($search_categ);

+    $sql .= " AND cp.fk_categorie = ".$db->escape($search_categ);

 if ($search_categ == -2)

     $sql .= " AND cp.fk_categorie IS NULL";

 if ($fourn_id > 0)

-    $sql .= " AND pfp.fk_soc = " . $fourn_id;

+    $sql .= " AND pfp.fk_soc = ".$fourn_id;

 if ($search_tobatch != '' && $search_tobatch >= 0)

-    $sql .= " AND p.tobatch = " . $db->escape($search_tobatch);

+    $sql .= " AND p.tobatch = ".$db->escape($search_tobatch);

 if ($search_accountancy_code_sell)

     $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);

 if ($search_accountancy_code_buy)

     $sql .= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);

 

 // Add where from extra fields

-include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';

+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';

 // Add where from hooks

 $parameters = array();

-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook

+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook

 $sql .= $hookmanager->resPrint;

 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type,";

 $sql .= " p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";

 $sql .= ' p.datec, p.tms, p.entity, p.tobatch, p.accountancy_code_sell, p.accountancy_code_sell_intra, p.accountancy_code_sell_export, p.accountancy_code_buy, p.pmp';

 

-if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts )) {

+if (!empty($conf->variants->enabled) && (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD) && !$show_childproducts)) {

     $sql .= ', pac.rowid';

 }

 // Add fields from extrafields

 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

     foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)

-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key : '');

+        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key : '');

 }

 // Add fields from hooks

 $parameters = array();

-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook

+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook

 $sql .= $hookmanager->resPrint;

 //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet

 $sql .= $db->order($sortfield, $sortorder);

@@ -417,7 +417,7 @@ 
         $obj = $db->fetch_object($resql);

         $id = $obj->rowid;

         //header("Location: ".DOL_URL_ROOT.'/product/card.php?id='.$id);

-        header("Location: " . BASE_URI . '?controller=product&method=card&id=' . $id);

+        header("Location: ".BASE_URI.'?controller=product&method=card&id='.$id);

         exit;

     }

 

@@ -439,64 +439,64 @@ 
 

     $param = '';

     if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {

-        $param .= '&contextpage=' . urlencode($contextpage);

+        $param .= '&contextpage='.urlencode($contextpage);

     }

     if ($limit > 0 && $limit != $conf->liste_limit) {

-        $param .= '&limit=' . urlencode($limit);

+        $param .= '&limit='.urlencode($limit);

     }

     if ($sall) {

-        $param .= "&sall=" . urlencode($sall);

+        $param .= "&sall=".urlencode($sall);

     }

     if ($search_categ > 0) {

-        $param .= "&search_categ=" . urlencode($search_categ);

+        $param .= "&search_categ=".urlencode($search_categ);

     }

     if ($search_ref) {

-        $param = "&search_ref=" . urlencode($search_ref);

+        $param = "&search_ref=".urlencode($search_ref);

     }

     if ($search_ref_supplier) {

-        $param = "&search_ref_supplier=" . urlencode($search_ref_supplier);

+        $param = "&search_ref_supplier=".urlencode($search_ref_supplier);

     }

     if ($search_barcode) {

-        $param .= ($search_barcode ? "&search_barcode=" . urlencode($search_barcode) : "");

+        $param .= ($search_barcode ? "&search_barcode=".urlencode($search_barcode) : "");

     }

     if ($search_label) {

-        $param .= "&search_label=" . urlencode($search_label);

+        $param .= "&search_label=".urlencode($search_label);

     }

     if ($search_tosell != '') {

-        $param .= "&search_tosell=" . urlencode($search_tosell);

+        $param .= "&search_tosell=".urlencode($search_tosell);

     }

     if ($search_tobuy != '') {

-        $param .= "&search_tobuy=" . urlencode($search_tobuy);

+        $param .= "&search_tobuy=".urlencode($search_tobuy);

     }

     if ($fourn_id > 0) {

-        $param .= ($fourn_id ? "&fourn_id=" . $fourn_id : "");

+        $param .= ($fourn_id ? "&fourn_id=".$fourn_id : "");

     }

     if ($seach_categ) {

-        $param .= ($search_categ ? "&search_categ=" . urlencode($search_categ) : "");

+        $param .= ($search_categ ? "&search_categ=".urlencode($search_categ) : "");

     }

     if ($show_childproducts) {

-        $param .= ($show_childproducts ? "&search_show_childproducts=" . urlencode($show_childproducts) : "");

+        $param .= ($show_childproducts ? "&search_show_childproducts=".urlencode($show_childproducts) : "");

     }

     if ($type != '') {

-        $param .= '&type=' . urlencode($type);

+        $param .= '&type='.urlencode($type);

     }

     if ($search_type != '') {

-        $param .= '&search_type=' . urlencode($search_type);

+        $param .= '&search_type='.urlencode($search_type);

     }

     if ($optioncss != '') {

-        $param .= '&optioncss=' . urlencode($optioncss);

+        $param .= '&optioncss='.urlencode($optioncss);

     }

     if ($search_tobatch) {

-        $param = "&search_ref_supplier=" . urlencode($search_ref_supplier);

+        $param = "&search_ref_supplier=".urlencode($search_ref_supplier);

     }

     if ($search_accountancy_code_sell) {

-        $param = "&search_accountancy_code_sell=" . urlencode($search_accountancy_code_sell);

+        $param = "&search_accountancy_code_sell=".urlencode($search_accountancy_code_sell);

     }

     if ($search_accountancy_code_buy) {

-        $param = "&search_accountancy_code_buy=" . urlencode($search_accountancy_code_buy);

+        $param = "&search_accountancy_code_buy=".urlencode($search_accountancy_code_buy);

     }

     // Add $param from extra fields

-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_param.tpl.php';

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';

 

     // List of mass actions available

     $arrayofmassactions = array(

@@ -521,51 +521,51 @@ 
             $label = 'NewService';

         }

         //$newcardbutton='<a class="butActionNew" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type='.$type.'"><span class="valignmiddle">'.$langs->trans($label).'</span>';

-        $newcardbutton = '<a class="butActionNew" href="' . BASE_URI . '?controller=product&method=card&action=create&amp;type=' . $type . '"><span class="valignmiddle">' . $langs->trans($label) . '</span>';

+        $newcardbutton = '<a class="butActionNew" href="'.BASE_URI.'?controller=product&method=card&action=create&amp;type='.$type.'"><span class="valignmiddle">'.$langs->trans($label).'</span>';

         $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';

         $newcardbutton .= '</a>';

     }

 

-    print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formulaire">';

+    print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';

     if ($optioncss != '')

-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';

-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+        print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

     print '<input type="hidden" name="action" value="list">';

-    print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';

-    print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

-    print '<input type="hidden" name="page" value="' . $page . '">';

-    print '<input type="hidden" name="type" value="' . $type . '">';

+    print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

+    print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

+    print '<input type="hidden" name="page" value="'.$page.'">';

+    print '<input type="hidden" name="type" value="'.$type.'">';

     if (empty($arrayfields['p.fk_product_type']['checked']))

-        print '<input type="hidden" name="search_type" value="' . dol_escape_htmltag($search_type) . '">';

+        print '<input type="hidden" name="search_type" value="'.dol_escape_htmltag($search_type).'">';

 

     print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);

 

     $topicmail = "Information";

     $modelmail = "product";

     $objecttmp = new Product($db);

-    $trackid = 'prod' . $object->id;

-    include DOL_DOCUMENT_ROOT . '/core/tpl/massactions_pre.tpl.php';

+    $trackid = 'prod'.$object->id;

+    include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';

 

     if (!empty($catid)) {

         print "<div id='ways'>";

         $c = new Categorie($db);

         $ways = $c->print_all_ways(' &gt; ', 'product/list.php');

-        print " &gt; " . $ways[0] . "<br>\n";

+        print " &gt; ".$ways[0]."<br>\n";

         print "</div><br>";

     }

 

     if ($sall) {

         foreach ($fieldstosearchall as $key => $val)

             $fieldstosearchall[$key] = $langs->trans($val);

-        print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall) . '</div>';

+        print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';

     }

 

     // Filter on categories

     $moreforfilter = '';

     if (!empty($conf->categorie->enabled)) {

         $moreforfilter .= '<div class="divsearchfield">';

-        $moreforfilter .= $langs->trans('Categories') . ': ';

+        $moreforfilter .= $langs->trans('Categories').': ';

         $moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);

         $moreforfilter .= '</div>';

     }

@@ -573,13 +573,13 @@ 
     //Show/hide child products. Hidden by default

     if (!empty($conf->variants->enabled) && !empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {

         $moreforfilter .= '<div class="divsearchfield">';

-        $moreforfilter .= '<input type="checkbox" id="search_show_childproducts" name="search_show_childproducts"' . ($show_childproducts ? 'checked="checked"' : '') . '>';

-        $moreforfilter .= ' <label for="search_show_childproducts">' . $langs->trans('ShowChildProducts') . '</label>';

+        $moreforfilter .= '<input type="checkbox" id="search_show_childproducts" name="search_show_childproducts"'.($show_childproducts ? 'checked="checked"' : '').'>';

+        $moreforfilter .= ' <label for="search_show_childproducts">'.$langs->trans('ShowChildProducts').'</label>';

         $moreforfilter .= '</div>';

     }

 

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook

+    $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook

     if (empty($reshook))

         $moreforfilter .= $hookmanager->resPrint;

     else

@@ -597,23 +597,23 @@ 
         $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

 

     print '<div class="div-table-responsive">';

-    print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

+    print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

 

     // Lines with input filters

     print '<tr class="liste_titre_filter">';

     if (!empty($arrayfields['p.ref']['checked'])) {

         print '<td class="liste_titre" align="left">';

-        print '<input class="flat" type="text" name="search_ref" size="8" value="' . dol_escape_htmltag($search_ref) . '">';

+        print '<input class="flat" type="text" name="search_ref" size="8" value="'.dol_escape_htmltag($search_ref).'">';

         print '</td>';

     }

     if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {

         print '<td class="liste_titre" align="left">';

-        print '<input class="flat" type="text" name="search_ref_supplier" size="8" value="' . dol_escape_htmltag($search_ref_supplier) . '">';

+        print '<input class="flat" type="text" name="search_ref_supplier" size="8" value="'.dol_escape_htmltag($search_ref_supplier).'">';

         print '</td>';

     }

     if (!empty($arrayfields['p.label']['checked'])) {

         print '<td class="liste_titre" align="left">';

-        print '<input class="flat" type="text" name="search_label" size="12" value="' . dol_escape_htmltag($search_label) . '">';

+        print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';

         print '</td>';

     }

     // Type

@@ -626,7 +626,7 @@ 
     // Barcode

     if (!empty($arrayfields['p.barcode']['checked'])) {

         print '<td class="liste_titre">';

-        print '<input class="flat" type="text" name="search_barcode" size="6" value="' . dol_escape_htmltag($search_barcode) . '">';

+        print '<input class="flat" type="text" name="search_barcode" size="6" value="'.dol_escape_htmltag($search_barcode).'">';

         print '</td>';

     }

     // Duration

@@ -680,21 +680,21 @@ 
     }

     // To batch

     if (!empty($arrayfields['p.tobatch']['checked'])) {

-        print '<td class="liste_titre center">' . $form->selectyesno($search_tobatch, '', '', '', 1) . '</td>';

+        print '<td class="liste_titre center">'.$form->selectyesno($search_tobatch, '', '', '', 1).'</td>';

     }

     // Accountancy code sell

     if (!empty($arrayfields['p.accountancy_code_sell']['checked'])) {

-        print '<td class="liste_titre"><input class="flat" type="text" name="search_accountancy_code_sell" size="6" value="' . dol_escape_htmltag($search_accountancy_code_sell) . '"></td>';

+        print '<td class="liste_titre"><input class="flat" type="text" name="search_accountancy_code_sell" size="6" value="'.dol_escape_htmltag($search_accountancy_code_sell).'"></td>';

     }

     // Accountancy code sell

     if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {

-        print '<td class="liste_titre"><input class="flat" type="text" name="search_accountancy_code_buy" size="6" value="' . dol_escape_htmltag($search_accountancy_code_buy) . '"></td>';

+        print '<td class="liste_titre"><input class="flat" type="text" name="search_accountancy_code_buy" size="6" value="'.dol_escape_htmltag($search_accountancy_code_buy).'"></td>';

     }

     // Extra fields

-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_input.tpl.php';

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';

     // Fields from hook

     $parameters = array('arrayfields' => $arrayfields);

-    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters);    // Note that $action and $object may have been modified by hook

+    $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook

     print $hookmanager->resPrint;

     // Date creation

     if (!empty($arrayfields['p.datec']['checked'])) {

@@ -777,10 +777,10 @@ 
         print_liste_field_titre($arrayfields['p.accountancy_code_buy']['label'], $_SERVER["PHP_SELF"], "p.accountancy_code_buy", "", $param, '', $sortfield, $sortorder);

     }

     // Extra fields

-    include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_title.tpl.php';

+    include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';

     // Hook fields

     $parameters = array('arrayfields' => $arrayfields, 'param' => $param, 'sortfield' => $sortfield, 'sortorder' => $sortorder);

-    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters);    // Note that $action and $object may have been modified by hook

+    $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook

     print $hookmanager->resPrint;

     if (!empty($arrayfields['p.datec']['checked']))

     {

@@ -813,9 +813,9 @@ 
         // Multilangs

         if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active

             $sql = "SELECT label";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "product_lang";

-            $sql .= " WHERE fk_product=" . $obj->rowid;

-            $sql .= " AND lang='" . $db->escape($langs->getDefaultLang()) . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."product_lang";

+            $sql .= " WHERE fk_product=".$obj->rowid;

+            $sql .= " AND lang='".$db->escape($langs->getDefaultLang())."'";

             $sql .= " LIMIT 1";

 

             $result = $db->query($sql);

@@ -843,7 +843,7 @@ 
 

         if ((!empty($conf->stock->enabled) && $user->rights->stock->lire && $search_type != 1) || !empty($conf->global->STOCK_DISABLE_OPTIM_LOAD)) { // To optimize call of load_stock

             if ($obj->fk_product_type != 1 || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {    // Not a service

-                $product_static->load_stock('nobatch');             // Load stock_reel + stock_warehouse. This also call load_virtual_stock()

+                $product_static->load_stock('nobatch'); // Load stock_reel + stock_warehouse. This also call load_virtual_stock()

             }

         }

 

@@ -856,7 +856,7 @@ 
             print $product_static->getNomUrl(1);

             print "</td>\n";

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Ref supplier

         if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {

@@ -864,27 +864,27 @@ 
             print $product_static->getNomUrl(1);

             print "</td>\n";

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Label

         if (!empty($arrayfields['p.label']['checked'])) {

-            print '<td class="tdoverflowmax200">' . dol_trunc($obj->label, 40) . '</td>';

+            print '<td class="tdoverflowmax200">'.dol_trunc($obj->label, 40).'</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Type

         if (!empty($arrayfields['p.fk_product_type']['checked'])) {

-            print '<td>' . $obj->fk_product_type . '</td>';

+            print '<td>'.$obj->fk_product_type.'</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Barcode

         if (!empty($arrayfields['p.barcode']['checked'])) {

-            print '<td>' . $obj->barcode . '</td>';

+            print '<td>'.$obj->barcode.'</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Duration

@@ -901,13 +901,13 @@ 
                     $dur = array("i" => $langs->trans("Minute"), "h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));

                 }

                 print $duration_value;

-                print (!empty($duration_unit) && isset($dur[$duration_unit]) ? ' ' . $langs->trans($dur[$duration_unit]) : '');

+                print (!empty($duration_unit) && isset($dur[$duration_unit]) ? ' '.$langs->trans($dur[$duration_unit]) : '');

             } else {

                 print $obj->duration;

             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Sell price

@@ -915,13 +915,13 @@ 
             print '<td class="right nowraponall">';

             if ($obj->tosell) {

                 if ($obj->price_base_type == 'TTC')

-                    print price($obj->price_ttc) . ' ' . $langs->trans("TTC");

+                    print price($obj->price_ttc).' '.$langs->trans("TTC");

                 else

-                    print price($obj->price) . ' ' . $langs->trans("HT");

+                    print price($obj->price).' '.$langs->trans("HT");

             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Better buy price

@@ -933,15 +933,15 @@ 
                     if ($product_fourn->product_fourn_price_id > 0) {

                         if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) {

                             $htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);

-                            print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise) . ' ' . $langs->trans("HT"), $htmltext);

+                            print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise).' '.$langs->trans("HT"), $htmltext);

                         } else

-                            print price($product_fourn->fourn_unitprice) . ' ' . $langs->trans("HT");

+                            print price($product_fourn->fourn_unitprice).' '.$langs->trans("HT");

                     }

                 }

             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Number of buy prices

@@ -971,7 +971,7 @@ 
             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Desired stock

         if (!empty($arrayfields['p.desiredstock']['checked'])) {

@@ -981,31 +981,31 @@ 
             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Stock real

         if (!empty($arrayfields['p.stock']['checked'])) {

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

                 if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';

                 print $product_static->stock_reel;

             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Stock virtual

         if (!empty($arrayfields['stock_virtual']['checked'])) {

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

                 if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)).' ';

                 print $product_static->stock_theorique;

             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Lot/Serial

         if (!empty($arrayfields['p.tobatch']['checked'])) {

@@ -1013,25 +1013,25 @@ 
             print yn($obj->tobatch);

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_sell']['checked'])) {

-            print '<td>' . $obj->accountancy_code_sell . '</td>';

+            print '<td>'.$obj->accountancy_code_sell.'</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {

-            print '<td>' . $obj->accountancy_code_buy . '</td>';

+            print '<td>'.$obj->accountancy_code_buy.'</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Extra fields

-        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';

+        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';

         // Fields from hook

         $parameters = array('arrayfields' => $arrayfields, 'obj' => $obj);

-        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook

         print $hookmanager->resPrint;

         // Date creation

         if (!empty($arrayfields['p.datec']['checked'])) {

@@ -1039,7 +1039,7 @@ 
             print dol_print_date($obj->date_creation, 'dayhour', 'tzuser');

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Date modification

         if (!empty($arrayfields['p.tms']['checked'])) {

@@ -1047,7 +1047,7 @@ 
             print dol_print_date($obj->date_update, 'dayhour', 'tzuser');

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

 

         // Status (to sell)

@@ -1060,7 +1060,7 @@ 
             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Status (to buy)

         if (!empty($arrayfields['p.tobuy']['checked'])) {

@@ -1072,7 +1072,7 @@ 
             }

             print '</td>';

             if (!$i)

-                $totalarray['nbfield'] ++;

+                $totalarray['nbfield']++;

         }

         // Action

         print '<td class="nowrap" align="center">';

@@ -1080,11 +1080,11 @@ 
             $selected = 0;

             if (in_array($obj->rowid, $arrayofselected))

                 $selected = 1;

-            print '<input id="cb' . $obj->rowid . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->rowid . '"' . ($selected ? ' checked="checked"' : '') . '>';

+            print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';

         }

         print '</td>';

         if (!$i)

-            $totalarray['nbfield'] ++;

+            $totalarray['nbfield']++;

 

         print "</tr>\n";

         $i++;

Braces +150 added lines, -103 removed lines

@@ -340,34 +340,48 @@ 
     $sql .= " AND pac.rowid IS NULL";

 }

 

-if ($search_ref)

-    $sql .= natural_search('p.ref', $search_ref);

-if ($search_label)

-    $sql .= natural_search('p.label', $search_label);

-if ($search_barcode)

-    $sql .= natural_search('p.barcode', $search_barcode);

-if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1)

-    $sql .= " AND p.tosell = " . $db->escape($search_tosell);

-if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1)

-    $sql .= " AND p.tobuy = " . $db->escape($search_tobuy);

-if (dol_strlen($canvas) > 0)

-    $sql .= " AND p.canvas = '" . $db->escape($canvas) . "'";

-if ($catid > 0)

-    $sql .= " AND cp.fk_categorie = " . $catid;

-if ($catid == -2)

-    $sql .= " AND cp.fk_categorie IS NULL";

-if ($search_categ > 0)

-    $sql .= " AND cp.fk_categorie = " . $db->escape($search_categ);

-if ($search_categ == -2)

-    $sql .= " AND cp.fk_categorie IS NULL";

-if ($fourn_id > 0)

-    $sql .= " AND pfp.fk_soc = " . $fourn_id;

-if ($search_tobatch != '' && $search_tobatch >= 0)

-    $sql .= " AND p.tobatch = " . $db->escape($search_tobatch);

-if ($search_accountancy_code_sell)

-    $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);

-if ($search_accountancy_code_buy)

-    $sql .= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);

+if ($search_ref) {
+    $sql .= natural_search('p.ref', $search_ref);
+}
+if ($search_label) {
+    $sql .= natural_search('p.label', $search_label);
+}
+if ($search_barcode) {
+    $sql .= natural_search('p.barcode', $search_barcode);
+}
+if (isset($search_tosell) && dol_strlen($search_tosell) > 0 && $search_tosell != -1) {
+    $sql .= " AND p.tosell = " . $db->escape($search_tosell);
+}
+if (isset($search_tobuy) && dol_strlen($search_tobuy) > 0 && $search_tobuy != -1) {
+    $sql .= " AND p.tobuy = " . $db->escape($search_tobuy);
+}
+if (dol_strlen($canvas) > 0) {
+    $sql .= " AND p.canvas = '" . $db->escape($canvas) . "'";
+}
+if ($catid > 0) {
+    $sql .= " AND cp.fk_categorie = " . $catid;
+}
+if ($catid == -2) {
+    $sql .= " AND cp.fk_categorie IS NULL";
+}
+if ($search_categ > 0) {
+    $sql .= " AND cp.fk_categorie = " . $db->escape($search_categ);
+}
+if ($search_categ == -2) {
+    $sql .= " AND cp.fk_categorie IS NULL";
+}
+if ($fourn_id > 0) {
+    $sql .= " AND pfp.fk_soc = " . $fourn_id;
+}
+if ($search_tobatch != '' && $search_tobatch >= 0) {
+    $sql .= " AND p.tobatch = " . $db->escape($search_tobatch);
+}
+if ($search_accountancy_code_sell) {
+    $sql .= natural_search('p.accountancy_code_sell', $search_accountancy_code_sell);
+}
+if ($search_accountancy_code_buy) {
+    $sql .= natural_search('p.accountancy_code_buy', $search_accountancy_code_buy);
+}
 

 // Add where from extra fields

 include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_search_sql.tpl.php';

@@ -384,9 +398,10 @@ 
 }

 // Add fields from extrafields

 if (!empty($extrafields->attributes[$object->table_element]['label'])) {

-    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val)

-        $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key : '');

-}

+    foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+            $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef." . $key : '');
+    }
+    }

 // Add fields from hooks

 $parameters = array();

 $reshook = $hookmanager->executeHooks('printFieldSelect', $parameters);    // Note that $action and $object may have been modified by hook

@@ -504,10 +519,12 @@ 
         //'presend'=>$langs->trans("SendByMail"),

         //'builddoc'=>$langs->trans("PDFMerge"),

     );

-    if ($user->rights->produit->supprimer)

-        $arrayofmassactions['predelete'] = $langs->trans("Delete");

-    if (in_array($massaction, array('presend', 'predelete')))

-        $arrayofmassactions = array();

+    if ($user->rights->produit->supprimer) {
+            $arrayofmassactions['predelete'] = $langs->trans("Delete");
+    }
+    if (in_array($massaction, array('presend', 'predelete'))) {
+            $arrayofmassactions = array();
+    }
     $massactionbutton = $form->selectMassAction('', $arrayofmassactions);

 

     $newcardbutton = '';

@@ -527,8 +544,9 @@ 
     }

 

     print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post" name="formulaire">';

-    if ($optioncss != '')

-        print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';

+    if ($optioncss != '') {
+            print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';
+    }
     print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

     print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

     print '<input type="hidden" name="action" value="list">';

@@ -536,8 +554,9 @@ 
     print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

     print '<input type="hidden" name="page" value="' . $page . '">';

     print '<input type="hidden" name="type" value="' . $type . '">';

-    if (empty($arrayfields['p.fk_product_type']['checked']))

-        print '<input type="hidden" name="search_type" value="' . dol_escape_htmltag($search_type) . '">';

+    if (empty($arrayfields['p.fk_product_type']['checked'])) {
+            print '<input type="hidden" name="search_type" value="' . dol_escape_htmltag($search_type) . '">';
+    }
 

     print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_products.png', 0, $newcardbutton, '', $limit);

 

@@ -556,8 +575,9 @@ 
     }

 

     if ($sall) {

-        foreach ($fieldstosearchall as $key => $val)

-            $fieldstosearchall[$key] = $langs->trans($val);

+        foreach ($fieldstosearchall as $key => $val) {
+                    $fieldstosearchall[$key] = $langs->trans($val);
+        }
         print '<div class="divsearchfieldfilter">' . $langs->trans("FilterOnInto", $sall) . join(', ', $fieldstosearchall) . '</div>';

     }

 

@@ -580,10 +600,11 @@ 
 

     $parameters = array();

     $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters);    // Note that $action and $object may have been modified by hook

-    if (empty($reshook))

-        $moreforfilter .= $hookmanager->resPrint;

-    else

-        $moreforfilter = $hookmanager->resPrint;

+    if (empty($reshook)) {
+            $moreforfilter .= $hookmanager->resPrint;
+    } else {
+            $moreforfilter = $hookmanager->resPrint;
+    }
 

     if ($moreforfilter) {

         print '<div class="liste_titre liste_titre_bydiv centpercent">';

@@ -593,8 +614,9 @@ 
 

     $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;

     $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields

-    if ($massactionbutton)

-        $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);

+    if ($massactionbutton) {
+            $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+    }
 

     print '<div class="div-table-responsive">';

     print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

@@ -821,8 +843,9 @@ 
             $result = $db->query($sql);

             if ($result) {

                 $objtp = $db->fetch_object($result);

-                if (!empty($objtp->label))

-                    $obj->label = $objtp->label;

+                if (!empty($objtp->label)) {
+                                    $obj->label = $objtp->label;
+                }
             }

         }

 

@@ -855,36 +878,41 @@ 
             print '<td class="tdoverflowmax200">';

             print $product_static->getNomUrl(1);

             print "</td>\n";

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Ref supplier

         if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {

             print '<td class="tdoverflowmax200">';

             print $product_static->getNomUrl(1);

             print "</td>\n";

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Label

         if (!empty($arrayfields['p.label']['checked'])) {

             print '<td class="tdoverflowmax200">' . dol_trunc($obj->label, 40) . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Type

         if (!empty($arrayfields['p.fk_product_type']['checked'])) {

             print '<td>' . $obj->fk_product_type . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Barcode

         if (!empty($arrayfields['p.barcode']['checked'])) {

             print '<td>' . $obj->barcode . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Duration

@@ -906,22 +934,25 @@ 
                 print $obj->duration;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Sell price

         if (!empty($arrayfields['p.sellprice']['checked'])) {

             print '<td class="right nowraponall">';

             if ($obj->tosell) {

-                if ($obj->price_base_type == 'TTC')

-                    print price($obj->price_ttc) . ' ' . $langs->trans("TTC");

-                else

-                    print price($obj->price) . ' ' . $langs->trans("HT");

+                if ($obj->price_base_type == 'TTC') {
+                                    print price($obj->price_ttc) . ' ' . $langs->trans("TTC");
+                } else {
+                                    print price($obj->price) . ' ' . $langs->trans("HT");
+                }
             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Better buy price

@@ -934,14 +965,16 @@ 
                         if (!empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire) {

                             $htmltext = $product_fourn->display_price_product_fournisseur(1, 1, 0, 1);

                             print $form->textwithpicto(price($product_fourn->fourn_unitprice * (1 - $product_fourn->fourn_remise_percent / 100) - $product_fourn->fourn_remise) . ' ' . $langs->trans("HT"), $htmltext);

-                        } else

-                            print price($product_fourn->fourn_unitprice) . ' ' . $langs->trans("HT");

+                        } else {
+                                                    print price($product_fourn->fourn_unitprice) . ' ' . $langs->trans("HT");
+                        }
                     }

                 }

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Number of buy prices

@@ -970,8 +1003,9 @@ 
                 print $obj->seuil_stock_alerte;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Desired stock

         if (!empty($arrayfields['p.desiredstock']['checked'])) {

@@ -980,52 +1014,60 @@ 
                 print $obj->desiredstock;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Stock real

         if (!empty($arrayfields['p.stock']['checked'])) {

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

-                if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                if ($obj->seuil_stock_alerte != '' && $product_static->stock_reel < (float) $obj->seuil_stock_alerte) {
+                                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';
+                }
                 print $product_static->stock_reel;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Stock virtual

         if (!empty($arrayfields['stock_virtual']['checked'])) {

             print '<td align="right">';

             if ($obj->fk_product_type != 1) {

-                if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte)

-                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';

+                if ($obj->seuil_stock_alerte != '' && $product_static->stock_theorique < (float) $obj->seuil_stock_alerte) {
+                                    print img_warning($langs->trans("StockLowerThanLimit", $obj->seuil_stock_alerte)) . ' ';
+                }
                 print $product_static->stock_theorique;

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Lot/Serial

         if (!empty($arrayfields['p.tobatch']['checked'])) {

             print '<td align="center">';

             print yn($obj->tobatch);

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_sell']['checked'])) {

             print '<td>' . $obj->accountancy_code_sell . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Accountancy code sell

         if (!empty($arrayfields['p.accountancy_code_buy']['checked'])) {

             print '<td>' . $obj->accountancy_code_buy . '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Extra fields

         include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_list_print_fields.tpl.php';

@@ -1038,16 +1080,18 @@ 
             print '<td align="center">';

             print dol_print_date($obj->date_creation, 'dayhour', 'tzuser');

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Date modification

         if (!empty($arrayfields['p.tms']['checked'])) {

             print '<td align="center">';

             print dol_print_date($obj->date_update, 'dayhour', 'tzuser');

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

 

         // Status (to sell)

@@ -1059,8 +1103,9 @@ 
                 print $product_static->LibStatut($obj->tosell, 5, 0);

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Status (to buy)

         if (!empty($arrayfields['p.tobuy']['checked'])) {

@@ -1071,20 +1116,23 @@ 
                 print $product_static->LibStatut($obj->tobuy, 5, 1);

             }

             print '</td>';

-            if (!$i)

-                $totalarray['nbfield'] ++;

+            if (!$i) {
+                            $totalarray['nbfield'] ++;
+            }
         }

         // Action

         print '<td class="nowrap" align="center">';

         if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined

             $selected = 0;

-            if (in_array($obj->rowid, $arrayofselected))

-                $selected = 1;

+            if (in_array($obj->rowid, $arrayofselected)) {
+                            $selected = 1;
+            }
             print '<input id="cb' . $obj->rowid . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $obj->rowid . '"' . ($selected ? ' checked="checked"' : '') . '>';

         }

         print '</td>';

-        if (!$i)

-            $totalarray['nbfield'] ++;

+        if (!$i) {
+                    $totalarray['nbfield'] ++;
+        }
 

         print "</tr>\n";

         $i++;

@@ -1095,8 +1143,7 @@ 
     print "</table>";

     print "</div>";

     print '</form>';

-}

-else {

+} else {

     dol_print_error($db);

 }

 

dolibarr/htdocs/core/lib/functions.lib.php

Spacing +546 added lines, -546 removed lines

@@ -36,7 +36,7 @@ 
  * 	\brief			A set of functions for Dolibarr

  * 					This file contains all frequently used functions.

  */

-include_once DOL_BASE_PATH . '/core/lib/json.lib.php';

+include_once DOL_BASE_PATH.'/core/lib/json.lib.php';

 

 /**

  * Function to return value of a static property when class

@@ -51,7 +51,7 @@ 
  */

 function getStaticMember($class, $member)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     // This part is deprecated. Uncomment if for php 5.2.*, and comment next isset class::member

     /* if (version_compare(phpversion(), '5.3.0', '<'))

@@ -76,7 +76,7 @@ 
 

     if (isset($class::$member))

         return $class::$member;

-    dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

+    dol_print_error('', 'Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.');

     return null;

 }

 

@@ -93,9 +93,9 @@ 
  */

 function getDoliDBInstance($type, $host, $user, $pass, $name, $port)

 {

-    require_once DOL_BASE_PATH . "/core/db/" . $type . '.class.php';

+    require_once DOL_BASE_PATH."/core/db/".$type.'.class.php';

 

-    $class = 'DoliDB' . ucfirst($type);

+    $class = 'DoliDB'.ucfirst($type);

     $dolidb = new $class($type, $host, $user, $pass, $name, $port);

     return $dolidb;

 }

@@ -151,7 +151,7 @@ 
  */

 function getBrowserInfo($user_agent)

 {

-    include_once DOL_BASE_PATH . '/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php';

+    include_once DOL_BASE_PATH.'/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php';

 

     $name = 'unknown';

     $version = '';

@@ -264,7 +264,7 @@ 
         $depth = $db->transaction_opened;

         $disconnectdone = $db->close();

     }

-    dol_syslog("--- End access to " . $_SERVER["PHP_SELF"] . (($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was ' . $depth . ')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

+    dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));

 }

 

 /**

@@ -309,7 +309,7 @@ 
     if (empty($paramname))

         return 'BadFirstParameterForGETPOST';

     if (empty($check)) {

-        dol_syslog("Deprecated use of GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

+        dol_syslog("Deprecated use of GETPOST, called with 1st param = ".$paramname." and 2nd param is '', when calling page ".$_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

     }

@@ -331,7 +331,7 @@ 
         $relativepathstring = $_SERVER["PHP_SELF"];

         // Clean $relativepathstring

         if (constant('DOL_URL_ROOT'))

-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+            $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

         //var_dump($relativepathstring);

@@ -339,8 +339,8 @@ 
         // Code for search criteria persistence.

         // Retrieve values if restore_lastsearch_values

         if (!empty($_GET['restore_lastsearch_values'])) {        // Use $_GET here and not GETPOST

-            if (!empty($_SESSION['lastsearch_values_' . $relativepathstring])) { // If there is saved values

-                $tmp = json_decode($_SESSION['lastsearch_values_' . $relativepathstring], true);

+            if (!empty($_SESSION['lastsearch_values_'.$relativepathstring])) { // If there is saved values

+                $tmp = json_decode($_SESSION['lastsearch_values_'.$relativepathstring], true);

                 if (is_array($tmp)) {

                     foreach ($tmp as $key => $val) {

                         if ($key == $paramname) { // We are on the requested parameter

@@ -351,12 +351,12 @@ 
                 }

             }

             // If there is saved contextpage, page or limit

-            if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_contextpage_' . $relativepathstring];

-            } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_page_' . $relativepathstring];

-            } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_' . $relativepathstring])) {

-                $out = $_SESSION['lastsearch_limit_' . $relativepathstring];

+            if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];

+            } elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_page_'.$relativepathstring];

+            } elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {

+                $out = $_SESSION['lastsearch_limit_'.$relativepathstring];

             }

         }

         // Else, retreive default values if we are not doing a sort

@@ -424,7 +424,7 @@ 
                                         $qualified = 1;

 

                                     if ($qualified) {

-                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                         foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

                                             if ($out)

                                                 $out .= ', ';

@@ -460,11 +460,11 @@ 
                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

                                         // We made a search from quick search menu, do we still use default filter ?

                                         if (empty($conf->global->MAIN_DISABLE_DEFAULT_FILTER_FOR_QUICK_SEARCH)) {

-                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                            $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                             $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                         }

                                     } else {

-                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

+                                        $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "="); // we accept _, -, . and ,

                                         $out = dol_string_nospecial($user->default_values[$relativepathstring]['filters'][$defkey][$paramname], '', $forbidden_chars_to_replace);

                                     }

                                     break;

@@ -482,7 +482,7 @@ 
     // We do this only if var is a GET. If it is a POST, may be we want to post the text with vars as the setup text.

     if (!is_array($out) && empty($_POST[$paramname]) && empty($noreplace)) {

         $maxloop = 20;

-        $loopnb = 0;    // Protection against infinite loop

+        $loopnb = 0; // Protection against infinite loop

         while (preg_match('/__([A-Z0-9]+_?[A-Z0-9]+)__/i', $out, $reg) && ($loopnb < $maxloop)) {    // Detect '__ABCDEF__' as key 'ABCDEF' and '__ABC_DEF__' as key 'ABC_DEF'. Detection is also correct when 2 vars are side by side.

             $loopnb++;

             $newout = '';

@@ -527,7 +527,7 @@ 
             } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                 $newout = $conf->entity;

             } else

-                $newout = '';     // Key not found, we replace with empty string

+                $newout = ''; // Key not found, we replace with empty string

 

 

 

@@ -542,7 +542,7 @@ 
 

                 

 //var_dump('__'.$reg[1].'__ -> '.$newout);

-            $out = preg_replace('/__' . preg_quote($reg[1], '/') . '__/', $newout, $out);

+            $out = preg_replace('/__'.preg_quote($reg[1], '/').'__/', $newout, $out);

         }

     }

 

@@ -660,15 +660,15 @@ 
                 else if (isset($_SERVER["SERVER_NAME"]))

                     return $_SERVER["SERVER_NAME"];

             }

-            return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+            return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

         }

 

         if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {

-            return dol_hash($_SERVER["SERVER_NAME"] . $_SERVER["DOCUMENT_ROOT"] . DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+            return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

             // Use this for a "readable" cookie name

             //return dol_sanitizeFileName($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

         }

-        return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

+        return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);

     }

 }

 

@@ -684,12 +684,12 @@ 
  */

 function dol_include_once($relpath, $classname = '')

 {

-    global $conf, $langs, $user, $mysoc;   // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

+    global $conf, $langs, $user, $mysoc; // Do not remove this. They must be defined for files we include. Other globals var must be retreived with $GLOBALS['var']

 

     $fullpath = dol_buildpath($relpath);

 

     if (!file_exists($fullpath)) {

-        dol_syslog('functions::dol_include_once Tried to load unexisting file: ' . $relpath, LOG_ERR);

+        dol_syslog('functions::dol_include_once Tried to load unexisting file: '.$relpath, LOG_ERR);

         return false;

     }

 

@@ -718,13 +718,13 @@ 
 

     if ($type == 0 /* empty($type) */) { // For a filesystem path

         //$res = DOL_BASE_PATH . '' . $path;  // Standard default path

-        $res = DOL_BASE_PATH . '/' . $path;  // Standard default path

+        $res = DOL_BASE_PATH.'/'.$path; // Standard default path

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

                 continue;

             }

-            if (file_exists($dirroot . '/' . $path)) {

-                $res = $dirroot . '/' . $path;

+            if (file_exists($dirroot.'/'.$path)) {

+                $res = $dirroot.'/'.$path;

                 return $res;

             }

         }

@@ -740,11 +740,11 @@ 
         // using proxy, rewriting, virtual path, etc...

         $res = '';

         if ($type == 1)

-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value

+            $res = /* DOL_URL_ROOT */ DOL_BASE_URI.'/'.$path; // Standard value

         if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

+            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH.'/'.$path; // Standard value

         if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+            $res = DOL_URL_ROOT.'/'.$path;

 

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

@@ -752,33 +752,33 @@ 
                     global $dolibarr_main_url_root;

 

                     // Define $urlwithroot

-                    $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                    $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;  // This is to use external domain name found into config file

+                    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+                    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

                     //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                    $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . '/' . $path;     // Test on start with http is for old conf syntax

+                    $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).'/'.$path; // Test on start with http is for old conf syntax

                 }

                 continue;

             }

-            preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs);    // Take part before '?'

+            preg_match('/^([^\?]+(\.css\.php|\.css|\.js\.php|\.js|\.png|\.jpg|\.php)?)/i', $path, $regs); // Take part before '?'

             if (!empty($regs[1])) {

                 //print $key.'-'.$dirroot.'/'.$path.'-'.$conf->file->dol_url_root[$type].'<br>'."\n";

-                if (file_exists($dirroot . '/' . $regs[1])) {

+                if (file_exists($dirroot.'/'.$regs[1])) {

                     if ($type == 1) {

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT) . $conf->file->dol_url_root[$key] . '/' . $path;

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;

                     }

                     if ($type == 2) {

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT) . $conf->file->dol_url_root[$key] . '/' . $path;

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : DOL_MAIN_URL_ROOT).$conf->file->dol_url_root[$key].'/'.$path;

                     }

                     if ($type == 3) {

                         global $dolibarr_main_url_root;

 

                         // Define $urlwithroot

-                        $urlwithouturlroot = preg_replace('/' . preg_quote(DOL_URL_ROOT, '/') . '$/i', '', trim($dolibarr_main_url_root));

-                        $urlwithroot = $urlwithouturlroot . DOL_URL_ROOT;  // This is to use external domain name found into config file

+                        $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));

+                        $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file

                         //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current

 

-                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot) . $conf->file->dol_url_root[$key] . '/' . $path;     // Test on start with http is for old conf syntax

+                        $res = (preg_match('/^http/i', $conf->file->dol_url_root[$key]) ? '' : $urlwithroot).$conf->file->dol_url_root[$key].'/'.$path; // Test on start with http is for old conf syntax

                     }

                     break;

                 }

@@ -806,7 +806,7 @@ 
     if (empty($native)) {

         $myclone = unserialize(serialize($object));

     } else {

-        $myclone = clone $object;     // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

+        $myclone = clone $object; // PHP clone is a shallow copy only, not a real clone, so properties of references will keep references (refer to the same target/variable)

     }

 

     return $myclone;

@@ -927,7 +927,7 @@ 
  */

 function dol_string_nospecial($str, $newstr = '_', $badcharstoreplace = '')

 {

-    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

+    $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°'); // more complete than dol_sanitizeFileName

     $forbidden_chars_to_remove = array();

     if (is_array($badcharstoreplace))

         $forbidden_chars_to_replace = $badcharstoreplace;

@@ -990,12 +990,12 @@ 
 function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0)

 {

     // escape quotes and backslashes, newlines, etc.

-    $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

+    $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

     if (!$keepb)

         $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

     if (!$keepn)

         $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

-    return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

+    return htmlentities($tmp, ENT_COMPAT, 'UTF-8'); // TODO Use htmlspecialchars instead, that make only required change for html tags

 }

 

 /**

@@ -1066,14 +1066,14 @@ 
         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

         // If adding log inside HTML page is required

         if (!empty($_REQUEST['logtohtml']) && (!empty($conf->global->MAIN_ENABLE_LOG_TO_HTML) || !empty($conf->global->MAIN_LOGTOHTML))) {   // MAIN_LOGTOHTML kept for backward compatibility

-            $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S") . " " . $message;

+            $conf->logbuffer[] = dol_print_date(time(), "%Y-%m-%d %H:%M:%S")." ".$message;

         }

 

         //TODO: Remove this. MAIN_ENABLE_LOG_INLINE_HTML should be deprecated and use a log handler dedicated to HTML output

         // If html log tag enabled and url parameter log defined, we show output log on HTML comments

         if (!empty($conf->global->MAIN_ENABLE_LOG_INLINE_HTML) && !empty($_GET["log"])) {

             print "\n\n<!-- Log start\n";

-            print $message . "\n";

+            print $message."\n";

             print "Log end -->\n";

         }

 

@@ -1087,7 +1087,7 @@ 
 

         // This is when server run behind a reverse proxy

         if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'].(empty($_SERVER["REMOTE_ADDR"]) ? '' : '->'.$_SERVER['REMOTE_ADDR']);

         // This is when server run normally on a server

         else if (!empty($_SERVER["REMOTE_ADDR"]))

             $data['ip'] = $_SERVER['REMOTE_ADDR'];

@@ -1096,10 +1096,10 @@ 
             $data['ip'] = $_SERVER['SERVER_ADDR'];

         // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

         else if (!empty($_SERVER['COMPUTERNAME']))

-            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+            $data['ip'] = $_SERVER['COMPUTERNAME'].(empty($_SERVER['USERNAME']) ? '' : '@'.$_SERVER['USERNAME']);

         // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

         else if (!empty($_SERVER['LOGNAME']))

-            $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+            $data['ip'] = '???@'.$_SERVER['LOGNAME'];

         // Loop on each log handler and send output

         foreach ($conf->loghandlers as $loghandlerinstance) {

             if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

@@ -1151,10 +1151,10 @@ 
 {

     global $conf, $langs, $hookmanager;

 

-    $out = "\n" . '<div class="tabs" data-role="controlgroup" data-type="horizontal">' . "\n";

+    $out = "\n".'<div class="tabs" data-role="controlgroup" data-type="horizontal">'."\n";

 

     if ($morehtmlright) {

-        $out .= '<div class="inline-block floatright tabsElem">' . $morehtmlright . '</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

+        $out .= '<div class="inline-block floatright tabsElem">'.$morehtmlright.'</div>'; // Output right area first so when space is missing, text is in front of tabs and not under.

     }

 

     // Show title

@@ -1165,8 +1165,8 @@ 
         $limittitle = 30;

         $out .= '<a class="tabTitle">';

         if ($picto)

-            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

-        $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

+            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_').$picto, '', $pictoisfullpath).' ';

+        $out .= '<span class="tabTitleText">'.dol_trunc($title, $limittitle).'</span>';

         $out .= '</a>';

     }

 

@@ -1206,23 +1206,23 @@ 
         }

 

         if ($i < $limittoshow || $isactive) {

-            $out .= '<div class="inline-block tabsElem' . ($isactive ? ' tabsElemActive' : '') . ((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '') . '"><!-- id tab = ' . (empty($links[$i][2]) ? '' : $links[$i][2]) . ' -->';

+            $out .= '<div class="inline-block tabsElem'.($isactive ? ' tabsElemActive' : '').((!$isactive && !empty($conf->global->MAIN_HIDE_INACTIVETAB_ON_PRINT)) ? ' hideonprint' : '').'"><!-- id tab = '.(empty($links[$i][2]) ? '' : $links[$i][2]).' -->';

             if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                 if (!empty($links[$i][0])) {

-                    $out .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                    $out .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                 } else {

-                    $out .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                    $out .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

                 }

             } else if (!empty($links[$i][1])) {

                 //print "x $i $active ".$links[$i][2]." z";

                 if ($isactive) {

-                    $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $out .= $links[$i][1];

-                    $out .= '</a>' . "\n";

+                    $out .= '</a>'."\n";

                 } else {

-                    $out .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="tabunactive tab inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                    $out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tabunactive tab inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                     $out .= $links[$i][1];

-                    $out .= '</a>' . "\n";

+                    $out .= '</a>'."\n";

                 }

             }

             $out .= '</div>';

@@ -1235,14 +1235,14 @@ 
             $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

             if (isset($links[$i][2]) && $links[$i][2] == 'image') {

                 if (!empty($links[$i][0]))

-                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

+                    $outmore .= '<a class="tabimage'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">'.$links[$i][1].'</a>'."\n";

                 else

-                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

+                    $outmore .= '<span class="tabspan">'.$links[$i][1].'</span>'."\n";

             }

             else if (!empty($links[$i][1])) {

-                $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

+                $outmore .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="wordwrap inline-block'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'">';

                 $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

-                $outmore .= '</a>' . "\n";

+                $outmore .= '</a>'."\n";

             }

             $outmore .= '</div>';

 

@@ -1258,24 +1258,24 @@ 
         $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');

 

         $tabsname = str_replace("@", "", $picto);

-        $out .= '<div id="moretabs' . $tabsname . '" class="inline-block tabsElem">';

-        $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">' . $langs->trans("More") . '... (' . $nbintab . ')</a>';

-        $out .= '<div id="moretabsList' . $tabsname . '" style="position: absolute; ' . $left . ': -999em; text-align: ' . $left . '; margin:0px; padding:2px">';

+        $out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';

+        $out .= '<a href="#" class="tab moretab inline-block tabunactive reposition">'.$langs->trans("More").'... ('.$nbintab.')</a>';

+        $out .= '<div id="moretabsList'.$tabsname.'" style="position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px">';

         $out .= $outmore;

         $out .= '</div>';

         $out .= '<div></div>';

         $out .= "</div>\n";

 

         $out .= "<script>";

-        $out .= "$('#moretabs" . $tabsname . "').mouseenter( function() { console.log('mouseenter " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','auto');});";

-        $out .= "$('#moretabs" . $tabsname . "').mouseleave( function() { console.log('mouseleave " . $left . "'); $('#moretabsList" . $tabsname . "').css('" . $left . "','-999em');});";

+        $out .= "$('#moretabs".$tabsname."').mouseenter( function() { console.log('mouseenter ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','auto');});";

+        $out .= "$('#moretabs".$tabsname."').mouseleave( function() { console.log('mouseleave ".$left."'); $('#moretabsList".$tabsname."').css('".$left."','-999em');});";

         $out .= "</script>";

     }

 

     $out .= "</div>\n";

 

     if (!$notab || $notab == -1)

-        $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+        $out .= "\n".'<div class="tabBar'.($notab == -1 ? '' : ' tabBarWithBottom').'">'."\n";

 

     $parameters = array('tabname' => $active, 'out' => $out);

     $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1384,7 +1384,7 @@ 
         if ($conf->browser->layout == 'phone')

             $maxvisiblephotos = 1;

         if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

         else {

             if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

@@ -1393,18 +1393,18 @@ 
             //elseif ($conf->browser->layout != 'phone') {    // Show no photo link

             $nophoto = '/public/theme/common/nophoto.png';

             // $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_URL_ROOT . $nophoto . '"></div>';

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

             //}

         }

     } elseif ($object->element == 'ticket') {

         $width = 80;

         $cssclass = 'photoref';

-        $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

+        $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->track_id);

         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

         if ($conf->browser->layout == 'phone')

             $maxvisiblephotos = 1;

         if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>';

         else {

             if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

@@ -1413,7 +1413,7 @@ 
             //elseif ($conf->browser->layout != 'phone') {    // Show no photo link

             $nophoto = '/public/theme/common/nophoto.png';

             //$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_URL_ROOT . $nophoto . '"></div>';

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '"></div>';

+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'"></div>';

             //}

         }

     } else {

@@ -1423,25 +1423,25 @@ 
                 // Check if a preview file is available

                 if (in_array($modulepart, array('propal', 'commande', 'facture', 'ficheinter', 'contract', 'supplier_order', 'supplier_proposal', 'supplier_invoice', 'expensereport')) && class_exists("Imagick")) {

                     $objectref = dol_sanitizeFileName($object->ref);

-                    $dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity]) . "/";

+                    $dir_output = (empty($conf->$modulepart->multidir_output[$entity]) ? $conf->$modulepart->dir_output : $conf->$modulepart->multidir_output[$entity])."/";

                     if (in_array($modulepart, array('invoice_supplier', 'supplier_invoice'))) {

                         $subdir = get_exdir($object->id, 2, 0, 1, $object, $modulepart);

-                        $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '') . $objectref;  // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

+                        $subdir .= ((!empty($subdir) && !preg_match('/\/$/', $subdir)) ? '/' : '').$objectref; // the objectref dir is not included into get_exdir when used with level=2, so we add it at end

                     } else {

                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                     }

                     if (empty($subdir))

                         $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

 

-                    $filepath = $dir_output . $subdir . "/";

+                    $filepath = $dir_output.$subdir."/";

 

-                    $file = $filepath . $objectref . ".pdf";

-                    $relativepath = $subdir . '/' . $objectref . '.pdf';

+                    $file = $filepath.$objectref.".pdf";

+                    $relativepath = $subdir.'/'.$objectref.'.pdf';

 

                     // Define path to preview pdf file (preview precompiled "file.ext" are "file.ext_preview.png")

-                    $fileimage = $file . '_preview.png';              // If PDF has 1 page

-                    $fileimagebis = $file . '_preview-0.png';         // If PDF has more than one page

-                    $relativepathimage = $relativepath . '_preview.png';

+                    $fileimage = $file.'_preview.png'; // If PDF has 1 page

+                    $fileimagebis = $file.'_preview-0.png'; // If PDF has more than one page

+                    $relativepathimage = $relativepath.'_preview.png';

 

                     // Si fichier PDF existe

                     if (file_exists($file)) {

@@ -1450,7 +1450,7 @@ 
                         if ((!file_exists($fileimage) || (filemtime($fileimage) < filemtime($file))) && (!file_exists($fileimagebis) || (filemtime($fileimagebis) < filemtime($file)))

                         ) {

                             if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

-                                include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+                                include_once DOL_BASE_PATH.'/core/lib/files.lib.php';

                                 $ret = dol_convert_file($file, 'png', $fileimage);

                                 if ($ret < 0)

                                     $error++;

@@ -1463,14 +1463,14 @@ 
                         // Si fichier png PDF d'1 page trouve

                         if (file_exists($fileimage)) {

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                            $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($relativepathimage) . '">';

+                            $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($relativepathimage).'">';

                             $phototoshow .= '</div></div>';

                         }

                         // Si fichier png PDF de plus d'1 page trouve

                         elseif (file_exists($fileimagebis)) {

-                            $preview = preg_replace('/\.png/', '', $relativepathimage) . "-0.png";

+                            $preview = preg_replace('/\.png/', '', $relativepathimage)."-0.png";

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

-                            $phototoshow .= '<img height="' . $heightforphotref . '" class="photo photowithmargin photowithborder" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=apercu' . $modulepart . '&amp;file=' . urlencode($preview) . '"><p>';

+                            $phototoshow .= '<img height="'.$heightforphotref.'" class="photo photowithmargin photowithborder" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=apercu'.$modulepart.'&amp;file='.urlencode($preview).'"><p>';

                             $phototoshow .= '</div></div>';

                         }

                     }

@@ -1497,10 +1497,10 @@ 
                     $picto = $object->picto;

                     if ($object->element == 'project' && !$object->public)

                         $picto = 'project'; // instead of projectpub

-                    $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

+                    $nophoto = img_picto('', 'object_'.$picto, '', false, 1);

                 }

                 $morehtmlleft .= '<!-- No photo to show -->';

-                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" border="0"' . ($width ? ' width="' . $width . '"' : '') . ' src="' . $nophoto . '"></div></div>';

+                $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" border="0"'.($width ? ' width="'.$width.'"' : '').' src="'.$nophoto.'"></div></div>';

 

                 $morehtmlleft .= '</div>';

             }

@@ -1508,7 +1508,7 @@ 
     }

 

     if ($showbarcode)

-        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object).'</div>';

 

     if ($object->element == 'societe') {

         if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1521,14 +1521,14 @@ 
         if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

             $morehtmlstatus .= ajax_object_onoff($object, 'status', 'tosell', 'ProductStatusOnSell', 'ProductStatusNotOnSell');

         } else {

-            $morehtmlstatus .= '<span class="statusrefsell">' . $object->getLibStatut(5, 0) . '</span>';

+            $morehtmlstatus .= '<span class="statusrefsell">'.$object->getLibStatut(5, 0).'</span>';

         }

         $morehtmlstatus .= ' &nbsp; ';

         //$morehtmlstatus.=$langs->trans("Status").' ('.$langs->trans("Buy").') ';

         if (!empty($conf->use_javascript_ajax) && $user->rights->produit->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

             $morehtmlstatus .= ajax_object_onoff($object, 'status_buy', 'tobuy', 'ProductStatusOnBuy', 'ProductStatusNotOnBuy');

         } else {

-            $morehtmlstatus .= '<span class="statusrefbuy">' . $object->getLibStatut(5, 1) . '</span>';

+            $morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(5, 1).'</span>';

         }

     } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

         $tmptxt = $object->getLibStatut(6, $object->totalpaye);

@@ -1555,7 +1555,7 @@ 
         if ($object->progress >= 100)

             $object->fk_statut = 3;

         $tmptxt = $object->getLibStatut(5);

-        $morehtmlstatus .= $tmptxt;  // No status on task

+        $morehtmlstatus .= $tmptxt; // No status on task

     }

     else { // Generic case

         $tmptxt = $object->getLibStatut(6);

@@ -1569,18 +1569,18 @@ 
         if (method_exists($object, 'getVentilExportCompta')) {

             $accounted = $object->getVentilExportCompta();

             $langs->load("accountancy");

-            $morehtmlstatus .= '</div><div class="statusref statusrefbis">' . ($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

+            $morehtmlstatus .= '</div><div class="statusref statusrefbis">'.($accounted > 0 ? $langs->trans("Accounted") : $langs->trans("NotYetAccounted"));

         }

     }

 

     // Add alias for thirdparty

     if (!empty($object->name_alias))

-        $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+        $morehtmlref .= '<div class="refidno">'.$object->name_alias.'</div>';

 

     // Add label

     if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

         if (!empty($object->label))

-            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+            $morehtmlref .= '<div class="refidno">'.$object->label.'</div>';

     }

 

     if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1590,11 +1590,11 @@ 
     }

     if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && in_array($object->element, array('societe', 'contact', 'member', 'product'))) {

         $morehtmlref .= '<div style="clear: both;"></div><div class="refidno">';

-        $morehtmlref .= $langs->trans("TechnicalID") . ': ' . $object->id;

+        $morehtmlref .= $langs->trans("TechnicalID").': '.$object->id;

         $morehtmlref .= '</div>';

     }

 

-    print '<div class="' . ($onlybanner ? 'arearefnobottom ' : 'arearef ') . 'heightref valignmiddle" width="100%">';

+    print '<div class="'.($onlybanner ? 'arearefnobottom ' : 'arearef ').'heightref valignmiddle" width="100%">';

     print $form->showrefnav($object, $paramid, $morehtml, $shownav, $fieldid, $fieldref, $morehtmlref, $moreparam, $nodbprefix, $morehtmlleft, $morehtmlstatus, $morehtmlright);

     print '</div>';

     print '<div class="underrefbanner clearboth"></div>';

@@ -1616,7 +1616,7 @@ 
     if ($fieldrequired)

         $ret .= '<span class="fieldrequired">';

     if (($conf->dol_use_jmobile != 4))

-        $ret .= '<label for="' . $fieldkey . '">';

+        $ret .= '<label for="'.$fieldkey.'">';

     $ret .= $langs->trans($langkey);

     if (($conf->dol_use_jmobile != 4))

         $ret .= '</label>';

@@ -1635,9 +1635,9 @@ 
 function dol_bc($var, $moreclass = '')

 {

     global $bc;

-    $ret = ' ' . $bc[$var];

+    $ret = ' '.$bc[$var];

     if ($moreclass)

-        $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+        $ret = preg_replace('/class=\"/', 'class="'.$moreclass.' ', $ret);

     return $ret;

 }

 

@@ -1657,50 +1657,50 @@ 
     global $conf, $langs;

 

     $ret = '';

-    $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR');    // See also MAIN_FORCE_STATE_INTO_ADDRESS

+    $countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR'); // See also MAIN_FORCE_STATE_INTO_ADDRESS

     // Address

     if (empty($mode)) {

         $ret .= $object->address;

     }

     // Zip/Town/State

     if (in_array($object->country_code, array('AU', 'CA', 'US')) || !empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)) {    // US: title firstname name \n address lines \n town, state, zip \n country

-        $ret .= ($ret ? $sep : '' ) . $object->town;

+        $ret .= ($ret ? $sep : '').$object->town;

         if ($object->state) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

         if ($object->zip)

-            $ret .= ($ret ? ", " : '') . $object->zip;

+            $ret .= ($ret ? ", " : '').$object->zip;

     }

     else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

-        $ret .= ($ret ? $sep : '' ) . $object->town;

+        $ret .= ($ret ? $sep : '').$object->town;

         if ($object->state) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

         if ($object->zip)

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

+            $ret .= ($ret ? $sep : '').$object->zip;

     }

     else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

-        $ret .= ($ret ? $sep : '' ) . $object->zip;

-        $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

+        $ret .= ($ret ? $sep : '').$object->zip;

+        $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

         if ($object->state) {

-            $ret .= "\n" . $object->state;

+            $ret .= "\n".$object->state;

         }

     } else if (in_array($object->country_code, array('IT'))) { // IT: tile firstname name\n address lines \n zip (Code Departement) \n country

-        $ret .= ($ret ? $sep : '' ) . $object->zip;

-        $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

-        $ret .= ($object->departement_id ? (' (' . ($object->departement_id) . ')') : '');

+        $ret .= ($ret ? $sep : '').$object->zip;

+        $ret .= ($object->town ? (($object->zip ? ' ' : '').$object->town) : '');

+        $ret .= ($object->departement_id ? (' ('.($object->departement_id).')') : '');

     } else {                                          // Other: title firstname name \n address lines \n zip town \n country

-        $ret .= $object->zip ? (($ret ? $sep : '' ) . $object->zip) : '';

-        $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '' )) . $object->town) : '');

+        $ret .= $object->zip ? (($ret ? $sep : '').$object->zip) : '';

+        $ret .= ($object->town ? (($object->zip ? ' ' : ($ret ? $sep : '')).$object->town) : '');

         if ($object->state && in_array($object->country_code, $countriesusingstate)) {

-            $ret .= ($ret ? ", " : '') . $object->state;

+            $ret .= ($ret ? ", " : '').$object->state;

         }

     }

     if (!is_object($outputlangs))

         $outputlangs = $langs;

     if ($withcountry) {

         $langs->load("dict");

-        $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

+        $ret .= ($object->country_code ? ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)) : '');

     }

 

     return $ret;

@@ -1755,13 +1755,13 @@ 
         if (is_string($tzoutput)) {

             if ($tzoutput == 'tzserver') {

                 $to_gmt = false;

-                $offsettzstring = @date_default_timezone_get();  // Example 'Europe/Berlin' or 'Indian/Reunion'

+                $offsettzstring = @date_default_timezone_get(); // Example 'Europe/Berlin' or 'Indian/Reunion'

                 $offsettz = 0;

                 $offsetdst = 0;

             } elseif ($tzoutput == 'tzuser' || $tzoutput == 'tzuserrel') {

                 $to_gmt = true;

                 $offsettzstring = (empty($_SESSION['dol_tz_string']) ? 'UTC' : $_SESSION['dol_tz_string']); // Example 'Europe/Berlin' or 'Indian/Reunion'

-                $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60;  // Will not be used anymore

+                $offsettz = (empty($_SESSION['dol_tz']) ? 0 : $_SESSION['dol_tz']) * 60 * 60; // Will not be used anymore

                 $offsetdst = (empty($_SESSION['dol_dst']) ? 0 : $_SESSION['dol_dst']) * 60 * 60; // Will not be used anymore

             }

         }

@@ -1807,9 +1807,9 @@ 
     else if ($format == 'dayxcard')

         $format = '%Y%m%d';

     else if ($format == 'dayrfc')

-        $format = '%Y-%m-%d';             // DATE_RFC3339

+        $format = '%Y-%m-%d'; // DATE_RFC3339

     else if ($format == 'dayhourrfc')

-        $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

+        $format = '%Y-%m-%dT%H:%M:%SZ'; // DATETIME RFC3339

     else if ($format == 'standard')

         $format = '%Y-%m-%d %H:%M:%S';

 

@@ -1820,7 +1820,7 @@ 
 

     // If date undefined or "", we return ""

     if (dol_strlen($time) == 0)

-        return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+        return ''; // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1851,7 +1851,7 @@ 
     if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+) ?([0-9]+)?:?([0-9]+)?:?([0-9]+)?/i', $time, $reg) || preg_match('/^([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])$/i', $time, $reg)) { // Deprecated. Ex: 1970-01-01, 1970-01-01 01:00:00, 19700101010000

         // TODO Remove this.

         // This part of code should not be used.

-        dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page " . $_SERVER["PHP_SELF"], LOG_ERR);

+        dol_syslog("Functions.lib::dol_print_date function call with deprecated value of time in page ".$_SERVER["PHP_SELF"], LOG_ERR);

         // Date has format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS' or 'YYYYMMDDHHMMSS'

         $syear = (!empty($reg[1]) ? $reg[1] : '');

         $smonth = (!empty($reg[2]) ? $reg[2] : '');

@@ -1869,7 +1869,7 @@ 
 

             $ret = adodb_strftime($format, $timetouse, $to_gmt);

         } else

-            $ret = 'Bad value ' . $time . ' for date';

+            $ret = 'Bad value '.$time.' for date';

     }

 

     if (preg_match('/__b__/i', $format)) {

@@ -1878,11 +1878,11 @@ 
         $month = adodb_strftime('%m', $timetouse);

         $month = sprintf("%02d", $month); // $month may be return with format '06' on some installation and '6' on other, so we force it to '06'.

         if ($encodetooutput) {

-            $monthtext = $outputlangs->transnoentities('Month' . $month);

-            $monthtextshort = $outputlangs->transnoentities('MonthShort' . $month);

+            $monthtext = $outputlangs->transnoentities('Month'.$month);

+            $monthtextshort = $outputlangs->transnoentities('MonthShort'.$month);

         } else {

-            $monthtext = $outputlangs->transnoentitiesnoconv('Month' . $month);

-            $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort' . $month);

+            $monthtext = $outputlangs->transnoentitiesnoconv('Month'.$month);

+            $monthtextshort = $outputlangs->transnoentitiesnoconv('MonthShort'.$month);

         }

         //print 'monthtext='.$monthtext.' monthtextshort='.$monthtextshort;

         $ret = str_replace('__b__', $monthtextshort, $ret);

@@ -1893,8 +1893,8 @@ 
     if (preg_match('/__a__/i', $format)) {

         $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

-        $w = adodb_strftime('%w', $timetouse);      // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

-        $dayweek = $outputlangs->transnoentitiesnoconv('Day' . $w);

+        $w = adodb_strftime('%w', $timetouse); // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

+        $dayweek = $outputlangs->transnoentitiesnoconv('Day'.$w);

         $ret = str_replace('__A__', $dayweek, $ret);

         $ret = str_replace('__a__', dol_substr($dayweek, 0, 3), $ret);

     }

@@ -1941,9 +1941,9 @@ 
 

     $usealternatemethod = false;

     if ($timestamp <= 0)

-        $usealternatemethod = true;    // <= 1970

+        $usealternatemethod = true; // <= 1970

     if ($timestamp >= 2145913200)

-        $usealternatemethod = true;  // >= 2038

+        $usealternatemethod = true; // >= 2038

 

     if ($usealternatemethod) {

         $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -2003,23 +2003,23 @@ 
 

     if (method_exists('DateTime', 'getTimestamp')) {

         if (empty($gm) || $gm === 'server') {

-            $default_timezone = @date_default_timezone_get();  // Example 'Europe/Berlin'

+            $default_timezone = @date_default_timezone_get(); // Example 'Europe/Berlin'

             $localtz = new DateTimeZone($default_timezone);

         } else if ($gm === 'user') {

             // We use dol_tz_string first because it is more reliable.

-            $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]);  // Example 'Europe/Berlin'

+            $default_timezone = (empty($_SESSION["dol_tz_string"]) ? @date_default_timezone_get() : $_SESSION["dol_tz_string"]); // Example 'Europe/Berlin'

             try {

                 $localtz = new DateTimeZone($default_timezone);

             } catch (Exception $e) {

-                dol_syslog("Warning dol_tz_string contains an invalid value " . $_SESSION["dol_tz_string"], LOG_WARNING);

+                dol_syslog("Warning dol_tz_string contains an invalid value ".$_SESSION["dol_tz_string"], LOG_WARNING);

                 $default_timezone = @date_default_timezone_get();

             }

         } else if (strrpos($gm, "tz,") !== false) {

-            $timezone = str_replace("tz,", "", $gm);  // Example 'tz,Europe/Berlin'

+            $timezone = str_replace("tz,", "", $gm); // Example 'tz,Europe/Berlin'

             try {

                 $localtz = new DateTimeZone($timezone);

             } catch (Exception $e) {

-                dol_syslog("Warning passed timezone contains an invalid value " . $timezone, LOG_WARNING);

+                dol_syslog("Warning passed timezone contains an invalid value ".$timezone, LOG_WARNING);

             }

         }

 

@@ -2058,8 +2058,8 @@ 
     if ($mode == 'gmt')

         $ret = time(); // Time for now at greenwich.

     else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

-        require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

-        $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

+        require_once DOL_BASE_PATH.'/core/lib/date.lib.php';

+        $tzsecond = getServerTimeZoneInt('now'); // Contains tz+dayling saving time

         $ret = (int) (dol_now('gmt') + ($tzsecond * 3600));

     }

     /* else if ($mode == 'tzref')				// Time for now with parent company timezone is added

@@ -2105,9 +2105,9 @@ 
     }

     // Use long or short text unit

     if (empty($shortunit)) {

-        $ret .= ' ' . $textunitlong;

+        $ret .= ' '.$textunitlong;

     } else {

-        $ret .= ' ' . $textunitshort;

+        $ret .= ' '.$textunitshort;

     }

 

     return $ret;

@@ -2135,13 +2135,13 @@ 
     $link .= $url;

     $link .= '"';

     if ($target)

-        $link .= ' target="' . $target . '"';

+        $link .= ' target="'.$target.'"';

     $link .= '>';

     if (!preg_match('/^http/i', $url))

         $link .= 'http://';

     $link .= dol_trunc($url, $max);

     $link .= '</a>';

-    return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

+    return '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png').' ' : '').$link.'</div>';

 }

 

 /**

@@ -2182,9 +2182,9 @@ 
             $type = 'AC_EMAIL';

             $link = '';

             if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+                $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

             if ($link)

-                $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+                $newemail = '<div>'.$newemail.' '.$link.'</div>';

         }

     }

     else {

@@ -2194,7 +2194,7 @@ 
         }

     }

 

-    $rep = '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png') . ' ' : '') . $newemail . '</div>';

+    $rep = '<div class="nospan float" style="margin-right: 10px">'.($withpicto ? img_picto($langs->trans("EMail"), 'object_email.png').' ' : '').$newemail.'</div>';

     if ($hookmanager) {

         $parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);

         $reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);

@@ -2224,26 +2224,26 @@ 
 

     if (!empty($type)) {

         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

-        $newskype .= img_picto($langs->trans(strtoupper($type)), $type . '.png', '', false, 0, 0, '', 'paddingright');

+        $newskype .= img_picto($langs->trans(strtoupper($type)), $type.'.png', '', false, 0, 0, '', 'paddingright');

         $newskype .= $value;

         if ($type == 'skype') {

             $newskype .= '&nbsp;';

             $newskype .= '<a href="skype:';

             $newskype .= $value;

-            $newskype .= '?call" alt="' . $langs->trans("Call") . '&nbsp;' . $value . '" title="' . $langs->trans("Call") . '&nbsp;' . $value . '">';

-            $newskype .= '<img src="' . DOL_URL_ROOT . '/theme/common/skype_callbutton.png" border="0">';

+            $newskype .= '?call" alt="'.$langs->trans("Call").'&nbsp;'.$value.'" title="'.$langs->trans("Call").'&nbsp;'.$value.'">';

+            $newskype .= '<img src="'.DOL_URL_ROOT.'/theme/common/skype_callbutton.png" border="0">';

             $newskype .= '</a><a href="skype:';

             $newskype .= $value;

-            $newskype .= '?chat" alt="' . $langs->trans("Chat") . '&nbsp;' . $value . '" title="' . $langs->trans("Chat") . '&nbsp;' . $value . '">';

-            $newskype .= '<img class="paddingleft" src="' . DOL_URL_ROOT . '/theme/common/skype_chatbutton.png" border="0">';

+            $newskype .= '?chat" alt="'.$langs->trans("Chat").'&nbsp;'.$value.'" title="'.$langs->trans("Chat").'&nbsp;'.$value.'">';

+            $newskype .= '<img class="paddingleft" src="'.DOL_URL_ROOT.'/theme/common/skype_chatbutton.png" border="0">';

             $newskype .= '</a>';

         }

         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

             $addlink = 'AC_SKYPE';

             $link = '';

             if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            $newskype .= ($link ? ' ' . $link : '');

+                $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$addlink.'&amp;contactid='.$cid.'&amp;socid='.$socid.'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

+            $newskype .= ($link ? ' '.$link : '');

         }

         $newskype .= '</div>';

     }

@@ -2288,165 +2288,165 @@ 
     if (strtoupper($countrycode) == "FR") {

         // France

         if (dol_strlen($phone) == 10) {

-            $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 2) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2);

+            $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 2).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);

         } elseif (dol_strlen($phone) == 7) {

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2);

         } elseif (dol_strlen($phone) == 9) {

-            $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2);

+            $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2);

         } elseif (dol_strlen($phone) == 11) {

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

         } elseif (dol_strlen($phone) == 12) {

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "CA") {

         if (dol_strlen($phone) == 10) {

-            $newphone = ($separ != '' ? '(' : '') . substr($newphone, 0, 3) . ($separ != '' ? ')' : '') . $separ . substr($newphone, 3, 3) . ($separ != '' ? '-' : '') . substr($newphone, 6, 4);

+            $newphone = ($separ != '' ? '(' : '').substr($newphone, 0, 3).($separ != '' ? ')' : '').$separ.substr($newphone, 3, 3).($separ != '' ? '-' : '').substr($newphone, 6, 4);

         }

     } elseif (strtoupper($countrycode) == "PT") {//Portugal

         if (dol_strlen($phone) == 13) {//ex: +351_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "SR") {//Suriname

         if (dol_strlen($phone) == 10) {//ex: +597_ABC_DEF

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3);

         } elseif (dol_strlen($phone) == 11) {//ex: +597_ABC_DEFG

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 4);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 4);

         }

     } elseif (strtoupper($countrycode) == "DE") {//Allemagne

         if (dol_strlen($phone) == 14) {//ex:  +49_ABCD_EFGH_IJK

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 4) . $separ . substr($newphone, 11, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 4).$separ.substr($newphone, 11, 3);

         } elseif (dol_strlen($phone) == 13) {//ex: +49_ABC_DEFG_HIJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 4) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 4).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "ES") {//Espagne

         if (dol_strlen($phone) == 12) {//ex:  +34_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } elseif (strtoupper($countrycode) == "BF") {// Burkina Faso

         if (dol_strlen($phone) == 12) {//ex :  +22 A BC_DE_FG_HI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "RO") {// Roumanie

         if (dol_strlen($phone) == 12) {//ex :  +40 AB_CDE_FG_HI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "TR") {//Turquie

         if (dol_strlen($phone) == 13) {//ex :  +90 ABC_DEF_GHIJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

         }

     } elseif (strtoupper($countrycode) == "US") {//Etat-Unis

         if (dol_strlen($phone) == 12) {//ex: +1 ABC_DEF_GHIJ

-            $newphone = substr($newphone, 0, 2) . $separ . substr($newphone, 2, 3) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 4);

+            $newphone = substr($newphone, 0, 2).$separ.substr($newphone, 2, 3).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);

         }

     } elseif (strtoupper($countrycode) == "MX") {//Mexique

         if (dol_strlen($phone) == 12) {//ex: +52 ABCD_EFG_HI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

         } elseif (dol_strlen($phone) == 11) {//ex: +52 AB_CD_EF_GH

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 2) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 2).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

         } elseif (dol_strlen($phone) == 13) {//ex: +52 ABC_DEF_GHIJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 4);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 4);

         }

     } elseif (strtoupper($countrycode) == "ML") {//Mali

         if (dol_strlen($phone) == 12) {//ex: +223 AB_CD_EF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "TH") {//Thaïlande

         if (dol_strlen($phone) == 11) {//ex: +66_ABC_DE_FGH

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

         } elseif (dol_strlen($phone) == 12) {//ex: +66_A_BCD_EF_GHI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 3);

         }

     } elseif (strtoupper($countrycode) == "MU") {//Maurice

         if (dol_strlen($phone) == 11) {//ex: +230_ABC_DE_FG

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

         } elseif (dol_strlen($phone) == 12) {//ex: +230_ABCD_EF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "ZA") {//Afrique du sud

         if (dol_strlen($phone) == 12) {//ex: +27_AB_CDE_FG_HI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "SY") {//Syrie

         if (dol_strlen($phone) == 12) {//ex: +963_AB_CD_EF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         } elseif (dol_strlen($phone) == 13) {//ex: +963_AB_CD_EF_GHI

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "AE") {//Emirats Arabes Unis

         if (dol_strlen($phone) == 12) {//ex: +971_ABC_DEF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 2);

         } elseif (dol_strlen($phone) == 13) {//ex: +971_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         } elseif (dol_strlen($phone) == 14) {//ex: +971_ABC_DEF_GHIK

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 4);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 4);

         }

     } elseif (strtoupper($countrycode) == "DZ") {//Algérie

         if (dol_strlen($phone) == 13) {//ex: +213_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "BE") {//Belgique

         if (dol_strlen($phone) == 11) {//ex: +32_ABC_DE_FGH

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3);

         } elseif (dol_strlen($phone) == 12) {//ex: +32_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } elseif (strtoupper($countrycode) == "PF") {//Polynésie française

         if (dol_strlen($phone) == 12) {//ex: +689_AB_CD_EF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         }

     } elseif (strtoupper($countrycode) == "CO") {//Colombie

         if (dol_strlen($phone) == 13) {//ex: +57_ABC_DEF_GH_IJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

         }

     } elseif (strtoupper($countrycode) == "JO") {//Jordanie

         if (dol_strlen($phone) == 12) {//ex: +962_A_BCD_EF_GH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 1) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 1).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2);

         }

     } elseif (strtoupper($countrycode) == "MG") {//Madagascar

         if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 2) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "GB") {//Royaume uni

         if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 4) . $separ . substr($newphone, 7, 3) . $separ . substr($newphone, 10, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 4).$separ.substr($newphone, 7, 3).$separ.substr($newphone, 10, 3);

         }

     } elseif (strtoupper($countrycode) == "CH") {//Suisse

         if (dol_strlen($phone) == 12) {//ex: +41_AB_CDE_FG_HI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 2) . $separ . substr($newphone, 10, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);

         } elseif (dol_strlen($phone) == 15) {// +41_AB_CDE_FGH_IJKL

-            $newphone = $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 2) . $separ . substr($newphone, 5, 3) . $separ . substr($newphone, 8, 3) . $separ . substr($newphone, 11, 4);

+            $newphone = $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 2).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 4);

         }

     } elseif (strtoupper($countrycode) == "TN") {//Tunisie

         if (dol_strlen($phone) == 12) {//ex: +216_AB_CDE_FGH

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 2) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         }

     } elseif (strtoupper($countrycode) == "GF") {//Guyane francaise

         if (dol_strlen($phone) == 13) {//ex: +594_ABC_DE_FG_HI  (ABC=594 de nouveau)

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

         }

     } elseif (strtoupper($countrycode) == "GP") {//Guadeloupe

         if (dol_strlen($phone) == 13) {//ex: +590_ABC_DE_FG_HI  (ABC=590 de nouveau)

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

         }

     } elseif (strtoupper($countrycode) == "MQ") {//Martinique

         if (dol_strlen($phone) == 13) {//ex: +596_ABC_DE_FG_HI  (ABC=596 de nouveau)

-            $newphone = substr($newphone, 0, 4) . $separ . substr($newphone, 4, 3) . $separ . substr($newphone, 7, 2) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+            $newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

         }

     } elseif (strtoupper($countrycode) == "IT") {//Italie

         if (dol_strlen($phone) == 12) {//ex: +39_ABC_DEF_GHI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 3);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 3);

         } elseif (dol_strlen($phone) == 13) {//ex: +39_ABC_DEF_GH_IJ

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 3) . $separ . substr($newphone, 6, 3) . $separ . substr($newphone, 9, 2) . $separ . substr($newphone, 11, 2);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 3).$separ.substr($newphone, 6, 3).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);

         }

     } elseif (strtoupper($countrycode) == "AU") {//Australie

         if (dol_strlen($phone) == 12) {//ex: +61_A_BCDE_FGHI

-            $newphone = substr($newphone, 0, 3) . $separ . substr($newphone, 3, 1) . $separ . substr($newphone, 4, 4) . $separ . substr($newphone, 8, 4);

+            $newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);

         }

     }

     if (!empty($addlink)) { // Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)

         if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) { // If phone or option for, we use link of phone

-            $newphone = '<a href="tel:' . $phone . '"';

-            $newphone .= '>' . $phone . '</a>';

+            $newphone = '<a href="tel:'.$phone.'"';

+            $newphone .= '>'.$phone.'</a>';

         } else if (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

             if (empty($user->clicktodial_loaded))

                 $user->fetch_clicktodial();

@@ -2470,10 +2470,10 @@ 
                 '__PASS__' => $clicktodial_password);

             $url = make_substitutions($url, $substitarray);

             $newphonesav = $newphone;

-            $newphone = '<a href="' . $url . '"';

+            $newphone = '<a href="'.$url.'"';

             if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET))

                 $newphone .= ' target="_blank"';

-            $newphone .= '>' . $newphonesav . '</a>';

+            $newphone .= '>'.$newphonesav.'</a>';

         }

 

         //if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)

@@ -2483,9 +2483,9 @@ 
             if ($addlink == 'AC_FAX')

                 $type = 'AC_FAX';

             if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+                $link = '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode='.$type.($cid ? '&amp;contactid='.$cid : '').($socid ? '&amp;socid='.$socid : '').'">'.img_object($langs->trans("AddAction"), "calendar").'</a>';

             if ($link)

-                $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+                $newphone = '<div>'.$newphone.' '.$link.'</div>';

         }

     }

 

@@ -2516,7 +2516,7 @@ 
             $rep .= '<div class="nospan float" style="margin-right: 10px">';

         else

             $rep .= '<span style="margin-right: 10px;">';

-        $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

+        $rep .= ($withpicto ? img_picto($titlealt, 'object_'.$picto.'.png').' ' : '').$newphone;

         if ($adddivfloat)

             $rep .= '</div>';

         else

@@ -2545,10 +2545,10 @@ 
     if ($mode != 2) {

         $countrycode = dolGetCountryCodeFromIp($ip);

         if ($countrycode) { // If success, countrycode is us, fr, ...

-            if (file_exists(DOL_BASE_PATH . 'theme/common/flags/' . $countrycode . '.png')) {

-                $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), /* DOL_URL_ROOT */ DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

+            if (file_exists(DOL_BASE_PATH.'theme/common/flags/'.$countrycode.'.png')) {

+                $ret .= ' '.img_picto($countrycode.' '.$langs->trans("AccordingToGeoIPDatabase"), /* DOL_URL_ROOT */ DOL_BASE_URI.'/theme/common/flags/'.$countrycode.'.png', '', 1);

             } else

-                $ret .= ' (' . $countrycode . ')';

+                $ret .= ' ('.$countrycode.')';

         }

     }

 

@@ -2586,7 +2586,7 @@ 
         //$ip='24.24.24.24';

         //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)

 

-        include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+        include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

         $geoip = new DolGeoIP('country', $datafile);

         //print 'ip='.$ip.' databaseType='.$geoip->gi->databaseType." GEOIP_CITY_EDITION_REV1=".GEOIP_CITY_EDITION_REV1."\n";

         //print "geoip_country_id_by_addr=".geoip_country_id_by_addr($geoip->gi,$ip)."\n";

@@ -2613,7 +2613,7 @@ 
         $datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;

         //$ip='24.24.24.24';

         //$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';

-        include_once DOL_BASE_PATH . '/core/class/dolgeoip.class.php';

+        include_once DOL_BASE_PATH.'/core/class/dolgeoip.class.php';

         $geoip = new DolGeoIP('country', $datafile);

         $countrycode = $geoip->getCountryCodeFromIP($ip);

         $ret = $countrycode;

@@ -2668,12 +2668,12 @@ 
                 $showomap = 1;

 

             if ($showgmap) {

-                $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

-                $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '" class="valigntextbottom" src="' . DOL_URL_ROOT . '/theme/common/gmap.png"></a>';

+                $url = dol_buildpath('/google/gmaps.php?mode='.$mode.'&id='.$id, 1);

+                $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';

             }

             if ($showomap) {

-                $url = dol_buildpath('/openstreetmap/maps.php?mode=' . $mode . '&id=' . $id, 1);

-                $out .= ' <a href="' . $url . '" target="_gmaps"><img id="' . $htmlid . '_openstreetmap" class="valigntextbottom" src="' . DOL_URL_ROOT . '/theme/common/gmap.png"></a>';

+                $url = dol_buildpath('/openstreetmap/maps.php?mode='.$mode.'&id='.$id, 1);

+                $out .= ' <a href="'.$url.'" target="_gmaps"><img id="'.$htmlid.'_openstreetmap" class="valigntextbottom" src="'.DOL_URL_ROOT.'/theme/common/gmap.png"></a>';

             }

         }

     }

@@ -2819,7 +2819,7 @@ 
     if ($trunc == 'right') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

         if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

+            return dol_substr($newstring, 0, $size, $stringencoding).($nodot ? '' : '...');

         else

         //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

             return $string;

@@ -2829,21 +2829,21 @@ 
         if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

             $size1 = round($size / 2);

             $size2 = round($size / 2);

-            return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

+            return dol_substr($newstring, 0, $size1, $stringencoding).'...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

         } else

             return $string;

     }

     elseif ($trunc == 'left') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

         if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

+            return '...'.dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

         else

             return $string;

     }

     elseif ($trunc == 'wrap') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

         if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

+            return dol_substr($newstring, 0, $size, $stringencoding)."\n".dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

         else

             return $string;

     } else

@@ -2877,7 +2877,7 @@ 
     $url = DOL_BASE_URI;

 

     $theme = $conf->theme;

-    $path = 'theme/' . $theme;

+    $path = 'theme/'.$theme;

 

     // Define fullpathpicto to use into src

     if ($pictoisfullpath) {

@@ -2926,7 +2926,7 @@ 
                 $fakey = 'fa-pencil';

                 $facolor = '#444';

             } elseif ($pictowithoutext == 'filter') {

-                $fakey = 'fa-' . $pictowithoutext;

+                $fakey = 'fa-'.$pictowithoutext;

             } elseif ($pictowithoutext == 'grip_title' || $pictowithoutext == 'grip') {

                 $fakey = 'fa-arrows';

             } elseif ($pictowithoutext == 'listlight') {

@@ -2965,15 +2965,15 @@ 
             } elseif ($pictowithoutext == 'jabber') {

                 $fakey = 'fa-comment-o';

             } else {

-                $fakey = 'fa-' . $pictowithoutext;

+                $fakey = 'fa-'.$pictowithoutext;

                 $facolor = '#444';

                 $marginleftonlyshort = 0;

             }

 

             if (preg_match('/class="([^"]+)"/', $moreatt, $reg)) {

-                $morecss .= ($morecss ? ' ' : '') . $reg[1];

+                $morecss .= ($morecss ? ' ' : '').$reg[1];

             }

-            $enabledisablehtml = '<span class="fa ' . $fakey . ' ' . ($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '') . ' valignmiddle' . ($morecss ? ' ' . $morecss : '') . '" style="' . ($fasize ? ('font-size: ' . $fasize . ';') : '') . ($facolor ? (' color: ' . $facolor . ';') : '') . '" alt="' . dol_escape_htmltag($titlealt) . '"' . (($notitle || empty($title)) ? '' : ' title="' . dol_escape_htmltag($title) . '"') . ($moreatt ? ' ' . $moreatt : '') . '>';

+            $enabledisablehtml = '<span class="fa '.$fakey.' '.($marginleftonlyshort ? ($marginleftonlyshort == 1 ? 'marginleftonlyshort' : 'marginleftonly') : '').' valignmiddle'.($morecss ? ' '.$morecss : '').'" style="'.($fasize ? ('font-size: '.$fasize.';') : '').($facolor ? (' color: '.$facolor.';') : '').'" alt="'.dol_escape_htmltag($titlealt).'"'.(($notitle || empty($title)) ? '' : ' title="'.dol_escape_htmltag($title).'"').($moreatt ? ' '.$moreatt : '').'>';

             if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

                 $enabledisablehtml .= $titlealt;

             }

@@ -2983,11 +2983,11 @@ 
         }

 

         if (!empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) {

-            $path = $conf->global->MAIN_OVERWRITE_THEME_PATH . '/theme/' . $theme; // If the theme does not have the same name as the module

+            $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module

         } else if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {

-            $path = $conf->global->MAIN_OVERWRITE_THEME_RES . '/theme/' . $conf->global->MAIN_OVERWRITE_THEME_RES;  // To allow an external module to overwrite image resources whatever is activated theme

+            $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme

         } else if (!empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) {

-            $path = $theme . '/theme/' . $theme; // If the theme have the same name as the module

+            $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module

         }

 

         // If we ask an image into $url/$mymodule/img (instead of default path)

@@ -3007,22 +3007,22 @@ 
                 continue;

             }

             // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded

-            if (file_exists($dirroot . '/' . $path . '/img/' . $picto)) {

+            if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) {

                 //$url = DOL_URL_ROOT . $conf->file->dol_url_root[$type];

-                $url = DOL_BASE_URI . $conf->file->dol_url_root[$type];

+                $url = DOL_BASE_URI.$conf->file->dol_url_root[$type];

                 break;

             }

         }

 

         // $url is '' or '/custom', $path is current theme or

-        $fullpathpicto = $url . '/' . $path . '/img/' . $picto;

+        $fullpathpicto = $url.'/'.$path.'/img/'.$picto;

     }

 

     if ($srconly) {

         return $fullpathpicto;

     }

     // tag title is used for tooltip on <a>, tag alt can be used with very simple text on image for bind people

-    return '<img src="' . $fullpathpicto . '" alt="' . dol_escape_htmltag($alt) . '"' . (($notitle || empty($titlealt)) ? '' : ' title="' . dol_escape_htmltag($titlealt) . '"') . ($moreatt ? ' ' . $moreatt : ' class="inline-block' . ($morecss ? ' ' . $morecss : '') . '"') . '>'; // Alt is used for accessibility, title for popup

+    return '<img src="'.$fullpathpicto.'" alt="'.dol_escape_htmltag($alt).'"'.(($notitle || empty($titlealt)) ? '' : ' title="'.dol_escape_htmltag($titlealt).'"').($moreatt ? ' '.$moreatt : ' class="inline-block'.($morecss ? ' '.$morecss : '').'"').'>'; // Alt is used for accessibility, title for popup

 }

 

 /**

@@ -3040,7 +3040,7 @@ 
  */

 function img_object($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0)

 {

-    return img_picto($titlealt, 'object_' . $picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

+    return img_picto($titlealt, 'object_'.$picto, $moreatt, $pictoisfullpath, $srconly, $notitle);

 }

 

 /**

@@ -3061,7 +3061,7 @@ 
         $picto .= '.png';

 

     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;

-    $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;

+    $path = DOL_BASE_URI.'/theme/'.$conf->theme.'/img/weather/'.$picto;

 

     return img_picto($titlealt, $path, $moreatt, 1);

 }

@@ -3086,10 +3086,10 @@ 
     if ($pictoisfullpath)

         $path = $picto;

     else {

-        $path = DOL_URL_ROOT . '/theme/common/' . $picto;

+        $path = DOL_URL_ROOT.'/theme/common/'.$picto;

 

         if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

-            $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;

+            $themepath = DOL_BASE_PATH.'theme/'.$conf->theme.'/img/'.$picto;

 

             if (file_exists($themepath))

                 $path = $themepath;

@@ -3127,14 +3127,14 @@ 
             $numaction = 3;

             $titlealt = $langs->transnoentitiesnoconv('ChangeContactDone');

         } else {

-            $titlealt = $langs->transnoentitiesnoconv('ChangeStatus ' . $numaction);

+            $titlealt = $langs->transnoentitiesnoconv('ChangeStatus '.$numaction);

             $numaction = 0;

         }

     }

     if (!is_numeric($numaction))

         $numaction = 0;

 

-    return img_picto($titlealt, 'stcomm' . $numaction . '.png');

+    return img_picto($titlealt, 'stcomm'.$numaction.'.png');

 }

 

 /**

@@ -3151,7 +3151,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Show');

 

-    return img_picto($titlealt, 'pdf' . $size . '.png');

+    return img_picto($titlealt, 'pdf'.$size.'.png');

 }

 

 /**

@@ -3203,7 +3203,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Modify');

 

-    return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

+    return img_picto($titlealt, 'edit.png', ($float ? 'style="float: '.($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right').'"' : "").($other ? ' '.$other : ''));

 }

 

 /**

@@ -3221,7 +3221,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('View');

 

-    $moreatt = ($float ? 'style="float: right" ' : '') . $other;

+    $moreatt = ($float ? 'style="float: right" ' : '').$other;

 

     return img_picto($titlealt, 'view.png', $moreatt);

 }

@@ -3294,7 +3294,7 @@ 
             $usealttitle = $langs->trans('Info');

     }

 

-    return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

+    return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;'.($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')).'"');

 }

 

 /**

@@ -3328,7 +3328,7 @@ 
         $titlealt = $langs->trans('Warning');

 

     //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

-    return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

+    return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt) : ''));

 }

 

 /**

@@ -3362,7 +3362,7 @@ 
         $titlealt = $langs->trans('Next');

 

     //return img_picto($titlealt, 'next.png', $moreatt);

-    return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+    return '<span class="fa fa-chevron-right paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

 }

 

 /**

@@ -3380,7 +3380,7 @@ 
         $titlealt = $langs->trans('Previous');

 

     //return img_picto($titlealt, 'previous.png', $moreatt);

-    return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

+    return '<span class="fa fa-chevron-left paddingright paddingleft" title="'.dol_escape_htmltag($titlealt).'"></span>';

 }

 

 /**

@@ -3398,7 +3398,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Down');

 

-    return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

+    return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown'.($moreclass ? " ".$moreclass : "").'"');

 }

 

 /**

@@ -3416,7 +3416,7 @@ 
     if ($titlealt == 'default')

         $titlealt = $langs->trans('Up');

 

-    return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

+    return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup'.($moreclass ? " ".$moreclass : "").'"');

 }

 

 /**

@@ -3499,7 +3499,7 @@ 
         $brand = 'credit-card';

     }

 

-    return '<span class="fa fa-' . $brand . ' fa-2x fa-fw"></span>';

+    return '<span class="fa fa-'.$brand.' fa-2x fa-fw"></span>';

 }

 

 /**

@@ -3512,17 +3512,17 @@ 
  */

 function img_mime($file, $titlealt = '', $morecss = '')

 {

-    require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

     $mimetype = dol_mimetype($file, '', 1);

     $mimeimg = dol_mimetype($file, '', 2);

     $mimefa = dol_mimetype($file, '', 4);

 

     if (empty($titlealt))

-        $titlealt = 'Mime type: ' . $mimetype;

+        $titlealt = 'Mime type: '.$mimetype;

 

     //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

-    return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

+    return '<i class="fa fa-'.$mimefa.' paddingright"></i>';

 }

 

 /**

@@ -3537,7 +3537,7 @@ 
  */

 function img_phone($titlealt = 'default', $option = 0)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     global $conf, $langs;

 

@@ -3568,8 +3568,8 @@ 
 

     $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

-    $input = '<input type="image" class="liste_titre" name="button_search" src="' . $img . '" ';

-    $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+    $input = '<input type="image" class="liste_titre" name="button_search" src="'.$img.'" ';

+    $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

     return $input;

 }

@@ -3590,8 +3590,8 @@ 
 

     $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

-    $input = '<input type="image" class="liste_titre" name="button_removefilter" src="' . $img . '" ';

-    $input .= 'value="' . dol_escape_htmltag($titlealt) . '" title="' . dol_escape_htmltag($titlealt) . '" >';

+    $input = '<input type="image" class="liste_titre" name="button_removefilter" src="'.$img.'" ';

+    $input .= 'value="'.dol_escape_htmltag($titlealt).'" title="'.dol_escape_htmltag($titlealt).'" >';

 

     return $input;

 }

@@ -3611,10 +3611,10 @@ 
     global $conf, $langs;

 

     if ($infoonimgalt) {

-        return img_picto($text, 'info', 'class="hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '"');

+        return img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');

     }

 

-    return ($nodiv ? '' : '<div class="' . (empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)) . ' hideonsmartphone' . ($morecss ? ' ' . $morecss : '') . '">') . '<span class="fa fa-info-circle" title="' . dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')) . '"></span> ' . $text . ($nodiv ? '' : '</div>');

+    return ($nodiv ? '' : '<div class="'.(empty($admin) ? '' : ($admin == '1' ? 'info' : $admin)).' hideonsmartphone'.($morecss ? ' '.$morecss : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');

 }

 

 /**

@@ -3639,7 +3639,7 @@ 
 

     // Si erreur intervenue avant chargement langue

     if (!$langs) {

-        require_once DOL_BASE_PATH . '/core/class/translate.class.php';

+        require_once DOL_BASE_PATH.'/core/class/translate.class.php';

         $langs = new Translate('', $conf);

         $langs->load("main");

     }

@@ -3647,51 +3647,51 @@ 
     $langs->loadLangs(array('main', 'errors'));

 

     if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

-        $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

+        $out .= $langs->trans("DolibarrHasDetectedError").".<br>\n";

         if (!empty($conf->global->MAIN_FEATURES_LEVEL))

             $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

-        $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

+        $out .= $langs->trans("InformationToHelpDiagnose").":<br>\n";

 

-        $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

-        $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

+        $out .= "<b>".$langs->trans("Date").":</b> ".dol_print_date(time(), 'dayhourlog')."<br>\n";

+        $out .= "<b>".$langs->trans("Dolibarr").":</b> ".DOL_VERSION."<br>\n";

         if (isset($conf->global->MAIN_FEATURES_LEVEL))

-            $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+            $out .= "<b>".$langs->trans("LevelOfFeature").":</b> ".$conf->global->MAIN_FEATURES_LEVEL."<br>\n";

         if (function_exists("phpversion")) {

-            $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

+            $out .= "<b>".$langs->trans("PHP").":</b> ".phpversion()."<br>\n";

         }

-        $out .= "<b>" . $langs->trans("Server") . ":</b> " . $_SERVER["SERVER_SOFTWARE"] . "<br>\n";

+        $out .= "<b>".$langs->trans("Server").":</b> ".$_SERVER["SERVER_SOFTWARE"]."<br>\n";

         if (function_exists("php_uname")) {

-            $out .= "<b>" . $langs->trans("OS") . ":</b> " . php_uname() . "<br>\n";

+            $out .= "<b>".$langs->trans("OS").":</b> ".php_uname()."<br>\n";

         }

-        $out .= "<b>" . $langs->trans("UserAgent") . ":</b> " . $_SERVER["HTTP_USER_AGENT"] . "<br>\n";

+        $out .= "<b>".$langs->trans("UserAgent").":</b> ".$_SERVER["HTTP_USER_AGENT"]."<br>\n";

         $out .= "<br>\n";

-        $out .= "<b>" . $langs->trans("RequestedUrl") . ":</b> " . dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8') . "<br>\n";

-        $out .= "<b>" . $langs->trans("Referer") . ":</b> " . (isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '') . "<br>\n";

-        $out .= "<b>" . $langs->trans("MenuManager") . ":</b> " . (isset($conf->standard_menu) ? $conf->standard_menu : '') . "<br>\n";

+        $out .= "<b>".$langs->trans("RequestedUrl").":</b> ".dol_htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8')."<br>\n";

+        $out .= "<b>".$langs->trans("Referer").":</b> ".(isset($_SERVER["HTTP_REFERER"]) ? dol_htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8') : '')."<br>\n";

+        $out .= "<b>".$langs->trans("MenuManager").":</b> ".(isset($conf->standard_menu) ? $conf->standard_menu : '')."<br>\n";

         $out .= "<br>\n";

-        $syslog .= "url=" . dol_escape_htmltag($_SERVER["REQUEST_URI"]);

-        $syslog .= ", query_string=" . dol_escape_htmltag($_SERVER["QUERY_STRING"]);

+        $syslog .= "url=".dol_escape_htmltag($_SERVER["REQUEST_URI"]);

+        $syslog .= ", query_string=".dol_escape_htmltag($_SERVER["QUERY_STRING"]);

     } else {                              // Mode CLI

-        $out .= '> ' . $langs->transnoentities("ErrorInternalErrorDetected") . ":\n" . $argv[0] . "\n";

-        $syslog .= "pid=" . dol_getmypid();

+        $out .= '> '.$langs->transnoentities("ErrorInternalErrorDetected").":\n".$argv[0]."\n";

+        $syslog .= "pid=".dol_getmypid();

     }

 

     if (is_object($db)) {

         if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-            $out .= "<b>" . $langs->trans("DatabaseTypeManager") . ":</b> " . $db->type . "<br>\n";

-            $out .= "<b>" . $langs->trans("RequestLastAccessInError") . ":</b> " . ($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

-            $out .= "<b>" . $langs->trans("ReturnCodeLastAccessInError") . ":</b> " . ($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

-            $out .= "<b>" . $langs->trans("InformationLastAccessInError") . ":</b> " . ($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError")) . "<br>\n";

+            $out .= "<b>".$langs->trans("DatabaseTypeManager").":</b> ".$db->type."<br>\n";

+            $out .= "<b>".$langs->trans("RequestLastAccessInError").":</b> ".($db->lastqueryerror() ? dol_escape_htmltag($db->lastqueryerror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+            $out .= "<b>".$langs->trans("ReturnCodeLastAccessInError").":</b> ".($db->lasterrno() ? dol_escape_htmltag($db->lasterrno()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

+            $out .= "<b>".$langs->trans("InformationLastAccessInError").":</b> ".($db->lasterror() ? dol_escape_htmltag($db->lasterror()) : $langs->trans("ErrorNoRequestInError"))."<br>\n";

             $out .= "<br>\n";

         } else {                            // Mode CLI

             // No dol_escape_htmltag for output, we are in CLI mode

-            $out .= '> ' . $langs->transnoentities("DatabaseTypeManager") . ":\n" . $db->type . "\n";

-            $out .= '> ' . $langs->transnoentities("RequestLastAccessInError") . ":\n" . ($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-            $out .= '> ' . $langs->transnoentities("ReturnCodeLastAccessInError") . ":\n" . ($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

-            $out .= '> ' . $langs->transnoentities("InformationLastAccessInError") . ":\n" . ($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError")) . "\n";

+            $out .= '> '.$langs->transnoentities("DatabaseTypeManager").":\n".$db->type."\n";

+            $out .= '> '.$langs->transnoentities("RequestLastAccessInError").":\n".($db->lastqueryerror() ? $db->lastqueryerror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+            $out .= '> '.$langs->transnoentities("ReturnCodeLastAccessInError").":\n".($db->lasterrno() ? $db->lasterrno() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

+            $out .= '> '.$langs->transnoentities("InformationLastAccessInError").":\n".($db->lasterror() ? $db->lasterror() : $langs->transnoentities("ErrorNoRequestInError"))."\n";

         }

-        $syslog .= ", sql=" . $db->lastquery();

-        $syslog .= ", db_error=" . $db->lasterror();

+        $syslog .= ", sql=".$db->lastquery();

+        $syslog .= ", db_error=".$db->lasterror();

     }

 

     if ($error || $errors) {

@@ -3711,31 +3711,31 @@ 
             if (empty($msg))

                 continue;

             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

-                $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

+                $out .= "<b>".$langs->trans("Message").":</b> ".dol_escape_htmltag($msg)."<br>\n";

             } else {                        // Mode CLI

-                $out .= '> ' . $langs->transnoentities("Message") . ":\n" . $msg . "\n";

+                $out .= '> '.$langs->transnoentities("Message").":\n".$msg."\n";

             }

-            $syslog .= ", msg=" . $msg;

+            $syslog .= ", msg=".$msg;

         }

     }

     if (empty($dolibarr_main_prod) && $_SERVER['DOCUMENT_ROOT'] && function_exists('xdebug_print_function_stack') && function_exists('xdebug_call_file')) {

         xdebug_print_function_stack();

-        $out .= '<b>XDebug informations:</b>' . "<br>\n";

-        $out .= 'File: ' . xdebug_call_file() . "<br>\n";

-        $out .= 'Line: ' . xdebug_call_line() . "<br>\n";

-        $out .= 'Function: ' . xdebug_call_function() . "<br>\n";

+        $out .= '<b>XDebug informations:</b>'."<br>\n";

+        $out .= 'File: '.xdebug_call_file()."<br>\n";

+        $out .= 'Line: '.xdebug_call_line()."<br>\n";

+        $out .= 'Function: '.xdebug_call_function()."<br>\n";

         $out .= "<br>\n";

     }

 

     if (empty($dolibarr_main_prod))

         print $out;

     else {

-        print $langs->trans("DolibarrHasDetectedError") . '. ';

+        print $langs->trans("DolibarrHasDetectedError").'. ';

         print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");

         define("MAIN_CORE_ERROR", 1);

     }

     //else print 'Sorry, an error occured but the parameter $dolibarr_main_prod is defined in conf file so no message is reported to your browser. Please read the log file for error message.';

-    dol_syslog("Error " . $syslog, LOG_ERR);

+    dol_syslog("Error ".$syslog, LOG_ERR);

 }

 

 /**

@@ -3758,13 +3758,13 @@ 
     $langs->load("errors");

     $now = dol_now();

 

-    print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

-    print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

+    print '<br><div class="center login_main_message"><div class="'.$morecss.'">';

+    print $langs->trans("ErrorContactEMail", $email, $prefixcode.dol_print_date($now, '%Y%m%d'));

     if ($errormessage)

-        print '<br><br>' . $errormessage;

+        print '<br><br>'.$errormessage;

     if (is_array($errormessages) && count($errormessages)) {

         foreach ($errormessages as $mesgtoshow) {

-            print '<br><br>' . $mesgtoshow;

+            print '<br><br>'.$mesgtoshow;

         }

     }

     print '</div></div>';

@@ -3822,16 +3822,16 @@ 
     }

 

     $tmpsortfield = explode(',', $sortfield);

-    $sortfield1 = trim($tmpsortfield[0]);    // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

+    $sortfield1 = trim($tmpsortfield[0]); // If $sortfield is 'd.datep,d.id', it becomes 'd.datep'

     $tmpfield = explode(',', $field);

-    $field1 = trim($tmpfield[0]);            // If $field is 'd.datep,d.id', it becomes 'd.datep'

+    $field1 = trim($tmpfield[0]); // If $field is 'd.datep,d.id', it becomes 'd.datep'

     //var_dump('field='.$field.' field1='.$field1.' sortfield='.$sortfield.' sortfield1='.$sortfield1);

     // If field is used as sort criteria we use a specific css class liste_titre_sel

     // Example if (sortfield,field)=("nom","xxx.nom") or (sortfield,field)=("nom","nom")

     if ($field1 && ($sortfield1 == $field1 || $sortfield1 == preg_replace("/^[^\.]+\./", "", $field1))) {

-        $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre_sel" ' . $moreattrib . '>';

+        $out .= '<'.$tag.' class="'.$prefix.'liste_titre_sel" '.$moreattrib.'>';

     } else {

-        $out .= '<' . $tag . ' class="' . $prefix . 'liste_titre" ' . $moreattrib . '>';

+        $out .= '<'.$tag.' class="'.$prefix.'liste_titre" '.$moreattrib.'>';

     }

 

     if (empty($thead) && $field && empty($disablesortlink)) {    // If this is a sort field

@@ -3839,7 +3839,7 @@ 
         $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

         $options = preg_replace('/&+/i', '&', $options);

         if (!preg_match('/^&/', $options)) {

-            $options = '&' . $options;

+            $options = '&'.$options;

         }

 

         $sortordertouseinlink = '';

@@ -3857,7 +3857,7 @@ 
             }

         }

         $sortordertouseinlink = preg_replace('/,$/', '', $sortordertouseinlink);

-        $out .= '<a class="reposition" href="' . $file . '?sortfield=' . $field . '&sortorder=' . $sortordertouseinlink . '&begin=' . $begin . $options . '">';

+        $out .= '<a class="reposition" href="'.$file.'?sortfield='.$field.'&sortorder='.$sortordertouseinlink.'&begin='.$begin.$options.'">';

     }

 

     if ($tooltip) {

@@ -3875,7 +3875,7 @@ 
         $options = preg_replace('/sortorder=([a-zA-Z0-9,\s\.]+)/i', '', $options);

         $options = preg_replace('/&+/i', '&', $options);

         if (!preg_match('/^&/', $options)) {

-            $options = '&' . $options;

+            $options = '&'.$options;

         }

 

         if (!$sortorder || $field1 != $sortfield1) {

@@ -3885,19 +3885,19 @@ 
             if (preg_match('/^DESC/', $sortorder)) {

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';

-                $sortimg .= '<span class="nowrap">' . img_up("Z-A", 0) . '</span>';

+                $sortimg .= '<span class="nowrap">'.img_up("Z-A", 0).'</span>';

             }

             if (preg_match('/^ASC/', $sortorder)) {

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';

                 //$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';

-                $sortimg .= '<span class="nowrap">' . img_down("A-Z", 0) . '</span>';

+                $sortimg .= '<span class="nowrap">'.img_down("A-Z", 0).'</span>';

             }

         }

     }

 

     $out .= $sortimg;

 

-    $out .= '</' . $tag . '>';

+    $out .= '</'.$tag.'>';

 

     return $out;

 }

@@ -3912,9 +3912,9 @@ 
  */

 function print_titre($title)

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

-    print '<div class="titre">' . $title . '</div>';

+    print '<div class="titre">'.$title.'</div>';

 }

 

 /**

@@ -3957,20 +3957,20 @@ 
     }

 

     $return .= "\n";

-    $return .= '<table ' . ($id ? 'id="' . $id . '" ' : '') . 'summary="" class="centpercent notopnoleftnoright' . ($morecssontable ? ' ' . $morecssontable : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

+    $return .= '<table '.($id ? 'id="'.$id.'" ' : '').'summary="" class="centpercent notopnoleftnoright'.($morecssontable ? ' '.$morecssontable : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into print_barre_list

     if ($picto) {

-        $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">' . img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath) . '</td>';

+        $return .= '<td class="nobordernopadding widthpictotitle opacityhigh" valign="middle">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';

     }

     $return .= '<td class="nobordernopadding valignmiddle">';

-    $return .= '<div class="titre inline-block">' . $titre . '</div>';

+    $return .= '<div class="titre inline-block">'.$titre.'</div>';

     $return .= '</td>';

     if (dol_strlen($morehtmlcenter)) {

-        $return .= '<td class="nobordernopadding" align="center" valign="middle">' . $morehtmlcenter . '</td>';

+        $return .= '<td class="nobordernopadding" align="center" valign="middle">'.$morehtmlcenter.'</td>';

     }

     if (dol_strlen($morehtmlright)) {

-        $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">' . $morehtmlright . '</td>';

+        $return .= '<td class="nobordernopadding titre_right wordbreak" align="right" valign="middle">'.$morehtmlright.'</td>';

     }

-    $return .= '</tr></table>' . "\n";

+    $return .= '</tr></table>'."\n";

 

     return $return;

 }

@@ -4018,29 +4018,29 @@ 
     //print 'totalnboflines='.$totalnboflines.'-savlimit='.$savlimit.'-limit='.$limit.'-num='.$num.'-nextpage='.$nextpage;

 

     print "\n";

-    print "<!-- Begin title '" . $titre . "' -->\n";

-    print '<table border="0" class="centpercent notopnoleftnoright' . ($morecss ? ' ' . $morecss : '') . '" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

+    print "<!-- Begin title '".$titre."' -->\n";

+    print '<table border="0" class="centpercent notopnoleftnoright'.($morecss ? ' '.$morecss : '').'" style="margin-bottom: 6px;"><tr>'; // maring bottom must be same than into load_fiche_tire

     // Left

     //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

     print '<td class="nobordernopadding valignmiddle">';

     if ($picto && $titre)

         print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

-    print '<div class="titre inline-block">' . $titre;

+    print '<div class="titre inline-block">'.$titre;

     if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-        print ' (' . $totalnboflines . ')';

+        print ' ('.$totalnboflines.')';

     print '</div></td>';

 

     // Center

     if ($morehtmlcenter) {

-        print '<td class="nobordernopadding center valignmiddle">' . $morehtmlcenter . '</td>';

+        print '<td class="nobordernopadding center valignmiddle">'.$morehtmlcenter.'</td>';

     }

 

     // Right

     print '<td class="nobordernopadding valignmiddle" align="right">';

     if ($sortfield)

-        $options .= "&sortfield=" . urlencode($sortfield);

+        $options .= "&sortfield=".urlencode($sortfield);

     if ($sortorder)

-        $options .= "&sortorder=" . urlencode($sortorder);

+        $options .= "&sortorder=".urlencode($sortorder);

     // Show navigation bar

     $pagelist = '';

     if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4058,40 +4058,40 @@ 
             }

 

             if ($cpt >= 1) {

-                $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

+                $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=0'.$options.'">1</a></li>';

                 if ($cpt > 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                 else if ($cpt == 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page=1'.$options.'">2</a></li>';

             }

 

             do {

                 if ($cpt == $page) {

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . '</span></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1).'</span></li>';

                 } else {

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . $cpt . $options . '">' . ($cpt + 1) . '</a></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.$cpt.$options.'">'.($cpt + 1).'</a></li>';

                 }

                 $cpt++;

             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

             if ($cpt < $nbpages) {

                 if ($cpt < $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '').'>...</span></li>';

                 else if ($cpt == $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

-                $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

+                    $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 2).$options.'">'.($nbpages - 1).'</a></li>';

+                $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><a href="'.$file.'?page='.($nbpages - 1).$options.'">'.$nbpages.'</a></li>';

             }

         }

         else {

-            $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

+            $pagelist .= '<li'.(($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '').'><span '.(($conf->dol_use_jmobile != 4) ? 'class="active"' : '').'>'.($page + 1)."</li>";

         }

     }

 

-    print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit);  // output the div and ul for previous/last completed with page numbers into $pagelist

+    print_fleche_navigation($page, $file, $options, $nextpage, $pagelist, $morehtmlright, $savlimit, $totalnboflines, $hideselectlimit); // output the div and ul for previous/last completed with page numbers into $pagelist

 

     print '</td>';

 

-    print '</tr></table>' . "\n";

+    print '</tr></table>'."\n";

     print "<!-- End title -->\n\n";

 }

 

@@ -4122,12 +4122,12 @@ 
             $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

 

         print '<li class="pagination">';

-        print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

+        print '<select class="flat selectlimit" name="limit" title="'.dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")).'">';

         $tmpchoice = explode(',', $pagesizechoices);

-        $tmpkey = $limit . ':' . $limit;

+        $tmpkey = $limit.':'.$limit;

         if (!in_array($tmpkey, $tmpchoice))

             $tmpchoice[] = $tmpkey;

-        $tmpkey = $conf->liste_limit . ':' . $conf->liste_limit;

+        $tmpkey = $conf->liste_limit.':'.$conf->liste_limit;

         if (!in_array($tmpkey, $tmpchoice))

             $tmpchoice[] = $tmpkey;

         asort($tmpchoice, SORT_NUMERIC);

@@ -4142,7 +4142,7 @@ 
                     $selected = ' selected="selected"';

                     $found = true;

                 }

-                print '<option name="' . $key . '"' . $selected . '>' . dol_escape_htmltag($val) . '</option>' . "\n";

+                print '<option name="'.$key.'"'.$selected.'>'.dol_escape_htmltag($val).'</option>'."\n";

             }

         }

         print '</select>';

@@ -4161,20 +4161,20 @@ 
         print '</li>';

     }

     if ($page > 0) {

-        print '<li class="pagination"><a class="paginationprevious" href="' . $file . '?page=' . ($page - 1) . $options . '"><i class="fa fa-chevron-left" title="' . dol_escape_htmltag($langs->trans("Previous")) . '"></i></a></li>';

+        print '<li class="pagination"><a class="paginationprevious" href="'.$file.'?page='.($page - 1).$options.'"><i class="fa fa-chevron-left" title="'.dol_escape_htmltag($langs->trans("Previous")).'"></i></a></li>';

     }

     if ($betweenarrows) {

         print $betweenarrows;

     }

     if ($nextpage > 0) {

-        print '<li class="pagination"><a class="paginationnext" href="' . $file . '?page=' . ($page + 1) . $options . '"><i class="fa fa-chevron-right" title="' . dol_escape_htmltag($langs->trans("Next")) . '"></i></a></li>';

+        print '<li class="pagination"><a class="paginationnext" href="'.$file.'?page='.($page + 1).$options.'"><i class="fa fa-chevron-right" title="'.dol_escape_htmltag($langs->trans("Next")).'"></i></a></li>';

     }

     if ($afterarrows) {

         print '<li class="paginationafterarrows">';

         print $afterarrows;

         print '</li>';

     }

-    print '</ul></div>' . "\n";

+    print '</ul></div>'."\n";

 }

 

 /**

@@ -4196,8 +4196,8 @@ 
         $addpercent = true;

     }

     if (preg_match('/\((.*)\)/', $rate, $reg)) {

-        $morelabel = ' (' . $reg[1] . ')';

-        $rate = preg_replace('/\s*' . preg_quote($morelabel, '/') . '/', '', $rate);

+        $morelabel = ' ('.$reg[1].')';

+        $rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);

     }

     if (preg_match('/\*/', $rate)) {

         $rate = str_replace('*', '', $rate);

@@ -4206,10 +4206,10 @@ 
 

     // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

     if (!preg_match('/\//', $rate))

-        $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

+        $ret = price($rate, 0, '', 0, 0).($addpercent ? '%' : '');

     else {

         // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

-        $ret = $rate . ($addpercent ? '%' : '');

+        $ret = $rate.($addpercent ? '%' : '');

     }

     if (($info_bits & 1) && $usestarfornpr >= 0)

         $ret .= ' *';

@@ -4303,10 +4303,10 @@ 
             $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

         else {

             $tmpcur = $outlangs->getCurrencySymbol($currency_code);

-            $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

+            $cursymbolafter .= ($tmpcur == $currency_code ? ' '.$tmpcur : $tmpcur);

         }

     }

-    $output = $cursymbolbefore . $output . $end . ($cursymbolafter ? ' ' : '') . $cursymbolafter;

+    $output = $cursymbolbefore.$output.$end.($cursymbolafter ? ' ' : '').$cursymbolafter;

 

     return $output;

 }

@@ -4360,7 +4360,7 @@ 
         // Now make replace (the main goal of function)

         if ($thousand != ',' && $thousand != '.')

             $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-        $amount = str_replace(' ', '', $amount);  // To avoid spaces

+        $amount = str_replace(' ', '', $amount); // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

     }

@@ -4389,14 +4389,14 @@ 
             $temps = sprintf("%0.10F", $amount - intval($amount)); // temps=0.0000000000 or 0.0000200000 or 9999.1000000000

             $temps = preg_replace('/([\.1-9])0+$/', '\\1', $temps); // temps=0. or 0.00002 or 9999.1

             $nbofdec = max(0, dol_strlen($temps) - 2); // -2 to remove "0."

-            $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand);  // Convert amount to format with dolibarr dec and thousand

+            $amount = number_format($amount, min($nbofdec, $nbofdectoround), $dec, $thousand); // Convert amount to format with dolibarr dec and thousand

         }

         //print "TT".$amount.'<br>';

         // Always make replace because each math function (like round) replace

         // with local values and we want a number that has a SQL string format x.y

         if ($thousand != ',' && $thousand != '.')

             $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

-        $amount = str_replace(' ', '', $amount);  // To avoid spaces

+        $amount = str_replace(' ', '', $amount); // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

     }

@@ -4417,7 +4417,7 @@ 
  */

 function showDimensionInBestUnit($dimension, $unit, $type, $outputlangs, $round = -1, $forceunitoutput = 'no')

 {

-    require_once DOL_BASE_PATH . '/core/lib/product.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/product.lib.php';

 

     if (($forceunitoutput == 'no' && $dimension < 1 / 10000) || (is_numeric($forceunitoutput) && $forceunitoutput == -6)) {

         $dimension = $dimension * 1000000;

@@ -4433,7 +4433,7 @@ 
         $unit = $unit + 3;

     }

 

-    $ret = price($dimension, 0, $outputlangs, 0, 0, $round) . ' ' . measuring_units_string($unit, $type);

+    $ret = price($dimension, 0, $outputlangs, 0, 0, $round).' '.measuring_units_string($unit, $type);

 

     return $ret;

 }

@@ -4457,7 +4457,7 @@ 
     if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

         $thirdparty_seller = $mysoc;

 

-    dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

+    dol_syslog("get_localtax tva=".$vatrate." local=".$local." thirdparty_buyer id=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '')."/country_code=".(is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '')." thirdparty_seller id=".$thirdparty_seller->id."/country_code=".$thirdparty_seller->country_code." thirdparty_seller localtax1_assuj=".$thirdparty_seller->localtax1_assuj."  thirdparty_seller localtax2_assuj=".$thirdparty_seller->localtax2_assuj);

 

     $vatratecleaned = $vatrate;

     if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4488,7 +4488,7 @@ 
         if ($local == 2) {

             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

             if (!$mysoc->localtax2_assuj)

-                return 0;  // If main vat is 0, IRPF may be different than 0.

+                return 0; // If main vat is 0, IRPF may be different than 0.

             if ($thirdparty_seller->id == $mysoc->id) {

                 if (!$thirdparty_buyer->localtax2_assuj)

                     return 0;

@@ -4542,13 +4542,13 @@ 
 

     // By default, search value of local tax on line of common tax

     $sql = "SELECT t.localtax1, t.localtax2, t.localtax1_type, t.localtax2_type";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

-    $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$thirdparty_seller->country_code."'";

+    $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

     if ($vatratecode)

-        $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

+        $sql .= " AND t.code ='".$vatratecode."'"; // If we have the code, we use it in priority

     else

-        $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+        $sql .= " AND t.recuperableonly ='".$vatnpr."'";

     dol_syslog("get_localtax", LOG_DEBUG);

     $resql = $db->query($sql);

 

@@ -4594,10 +4594,10 @@ 
 {

     global $db, $mysoc;

     $sql = "SELECT t.localtax1, t.localtax2 ";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=t.fk_pays";

-    $sql .= " WHERE c.code = '" . $mysoc->country_code . "' AND t.active = 1 AND t.taux=(";

-    $sql .= "  SELECT max(tt.taux) FROM " . MAIN_DB_PREFIX . "c_tva as tt inner join " . MAIN_DB_PREFIX . "c_country as c ON c.rowid=tt.fk_pays";

-    $sql .= "  WHERE c.code = '" . $mysoc->country_code . "' AND tt.active = 1";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=t.fk_pays";

+    $sql .= " WHERE c.code = '".$mysoc->country_code."' AND t.active = 1 AND t.taux=(";

+    $sql .= "  SELECT max(tt.taux) FROM ".MAIN_DB_PREFIX."c_tva as tt inner join ".MAIN_DB_PREFIX."c_country as c ON c.rowid=tt.fk_pays";

+    $sql .= "  WHERE c.code = '".$mysoc->country_code."' AND tt.active = 1";

     $sql .= "  )";

 

     $resql = $db->query($sql);

@@ -4627,13 +4627,13 @@ 
 {

     global $db, $mysoc;

 

-    dol_syslog("getTaxesFromId vat id or rate = " . $vatrate);

+    dol_syslog("getTaxesFromId vat id or rate = ".$vatrate);

 

     // Search local taxes

     $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

     if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

+        $sql .= " WHERE t.rowid = ".(int) $vatrate;

     else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

@@ -4642,13 +4642,13 @@ 
             $vatratecode = $reg[2];

         }

 

-        $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+        $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

         /* if ($mysoc->country_code == 'ES') $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'";    // vat in spain use the buyer country ??

           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

-        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+        $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+            $sql .= " AND t.code = '".$vatratecode."'";

     }

 

     $resql = $db->query($sql);

@@ -4684,13 +4684,13 @@ 
 {

     global $db, $mysoc;

 

-    dol_syslog("getLocalTaxesFromRate vatrate=" . $vatrate . " local=" . $local);

+    dol_syslog("getLocalTaxesFromRate vatrate=".$vatrate." local=".$local);

 

     // Search local taxes

     $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

+    $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t";

     if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

+        $sql .= " WHERE t.rowid = ".(int) $vatrate;

     else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

@@ -4699,14 +4699,14 @@ 
             $vatratecode = $reg[2];

         }

 

-        $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

+        $sql .= ", ".MAIN_DB_PREFIX."c_country as c";

         if ($mysoc->country_code == 'ES')

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$buyer->country_code."'"; // local tax in spain use the buyer country ??

         else

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

-        $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

+            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'";

+        $sql .= " AND t.taux = ".((float) $vatratecleaned)." AND t.active = 1";

         if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+            $sql .= " AND t.code = '".$vatratecode."'";

     }

 

     $resql = $db->query($sql);

@@ -4738,7 +4738,7 @@ 
 {

     global $db, $conf, $mysoc;

 

-    require_once DOL_BASE_PATH . '/product/class/product.class.php';

+    require_once DOL_BASE_PATH.'/product/class/product.class.php';

 

     $ret = 0;

     $found = 0;

@@ -4753,12 +4753,12 @@ 
                 $product->get_buyprice($idprodfournprice, 0, 0, 0);

                 $ret = $product->vatrate_supplier;

                 if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                    $ret .= ' ('.$product->default_vat_code.')';

             }

             else {

-                $ret = $product->tva_tx;    // Default vat of product we defined

+                $ret = $product->tva_tx; // Default vat of product we defined

                 if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                    $ret .= ' ('.$product->default_vat_code.')';

             }

             $found = 1;

         }

@@ -4772,8 +4772,8 @@ 
         if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {

             // If vat of product for the country not found or not defined, we return the first higher vat of country.

             $sql = "SELECT t.taux as vat_rate, t.code as default_vat_code";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+            $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+            $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

             $sql .= " ORDER BY t.taux DESC, t.code ASC, t.recuperableonly ASC";

             $sql .= $db->plimit(1);

 

@@ -4783,16 +4783,16 @@ 
                 if ($obj) {

                     $ret = $obj->vat_rate;

                     if ($obj->default_vat_code)

-                        $ret .= ' (' . $obj->default_vat_code . ')';

+                        $ret .= ' ('.$obj->default_vat_code.')';

                 }

                 $db->free($sql);

             } else

                 dol_print_error($db);

         } else

-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS; // Forced value if autodetect fails

     }

 

-    dol_syslog("get_product_vat_for_country: ret=" . $ret);

+    dol_syslog("get_product_vat_for_country: ret=".$ret);

     return $ret;

 }

 

@@ -4810,7 +4810,7 @@ 
     global $db, $mysoc;

 

     if (!class_exists('Product')) {

-        require_once DOL_BASE_PATH . 'product/class/product.class.php';

+        require_once DOL_BASE_PATH.'product/class/product.class.php';

     }

 

     $ret = 0;

@@ -4835,8 +4835,8 @@ 
     if (!$found) {

         // If vat of product for the country not found or not defined, we return higher vat of country.

         $sql = "SELECT taux as vat_rate, localtax1, localtax2";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

-        $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='" . $thirdparty_seller->country_code . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

+        $sql .= " WHERE t.active=1 AND t.fk_pays = c.rowid AND c.code='".$thirdparty_seller->country_code."'";

         $sql .= " ORDER BY t.taux DESC, t.recuperableonly ASC";

         $sql .= $db->plimit(1);

 

@@ -4853,7 +4853,7 @@ 
             dol_print_error($db);

     }

 

-    dol_syslog("get_product_localtax_for_country: ret=" . $ret);

+    dol_syslog("get_product_localtax_for_country: ret=".$ret);

     return $ret;

 }

 

@@ -4877,7 +4877,7 @@ 
 {

     global $conf;

 

-    require_once DOL_BASE_PATH . '/core/lib/company.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/company.lib.php';

 

     // Note: possible values for tva_assuj are 0/1 or franchise/reel

     $seller_use_vat = ((is_numeric($thirdparty_seller->tva_assuj) && !$thirdparty_seller->tva_assuj) || (!is_numeric($thirdparty_seller->tva_assuj) && $thirdparty_seller->tva_assuj == 'franchise')) ? 0 : 1;

@@ -4888,7 +4888,7 @@ 
     $buyer_country_code = $thirdparty_buyer->country_code;

     $buyer_in_cee = isInEEC($thirdparty_buyer);

 

-    dol_syslog("get_default_tva: seller use vat=" . $seller_use_vat . ", seller country=" . $seller_country_code . ", seller in cee=" . $seller_in_cee . ", buyer vat number=" . $thirdparty_buyer->tva_intra . " buyer country=" . $buyer_country_code . ", buyer in cee=" . $buyer_in_cee . ", idprod=" . $idprod . ", idprodfournprice=" . $idprodfournprice . ", SERVICE_ARE_ECOMMERCE_200238EC=" . (!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

+    dol_syslog("get_default_tva: seller use vat=".$seller_use_vat.", seller country=".$seller_country_code.", seller in cee=".$seller_in_cee.", buyer vat number=".$thirdparty_buyer->tva_intra." buyer country=".$buyer_country_code.", buyer in cee=".$buyer_in_cee.", idprod=".$idprod.", idprodfournprice=".$idprodfournprice.", SERVICE_ARE_ECOMMERCE_200238EC=".(!empty($conf->global->SERVICES_ARE_ECOMMERCE_200238EC) ? $conf->global->SERVICES_ARE_ECOMMERCE_200238EC : ''));

 

     // If services are eServices according to EU Council Directive 2002/38/EC (http://ec.europa.eu/taxation_customs/taxation/vat/traders/e-commerce/article_1610_en.htm)

     // we use the buyer VAT.

@@ -4954,14 +4954,14 @@ 
 

     if ($idprodfournprice > 0) {

         if (!class_exists('ProductFournisseur'))

-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+            require_once DOL_BASE_PATH.'/fourn/class/fournisseur.product.class.php';

         $prodprice = new ProductFournisseur($db);

         $prodprice->fetch_product_fournisseur_price($idprodfournprice);

         return $prodprice->fourn_tva_npr;

     }

     elseif ($idprod > 0) {

         if (!class_exists('Product'))

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+            require_once DOL_BASE_PATH.'product/class/product.class.php';

         $prod = new Product($db);

         $prod->fetch($idprod);

         return $prod->tva_npr;

@@ -5040,7 +5040,7 @@ 
         if ($case == 2)

             $result = '<input type="checkbox" value="1" checked disabled>';

         if ($case == 3)

-            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+            $result = '<input type="checkbox" value="1" checked disabled> '.$result;

 

         $classname = 'ok';

     }

@@ -5051,7 +5051,7 @@ 
         if ($case == 2)

             $result = '<input type="checkbox" value="0" disabled>';

         if ($case == 3)

-            $result = '<input type="checkbox" value="0" disabled> ' . $result;

+            $result = '<input type="checkbox" value="0" disabled> '.$result;

 

         if ($color == 2)

             $classname = 'ok';

@@ -5059,7 +5059,7 @@ 
             $classname = 'error';

     }

     if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        return '<font class="'.$classname.'">'.$result.'</font>';

     return $result;

 }

 

@@ -5093,13 +5093,13 @@ 
             $num = preg_replace('/([^0-9])/i', '', $num);

         else

             $num = preg_replace('/^.*\-/i', '', $num);

-        $num = substr("000" . $num, -$level);

+        $num = substr("000".$num, -$level);

         if ($level == 1)

             $path = substr($num, 0, 1);

         if ($level == 2)

-            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

+            $path = substr($num, 1, 1).'/'.substr($num, 0, 1);

         if ($level == 3)

-            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

+            $path = substr($num, 2, 1).'/'.substr($num, 1, 1).'/'.substr($num, 0, 1);

     }

     else {

         // TODO

@@ -5130,7 +5130,7 @@ 
 {

     global $conf;

 

-    dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

+    dol_syslog("functions.lib::dol_mkdir: dir=".$dir, LOG_INFO);

 

     $dir_osencoded = dol_osencode($dir);

     if (@is_dir($dir_osencoded))

@@ -5142,15 +5142,15 @@ 
     $ccdir = '';

     if (!empty($dataroot)) {

         // Remove data root from loop

-        $dir = str_replace($dataroot . '/', '', $dir);

-        $ccdir = $dataroot . '/';

+        $dir = str_replace($dataroot.'/', '', $dir);

+        $ccdir = $dataroot.'/';

     }

 

     $cdir = explode("/", $dir);

     $num = count($cdir);

     for ($i = 0; $i < $num; $i++) {

         if ($i > 0)

-            $ccdir .= '/' . $cdir[$i];

+            $ccdir .= '/'.$cdir[$i];

         else

             $ccdir .= $cdir[$i];

         if (preg_match("/^.:$/", $ccdir, $regs))

@@ -5174,20 +5174,20 @@ 
         if ($ccdir) {

             $ccdir_osencoded = dol_osencode($ccdir);

             if (!@is_dir($ccdir_osencoded)) {

-                dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

+                dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);

 

                 umask(0);

                 $dirmaskdec = octdec($newmask);

                 if (empty($newmask)) {

                     $dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);

                 }

-                $dirmaskdec |= octdec('0111');  // Set x bit required for directories

+                $dirmaskdec |= octdec('0111'); // Set x bit required for directories

                 if (!@mkdir($ccdir_osencoded, $dirmaskdec)) {

                     // Si le is_dir a renvoye une fausse info, alors on passe ici.

-                    dol_syslog("functions.lib::dol_mkdir: Fails to create directory '" . $ccdir . "' or directory already exists.", LOG_WARNING);

+                    dol_syslog("functions.lib::dol_mkdir: Fails to create directory '".$ccdir."' or directory already exists.", LOG_WARNING);

                     $nberr++;

                 } else {

-                    dol_syslog("functions.lib::dol_mkdir: Directory '" . $ccdir . "' created", LOG_DEBUG);

+                    dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' created", LOG_DEBUG);

                     $nberr = 0; // On remet a zero car si on arrive ici, cela veut dire que les echecs precedents peuvent etre ignore

                     $nbcreated++;

                 }

@@ -5235,9 +5235,9 @@ 
     } else {

         $pattern = "/<[^<>]+>/";

         // Exemple of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>

-        $temp = preg_replace($pattern, "", $temp);    // pass 1

+        $temp = preg_replace($pattern, "", $temp); // pass 1

         // $temp after pass 1: <a href="/myurl" title="A title">0000-021

-        $temp = preg_replace($pattern, "", $temp);    // pass 2

+        $temp = preg_replace($pattern, "", $temp); // pass 2

         // $temp after pass 2: 0000-021

     }

 

@@ -5293,8 +5293,8 @@ 
 {

     $temp = $stringtoclean;

     foreach ($disallowed_tags as $tagtoremove) {

-        $temp = preg_replace('/<\/?' . $tagtoremove . '>/', '', $temp);

-        $temp = preg_replace('/<\/?' . $tagtoremove . '\s+[^>]*>/', '', $temp);

+        $temp = preg_replace('/<\/?'.$tagtoremove.'>/', '', $temp);

+        $temp = preg_replace('/<\/?'.$tagtoremove.'\s+[^>]*>/', '', $temp);

     }

     return $temp;

 }

@@ -5311,12 +5311,12 @@ 
 {

     if ($nboflines == 1) {

         if (dol_textishtml($text)) {

-            $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text);  // The s pattern modifier means the . can match newline characters

+            $firstline = preg_replace('/<br[^>]*>.*$/s', '', $text); // The s pattern modifier means the . can match newline characters

             $firstline = preg_replace('/<div[^>]*>.*$/s', '', $firstline); // The s pattern modifier means the . can match newline characters

         } else {

             $firstline = preg_replace('/[\n\r].*/', '', $text);

         }

-        return $firstline . ((strlen($firstline) != strlen($text)) ? '...' : '');

+        return $firstline.((strlen($firstline) != strlen($text)) ? '...' : '');

     } else {

         $ishtml = 0;

         if (dol_textishtml($text)) {

@@ -5332,7 +5332,7 @@ 
             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

         else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+            $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $firstline = '';

@@ -5346,7 +5346,7 @@ 
             $i++;

         }

         unset($a);

-        return $firstline . (($i < $nba) ? '...' : '');

+        return $firstline.(($i < $nba) ? '...' : '');

     }

 }

 

@@ -5417,9 +5417,9 @@ 
 function dol_htmlentitiesbr_decode($stringtodecode, $pagecodeto = 'UTF-8')

 {

     $ret = dol_html_entity_decode($stringtodecode, ENT_COMPAT, $pagecodeto);

-    $ret = preg_replace('/' . "\r\n" . '<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

-    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\r\n" . '/i', "\r\n", $ret);

-    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>' . "\n" . '/i', "\n", $ret);

+    $ret = preg_replace('/'."\r\n".'<br(\s[\sa-zA-Z_="]*)?\/?>/i', "<br>", $ret);

+    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\r\n".'/i', "\r\n", $ret);

+    $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>'."\n".'/i', "\n", $ret);

     $ret = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', "\n", $ret);

     return $ret;

 }

@@ -5432,7 +5432,7 @@ 
  */

 function dol_htmlcleanlastbr($stringtodecode)

 {

-    $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|' . "\n" . '|' . "\r" . ')+$/i', "", $stringtodecode);

+    $ret = preg_replace('/(<br>|<br(\s[\sa-zA-Z_="]*)?\/?>|'."\n".'|'."\r".')+$/i', "", $stringtodecode);

     return $ret;

 }

 

@@ -5529,7 +5529,7 @@ 
         $pattern = '/(<br[^>]*>)/Uu';

     } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

     else

-        $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        $pattern = '/(<br[^>]*>)/U'; // /U is to have UNGREEDY regex to limit to one html tag.

     $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

     $nblines = (int) floor((count($a) + 1) / 2);

@@ -5560,7 +5560,7 @@ 
  */

 function dol_microtime_float()

 {

-    dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);

+    dol_syslog(__FUNCTION__." is deprecated", LOG_WARNING);

 

     return microtime(true);

 }

@@ -5606,9 +5606,9 @@ 
         elseif (preg_match('/<h[0-9]>/i', $msg))

             return true;

         elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-            return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+            return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

         elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-            return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+            return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

         return false;

     }

@@ -5833,7 +5833,7 @@ 
                 if ($object->fetch_optionals() > 0) {

                     if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {

                         foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $label) {

-                            $substitutionarray['__EXTRAFIELD_' . strtoupper($key) . '__'] = $object->array_options['options_' . $key];

+                            $substitutionarray['__EXTRAFIELD_'.strtoupper($key).'__'] = $object->array_options['options_'.$key];

                         }

                     }

                 }

@@ -5845,7 +5845,7 @@ 
                 $paymenturl = '';

             } else {

                 // Set the online payment url link into __ONLINE_PAYMENT_URL__ key

-                require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

+                require_once DOL_BASE_PATH.'/core/lib/payments.lib.php';

                 $outputlangs->loadLangs(array('paypal', 'other'));

                 $typeforonlinepayment = 'free';

                 if (is_object($object) && $object->element == 'commande')

@@ -5906,7 +5906,7 @@ 
 

     //var_dump($substitutionarray['__AMOUNT_FORMATED__']);

     if (empty($exclude) || !in_array('date', $exclude)) {

-        include_once DOL_BASE_PATH . '/core/lib/date.lib.php';

+        include_once DOL_BASE_PATH.'/core/lib/date.lib.php';

 

         $tmp = dol_getdate(dol_now(), true);

         $tmp2 = dol_get_prev_day($tmp['mday'], $tmp['mon'], $tmp['year']);

@@ -5916,13 +5916,13 @@ 
 

         $substitutionarray = array_merge($substitutionarray, array(

             '__DAY__' => (string) $tmp['mday'],

-            '__DAY_TEXT__' => $outputlangs->trans('Day' . $tmp['wday']), // Monday

-            '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'] . 'Min'), // Mon

-            '__DAY_TEXT_MIN__' => $outputlangs->trans('Short' . $tmp['weekday']), // M

+            '__DAY_TEXT__' => $outputlangs->trans('Day'.$tmp['wday']), // Monday

+            '__DAY_TEXT_SHORT__' => $outputlangs->trans($tmp['weekday'].'Min'), // Mon

+            '__DAY_TEXT_MIN__' => $outputlangs->trans('Short'.$tmp['weekday']), // M

             '__MONTH__' => (string) $tmp['mon'],

-            '__MONTH_TEXT__' => $outputlangs->trans('Month' . sprintf("%02d", $tmp['mon'])),

-            '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort' . sprintf("%02d", $tmp['mon'])),

-            '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort' . sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT__' => $outputlangs->trans('Month'.sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT_SHORT__' => $outputlangs->trans('MonthShort'.sprintf("%02d", $tmp['mon'])),

+            '__MONTH_TEXT_MIN__' => $outputlangs->trans('MonthVeryShort'.sprintf("%02d", $tmp['mon'])),

             '__YEAR__' => (string) $tmp['year'],

             '__PREVIOUS_DAY__' => (string) $tmp2['day'],

             '__PREVIOUS_MONTH__' => (string) $tmp3['month'],

@@ -5981,7 +5981,7 @@ 
             if (!empty($tmp[1]))

                 $outputlangs->load($tmp[1]);

 

-            $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

+            $text = preg_replace('/__\('.preg_quote($reg[1], '/').'\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

         }

     }

 

@@ -5997,13 +5997,13 @@ 
             $newval = '*****forbidden*****';

         else

             $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

-        $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

+        $text = preg_replace('/__\['.preg_quote($keyfound, '/').'\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

     }

 

     // Make substitition for array $substitutionarray

     foreach ($substitutionarray as $key => $value) {

         if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = '';  // Protection

+            $value = ''; // Protection

         if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

             $value = ''; // Protection

 

@@ -6029,7 +6029,7 @@ 
 {

     global $conf, $user;

 

-    require_once DOL_BASE_PATH . '/core/lib/files.lib.php';

+    require_once DOL_BASE_PATH.'/core/lib/files.lib.php';

 

     // Add a substitution key for each extrafields, using key __EXTRA_XXX__

     // TODO Remove this. Already available into the getCommonSubstitutionArray used to build the substitution array.

@@ -6059,11 +6059,11 @@ 
             if (preg_match('/functions_(.*)\.lib\.php/i', $substitfile['name'], $reg)) {

                 $module = $reg[1];

 

-                dol_syslog("Library " . $substitfile['name'] . " found into " . $dir);

+                dol_syslog("Library ".$substitfile['name']." found into ".$dir);

                 // Include the user's functions file

-                require_once $dir . $substitfile['name'];

+                require_once $dir.$substitfile['name'];

                 // Call the user's function, and only if it is defined

-                $function_name = $module . "_" . $callfunc;

+                $function_name = $module."_".$callfunc;

                 if (function_exists($function_name))

                     $function_name($substitutionarray, $outputlangs, $object, $parameters);

             }

@@ -6105,13 +6105,13 @@ 
         $outputlangs = $langs;

 

     if ($date_start && $date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

     if ($date_start && !$date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateFrom', dol_print_date($date_start, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

     if (!$date_start && $date_end) {

-        $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

+        $out .= ($withparenthesis ? ' (' : '').$outputlangs->transnoentitiesnoconv('DateUntil', dol_print_date($date_end, $format, false, $outputlangs)).($withparenthesis ? ')' : '');

     }

 

     return $out;

@@ -6191,7 +6191,7 @@ 
         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

     } else {

         if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

+            dol_print_error('', 'Bad parameter style='.$style.' for setEventMessages');

         if (empty($mesgs))

             setEventMessage($mesg, $style);

         else {

@@ -6260,7 +6260,7 @@ 
 

     // If inline message with no format, we add it.

     if ((empty($conf->use_javascript_ajax) || !empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) || $keepembedded) && !preg_match('/<div class=".*">/i', $out)) {

-        $divstart = '<div class="' . $style . ' clearboth">';

+        $divstart = '<div class="'.$style.' clearboth">';

         $divend = '</div>';

     }

 

@@ -6287,14 +6287,14 @@ 
         if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_DISABLE_JQUERY_JNOTIFY) && empty($keepembedded)) {

             $return = '<script type="text/javascript">

 					$(document).ready(function() {

-						var block = ' . (!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false") . '

+						var block = ' . (!empty($conf->global->MAIN_USE_JQUERY_BLOCKUI) ? "true" : "false").'

 						if (block) {

-							$.dolEventValid("","' . dol_escape_js($out) . '");

+							$.dolEventValid("","' . dol_escape_js($out).'");

 						} else {

 							/* jnotify(message, preset of message type, keepmessage) */

-							$.jnotify("' . dol_escape_js($out) . '",

-							"' . ($style == "ok" ? 3000 : $style) . '",

-							' . ($style == "ok" ? "false" : "true") . ',

+							$.jnotify("' . dol_escape_js($out).'",

+							"' . ($style == "ok" ? 3000 : $style).'",

+							' . ($style == "ok" ? "false" : "true").',

 							{ remove: function (){} } );

 						}

 					});

@@ -6489,11 +6489,11 @@ 
 {

     global $conf;

 

-    $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

+    $tmp = ini_get("unicode.filesystem_encoding"); // Disponible avec PHP 6.0

     if (empty($tmp) && !empty($_SERVER["WINDIR"]))

         $tmp = 'iso-8859-1'; // By default for windows

     if (empty($tmp))

-        $tmp = 'utf-8';          // By default for other

+        $tmp = 'utf-8'; // By default for other

     if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING))

         $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

 

@@ -6525,16 +6525,16 @@ 
 

     // Check in cache

     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

-        return $cache_codes[$tablename][$key][$fieldid];   // Found in cache

+        return $cache_codes[$tablename][$key][$fieldid]; // Found in cache

     }

 

     dol_syslog('dol_getIdFromCode (value not found into cache)', LOG_DEBUG);

 

-    $sql = "SELECT " . $fieldid . " as valuetoget";

-    $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

-    $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

+    $sql = "SELECT ".$fieldid." as valuetoget";

+    $sql .= " FROM ".MAIN_DB_PREFIX.$tablename;

+    $sql .= " WHERE ".$fieldkey." = '".$db->escape($key)."'";

     if (!empty($entityfilter))

-        $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+        $sql .= " AND entity IN (".getEntity($tablename).")";

 

     $resql = $db->query($sql);

     if ($resql) {

@@ -6561,12 +6561,12 @@ 
 {

     global $user, $conf, $langs;

     global $leftmenu;

-    global $rights;    // To export to dol_eval function

+    global $rights; // To export to dol_eval function

     //print $strRights."<br>\n";

     $rights = true;

     if ($strRights != '') {

-        $str = 'if(!(' . $strRights . ')) { $rights = false; }';

-        dol_eval($str);  // The dol_eval must contains all the global $xxx used into a condition

+        $str = 'if(!('.$strRights.')) { $rights = false; }';

+        dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition

     }

     return $rights;

 }

@@ -6589,14 +6589,14 @@ 
     global $object;

     global $mysoc;

 

-    global $obj;       // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object

-    global $soc;       // For backward compatibility

+    global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object

+    global $soc; // For backward compatibility

     //print $s."<br>\n";

     if ($returnvalue) {

         if ($hideerrors)

-            return @eval('return ' . $s . ';');

+            return @eval('return '.$s.';');

         else

-            return eval('return ' . $s . ';');

+            return eval('return '.$s.';');

     }

     else {

         if ($hideerrors)

@@ -6650,7 +6650,7 @@ 
         $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

     }

 

-    return img_picto_common($codelang, 'flags/' . strtolower($flagImage) . '.png', $moreatt);

+    return img_picto_common($codelang, 'flags/'.strtolower($flagImage).'.png', $moreatt);

 }

 

 /**

@@ -6848,16 +6848,16 @@ 
         'zu-ZA',

     );

 

-    $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

+    $buildprimarykeytotest = strtolower($countrycode).'-'.strtoupper($countrycode);

     if (in_array($buildprimarykeytotest, $locales))

-        return strtolower($countrycode) . '_' . strtoupper($countrycode);

+        return strtolower($countrycode).'_'.strtoupper($countrycode);

 

     foreach ($locales as $locale) {

         $locale_language = locale_get_primary_language($locale);

         $locale_region = locale_get_region($locale);

         if (strtoupper($countrycode) == $locale_region) {

             //var_dump($locale.'-'.$locale_language.'-'.$locale_region);

-            return strtolower($locale_language) . '_' . strtoupper($locale_region);

+            return strtolower($locale_language).'_'.strtoupper($locale_region);

         }

     }

 

@@ -6918,7 +6918,7 @@ 
                             $label = $langs->trans($values[2]);

 

                         //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

-                        $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

+                        $head[$h][0] = BASE_URI.preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

                         $head[$h][1] = $label;

                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

@@ -6989,43 +6989,43 @@ 
     global $micro_start_time;

 

     if ($zone == 'private')

-        print "\n" . '<!-- Common footer for private page -->' . "\n";

+        print "\n".'<!-- Common footer for private page -->'."\n";

     else

-        print "\n" . '<!-- Common footer for public page -->' . "\n";

+        print "\n".'<!-- Common footer for public page -->'."\n";

 

     // A div to store page_y POST parameter so we can read it using javascript

     print "\n<!-- A div to store page_y POST paramater -->\n";

-    print '<div id="page_y" style="display: none;">' . $_POST['page_y'] . '</div>' . "\n";

+    print '<div id="page_y" style="display: none;">'.$_POST['page_y'].'</div>'."\n";

 

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

+    $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks

     if (empty($reshook)) {

         if (!empty($conf->global->MAIN_HTML_FOOTER))

-            print $conf->global->MAIN_HTML_FOOTER . "\n";

+            print $conf->global->MAIN_HTML_FOOTER."\n";

 

         print "\n";

         if (!empty($conf->use_javascript_ajax)) {

-            print '<script type="text/javascript" language="javascript">' . "\n";

-            print 'jQuery(document).ready(function() {' . "\n";

+            print '<script type="text/javascript" language="javascript">'."\n";

+            print 'jQuery(document).ready(function() {'."\n";

 

             if ($zone == 'private' && empty($conf->dol_use_jmobile)) {

                 print "\n";

-                print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */' . "\n";

+                print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n";

                 print 'jQuery(".menuhider").click(function() {';

-                print '  console.log("We click on .menuhider");' . "\n";

+                print '  console.log("We click on .menuhider");'."\n";

                 //print "  $('.side-nav').animate({width:'toggle'},200);\n";     // OK with eldy theme but not with md

                 print "  $('.side-nav').toggle()\n";

                 print "  $('.login_block').toggle()\n";

-                print '});' . "\n";

+                print '});'."\n";

             }

 

             // Management of focus and mandatory for fields

             if ($action == 'create' || $action == 'edit' || (empty($action) && (preg_match('/new\.php/', $_SERVER["PHP_SELF"])))) {

-                print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

+                print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */'."\n";

                 $relativepathstring = $_SERVER["PHP_SELF"];

                 // Clean $relativepathstring

                 if (constant('DOL_URL_ROOT'))

-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+                    $relativepathstring = preg_replace('/^'.preg_quote(constant('DOL_URL_ROOT'), '/').'/', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7048,9 +7048,9 @@ 
                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

                                 // Set focus on field

-                                print 'jQuery("input[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                print 'jQuery("textarea[name=\'' . $paramkey . '\']").focus();' . "\n";

-                                print 'jQuery("select[name=\'' . $paramkey . '\']").focus();' . "\n";  // Not really usefull, but we keep it in case of.

+                                print 'jQuery("input[name=\''.$paramkey.'\']").focus();'."\n";

+                                print 'jQuery("textarea[name=\''.$paramkey.'\']").focus();'."\n";

+                                print 'jQuery("select[name=\''.$paramkey.'\']").focus();'."\n"; // Not really usefull, but we keep it in case of.

                             }

                         }

                     }

@@ -7074,16 +7074,16 @@ 
                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

                                 // Add property 'required' on input

-                                print 'jQuery("input[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                print 'jQuery("textarea[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";

-                                print 'jQuery("select[name=\'' . $paramkey . '\']").prop(\'required\',true);' . "\n";  // required on a select works only if key is "", this does not happen in Dolibarr

+                                print 'jQuery("input[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                print 'jQuery("textarea[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";

+                                print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n"; // required on a select works only if key is "", this does not happen in Dolibarr

                             }

                         }

                     }

                 }

             }

 

-            print '});' . "\n";

+            print '});'."\n";

 

             // Google Analytics

             // TODO Add a hook here

@@ -7091,15 +7091,15 @@ 
                 if (($conf->dol_use_jmobile != 4)) {

                     print "\n";

                     print "/* JS CODE TO ENABLE for google analtics tag */\n";

-                    print '  var _gaq = _gaq || [];' . "\n";

-                    print '  _gaq.push([\'_setAccount\', \'' . $conf->global->MAIN_GOOGLE_AN_ID . '\']);' . "\n";

-                    print '  _gaq.push([\'_trackPageview\']);' . "\n";

-                    print '' . "\n";

-                    print '  (function() {' . "\n";

-                    print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;' . "\n";

-                    print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';' . "\n";

-                    print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);' . "\n";

-                    print '  })();' . "\n";

+                    print '  var _gaq = _gaq || [];'."\n";

+                    print '  _gaq.push([\'_setAccount\', \''.$conf->global->MAIN_GOOGLE_AN_ID.'\']);'."\n";

+                    print '  _gaq.push([\'_trackPageview\']);'."\n";

+                    print ''."\n";

+                    print '  (function() {'."\n";

+                    print '    var ga = document.createElement(\'script\'); ga.type = \'text/javascript\'; ga.async = true;'."\n";

+                    print '    ga.src = (\'https:\' == document.location.protocol ? \'https://ssl\' : \'http://www\') + \'.google-analytics.com/ga.js\';'."\n";

+                    print '    var s = document.getElementsByTagName(\'script\')[0]; s.parentNode.insertBefore(ga, s);'."\n";

+                    print '  })();'."\n";

                 }

             }

 

@@ -7109,27 +7109,27 @@ 
                 print "/* JS CODE TO ENABLE to add memory info */\n";

                 print 'window.console && console.log("';

                 if (!empty($conf->global->MEMCACHED_SERVER))

-                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';

-                print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');

+                    print 'MEMCACHED_SERVER='.$conf->global->MEMCACHED_SERVER.' - ';

+                print 'MAIN_OPTIMIZE_SPEED='.(isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                 if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.

                     $micro_end_time = microtime(true);

-                    print ' - Build time: ' . ceil(1000 * ($micro_end_time - $micro_start_time)) . ' ms';

+                    print ' - Build time: '.ceil(1000 * ($micro_end_time - $micro_start_time)).' ms';

                 }

                 if (function_exists("memory_get_usage")) {

-                    print ' - Mem: ' . memory_get_usage();

+                    print ' - Mem: '.memory_get_usage();

                 }

                 if (function_exists("xdebug_memory_usage")) {

-                    print ' - XDebug time: ' . ceil(1000 * xdebug_time_index()) . ' ms';

-                    print ' - XDebug mem: ' . xdebug_memory_usage();

-                    print ' - XDebug mem peak: ' . xdebug_peak_memory_usage();

+                    print ' - XDebug time: '.ceil(1000 * xdebug_time_index()).' ms';

+                    print ' - XDebug mem: '.xdebug_memory_usage();

+                    print ' - XDebug mem peak: '.xdebug_peak_memory_usage();

                 }

                 if (function_exists("zend_loader_file_encoded")) {

-                    print ' - Zend encoded file: ' . (zend_loader_file_encoded() ? 'yes' : 'no');

+                    print ' - Zend encoded file: '.(zend_loader_file_encoded() ? 'yes' : 'no');

                 }

-                print '");' . "\n";

+                print '");'."\n";

             }

 

-            print "\n" . '</script>' . "\n";

+            print "\n".'</script>'."\n";

         }

 

         // Add Xdebug coverage of code

@@ -7143,7 +7143,7 @@ 
             print "<!-- Start of log output\n";

             //print '<div class="hidden">'."\n";

             foreach ($conf->logbuffer as $logline) {

-                print $logline . "<br>\n";

+                print $logline."<br>\n";

             }

             //print '</div>'."\n";

             print "End of log output -->\n";

@@ -7186,8 +7186,8 @@ 
  */

 function dol_set_focus($selector)

 {

-    print "\n" . '<!-- Set focus onto a specific field -->' . "\n";

-    print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("' . dol_escape_js($selector) . '").focus(); });</script>' . "\n";

+    print "\n".'<!-- Set focus onto a specific field -->'."\n";

+    print '<script type="text/javascript" language="javascript">jQuery(document).ready(function() { jQuery("'.dol_escape_js($selector).'").focus(); });</script>'."\n";

 }

 

 /**

@@ -7232,7 +7232,7 @@ 
         $value = preg_replace('/\*/', '%', $value); // Replace * with %

     }

     if ($mode == 1) {

-        $value = preg_replace('/([<>=]+)\s+([0-9' . preg_quote($langs->trans("DecimalSeparator"), '/') . '\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

+        $value = preg_replace('/([<>=]+)\s+([0-9'.preg_quote($langs->trans("DecimalSeparator"), '/').'\-])/', '\1\2', $value); // Clean string '< 10' into '<10' so we can the explode on space to get all tests to do

     }

 

     $value = preg_replace('/\s*\|\s*/', '|', $value);

@@ -7261,14 +7261,14 @@ 
                 if ($newcrit != '') {

                     $numnewcrit = price2num($newcrit);

                     if (is_numeric($numnewcrit)) {

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . $field . ' ' . $operator . ' ' . $numnewcrit;

+                        $newres .= ($i2 > 0 ? ' OR ' : '').$field.' '.$operator.' '.$numnewcrit;

                     } else {

-                        $newres .= ($i2 > 0 ? ' OR ' : '') . '1 = 2'; // force false

+                        $newres .= ($i2 > 0 ? ' OR ' : '').'1 = 2'; // force false

                     }

                     $i2++; // a criteria was added to string

                 }

             } else if ($mode == 2) {

-                $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $db->escape(trim($crit)) . ")";

+                $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$db->escape(trim($crit)).")";

                 $i2++; // a criteria was added to string

             } else if ($mode == 3) {

                 $tmparray = explode(',', trim($crit));

@@ -7277,10 +7277,10 @@ 
                     foreach ($tmparray as $val) {

                         if ($val) {

                             $listofcodes .= ($listofcodes ? ',' : '');

-                            $listofcodes .= "'" . $db->escape(trim($val)) . "'";

+                            $listofcodes .= "'".$db->escape(trim($val))."'";

                         }

                     }

-                    $newres .= ($i2 > 0 ? ' OR ' : '') . $field . " IN (" . $listofcodes . ")";

+                    $newres .= ($i2 > 0 ? ' OR ' : '').$field." IN (".$listofcodes.")";

                     $i2++; // a criteria was added to string

                 }

             } else if ($mode == 4) {

@@ -7289,10 +7289,10 @@ 
                     $listofcodes = '';

                     foreach ($tmparray as $val) {

                         if ($val) {

-                            $newres .= ($i2 > 0 ? ' OR (' : '(') . $field . ' LIKE \'' . $db->escape(trim($val)) . ',%\'';

-                            $newres .= ' OR ' . $field . ' = \'' . $db->escape(trim($val)) . '\'';

-                            $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . '\'';

-                            $newres .= ' OR ' . $field . ' LIKE \'%,' . $db->escape(trim($val)) . ',%\'';

+                            $newres .= ($i2 > 0 ? ' OR (' : '(').$field.' LIKE \''.$db->escape(trim($val)).',%\'';

+                            $newres .= ' OR '.$field.' = \''.$db->escape(trim($val)).'\'';

+                            $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).'\'';

+                            $newres .= ' OR '.$field.' LIKE \'%,'.$db->escape(trim($val)).',%\'';

                             $newres .= ')';

                             $i2++;

                         }

@@ -7309,9 +7309,9 @@ 
                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

                     if (preg_match('/\.(id|rowid)$/', $field)) { // Special case for rowid that is sometimes a ref so used as a search field

-                        $newres .= $field . " = " . (is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

+                        $newres .= $field." = ".(is_numeric(trim($tmpcrit)) ? trim($tmpcrit) : '0');

                     } else {

-                        $newres .= $field . " LIKE '";

+                        $newres .= $field." LIKE '";

 

                         $tmpcrit = trim($tmpcrit);

                         $tmpcrit2 = $tmpcrit;

@@ -7330,7 +7330,7 @@ 
                         $newres .= $tmpafter;

                         $newres .= "'";

                         if ($tmpcrit2 == '') {

-                            $newres .= ' OR ' . $field . " IS NULL";

+                            $newres .= ' OR '.$field." IS NULL";

                         }

                     }

 

@@ -7341,10 +7341,10 @@ 
             $i++;

         }

         if ($newres)

-            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+            $res = $res.($res ? ' AND ' : '').($i2 > 1 ? '(' : '').$newres.($i2 > 1 ? ')' : '');

         $j++;

     }

-    $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

+    $res = ($nofirstand ? "" : " AND ")."(".$res.")";

     //print 'xx'.$res.'yy';

     return $res;

 }

@@ -7363,8 +7363,8 @@ 
     $url = $object->getLastMainDocLink($object->element);

 

     if ($url) {

-        $out .= img_picto('', 'object_globe.png') . ' ' . $langs->trans("DirectDownloadLink") . '<br>';

-        $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="' . $url . '">';

+        $out .= img_picto('', 'object_globe.png').' '.$langs->trans("DirectDownloadLink").'<br>';

+        $out .= '<input type="text" id="directdownloadlink" class="quatrevingtpercent" value="'.$url.'">';

         $out .= ajax_autoselect("directdownloadlink", 0);

     }

     return $out;

@@ -7405,7 +7405,7 @@ 
     if ($extName)

         $subdir = 'thumbs/';

 

-    return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

+    return ($dirName ? $dirName.'/' : '').$subdir.$fileName.$extName.$extImgTarget; // New filename for thumb

 }

 

 /**

@@ -7431,14 +7431,14 @@ 
 

     if ($alldata == 1) {

         if ($num_mime !== false)

-            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

+            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : ''), 'mime' => dol_mimetype($relativepath),);

         else

             return array();

     }

 

     // old behavior

     if ($num_mime !== false)

-        return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

+        return 'javascript:document_preview(\''.dol_escape_js(DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&attachment=0&file='.urlencode($relativepath).($param ? '&'.$param : '')).'\', \''.dol_mimetype($relativepath).'\', \''.dol_escape_js($langs->trans('Preview')).'\')';

     else

         return '';

 }

@@ -7455,11 +7455,11 @@ 
     global $langs;

     $out = '<script type="text/javascript">

                jQuery(document).ready(function () {

-				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

+				    jQuery("#' . $htmlname.'").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

     if ($addlink)

-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+        $out .= ' <a href="'.$addlink.'" target="_blank">'.$langs->trans("Link").'</a>';

     return $out;

 }

 

@@ -7840,9 +7840,9 @@ 
 

     if (!isset($dictvalues[$tablename])) {

         $dictvalues[$tablename] = array();

-        $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

+        $sql = 'SELECT * FROM '.$tablename.' WHERE 1';

         if ($checkentity)

-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+            $sql .= ' AND entity IN (0,'.getEntity($tablename).')';

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -7880,14 +7880,14 @@ 
             $g = $tmp[1];

             $b = $tmp[2];

         } else {

-            $hexr = $stringcolor[0] . $stringcolor[1];

-            $hexg = $stringcolor[2] . $stringcolor[3];

-            $hexb = $stringcolor[4] . $stringcolor[5];

+            $hexr = $stringcolor[0].$stringcolor[1];

+            $hexg = $stringcolor[2].$stringcolor[3];

+            $hexb = $stringcolor[4].$stringcolor[5];

             $r = hexdec($hexr);

             $g = hexdec($hexg);

             $b = hexdec($hexb);

         }

-        $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

+        $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0; // HSL algorithm

         if ($bright > 0.6)

             $res = 1;

     }

@@ -7923,11 +7923,11 @@ 
             return 0; // Entry is for menus all excluded to external users

     }

     if (!$menuentry['perms'] && $type_user)

-        return 0;            // No permissions and user is external

+        return 0; // No permissions and user is external

     if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

         return 0; // No permissions and option to hide when not allowed, even for internal user, is on

     if (!$menuentry['perms'])

-        return 2;               // No permissions and user is external

+        return 2; // No permissions and user is external

     return 1;

 }

 

Braces +1466 added lines, -1053 removed lines

@@ -74,8 +74,9 @@ 
       if ($found) return $result;

       } */

 

-    if (isset($class::$member))

-        return $class::$member;

+    if (isset($class::$member)) {
+            return $class::$member;
+    }
     dol_print_error('', 'Try to get a static member "' . $member . '" in class "' . $class . '" that does not exists or is not static.');

     return null;

 }

@@ -126,8 +127,9 @@ 
     } else {

         $out = '';

         $addzero = array('user', 'usergroup', 'c_email_templates', 'email_template', 'default_values');

-        if (in_array($element, $addzero))

-            $out .= '0,';

+        if (in_array($element, $addzero)) {
+                    $out .= '0,';
+        }
         $out .= $conf->entity;

         return $out;

     }

@@ -306,32 +308,35 @@ 
 {

     global $mysoc, $user, $conf;

 

-    if (empty($paramname))

-        return 'BadFirstParameterForGETPOST';

+    if (empty($paramname)) {
+            return 'BadFirstParameterForGETPOST';
+    }
     if (empty($check)) {

         dol_syslog("Deprecated use of GETPOST, called with 1st param = " . $paramname . " and 2nd param is '', when calling page " . $_SERVER["PHP_SELF"], LOG_WARNING);

         // Enable this line to know who call the GETPOST with '' $check parameter.

         //var_dump(debug_backtrace()[0]);

     }

 

-    if (empty($method))

-        $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');

-    elseif ($method == 1)

-        $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';

-    elseif ($method == 2)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';

-    elseif ($method == 3)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');

-    elseif ($method == 4)

-        $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));

-    else

-        return 'BadThirdParameterForGETPOST';

+    if (empty($method)) {
+            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+    } elseif ($method == 1) {
+            $out = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+    } elseif ($method == 2) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+    } elseif ($method == 3) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+    } elseif ($method == 4) {
+            $out = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_COOKIE[$paramname]) ? $_COOKIE[$paramname] : ''));
+    } else {
+            return 'BadThirdParameterForGETPOST';
+    }
 

     if (empty($method) || $method == 3 || $method == 4) {

         $relativepathstring = $_SERVER["PHP_SELF"];

         // Clean $relativepathstring

-        if (constant('DOL_URL_ROOT'))

-            $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+        if (constant('DOL_URL_ROOT')) {
+                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+        }
         $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

         $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

         //var_dump($relativepathstring);

@@ -380,14 +385,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $foundintru = 0;

                                     foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                            $foundintru = 1;

+                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                    $foundintru = 1;
+                                        }
                                     }

-                                    if (!$foundintru)

-                                        $qualified = 1;

+                                    if (!$foundintru) {
+                                                                            $qualified = 1;
+                                    }
                                     //var_dump($defkey.'-'.$qualified);

-                                } else

-                                    $qualified = 1;

+                                } else {
+                                                                    $qualified = 1;
+                                }
 

                                 if ($qualified) {

                                     //var_dump($user->default_values[$relativepathstring][$defkey]['createform']);

@@ -414,20 +422,24 @@ 
                                         $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                         $foundintru = 0;

                                         foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                                $foundintru = 1;

+                                            if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                            $foundintru = 1;
+                                            }
                                         }

-                                        if (!$foundintru)

-                                            $qualified = 1;

+                                        if (!$foundintru) {
+                                                                                    $qualified = 1;
+                                        }
                                         //var_dump($defkey.'-'.$qualified);

-                                    } else

-                                        $qualified = 1;

+                                    } else {
+                                                                            $qualified = 1;
+                                    }
 

                                     if ($qualified) {

                                         $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ";", "=");  // we accept _, -, . and ,

                                         foreach ($user->default_values[$relativepathstring]['sortorder'][$defkey] as $key => $val) {

-                                            if ($out)

-                                                $out .= ', ';

+                                            if ($out) {
+                                                                                            $out .= ', ';
+                                            }
                                             if ($paramname == 'sortfield') {

                                                 $out .= dol_string_nospecial($key, '', $forbidden_chars_to_replace);

                                             }

@@ -447,14 +459,17 @@ 
                                     $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

                                     $foundintru = 0;

                                     foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                            $foundintru = 1;

+                                        if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                                    $foundintru = 1;
+                                        }
                                     }

-                                    if (!$foundintru)

-                                        $qualified = 1;

+                                    if (!$foundintru) {
+                                                                            $qualified = 1;
+                                    }
                                     //var_dump($defkey.'-'.$qualified);

-                                } else

-                                    $qualified = 1;

+                                } else {
+                                                                    $qualified = 1;
+                                }
 

                                 if ($qualified) {

                                     if (isset($_POST['sall']) || isset($_POST['search_all']) || isset($_GET['sall']) || isset($_GET['search_all'])) {

@@ -526,8 +541,10 @@ 
                 $newout = $user->fk_user;

             } elseif ($reg[1] == 'ENTITY_ID' || $reg[1] == 'ENTITYID') {

                 $newout = $conf->entity;

-            } else

-                $newout = '';     // Key not found, we replace with empty string

+            } else {
+                            $newout = '';
+            }
+            // Key not found, we replace with empty string

 

 

 

@@ -556,18 +573,20 @@ 
             }

             break;

         case 'intcomma':

-            if (preg_match('/[^0-9,-]+/i', $out))

-                $out = '';

+            if (preg_match('/[^0-9,-]+/i', $out)) {
+                            $out = '';
+            }
             break;

         case 'alpha':

             if (!is_array($out)) {

                 $out = trim($out);

                 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                 // '../' is dangerous because it allows dir transversals

-                if (preg_match('/"/', $out))

-                    $out = '';

-                else if (preg_match('/\.\.\//', $out))

-                    $out = '';

+                if (preg_match('/"/', $out)) {
+                                    $out = '';
+                } else if (preg_match('/\.\.\//', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'san_alpha':

@@ -576,27 +595,31 @@ 
         case 'aZ':

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'aZ09':

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z0-9_\-\.]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z0-9_\-\.]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'aZ09comma':  // great to sanitize sortfield or sortorder params that can be t.abc,t.def_gh

             if (!is_array($out)) {

                 $out = trim($out);

-                if (preg_match('/[^a-z0-9_\-\.,]+/i', $out))

-                    $out = '';

+                if (preg_match('/[^a-z0-9_\-\.,]+/i', $out)) {
+                                    $out = '';
+                }
             }

             break;

         case 'array':

-            if (!is_array($out) || empty($out))

-                $out = array();

+            if (!is_array($out) || empty($out)) {
+                            $out = array();
+            }
             break;

         case 'nohtml':  // Recommended for most scalar parameters

             $out = dol_string_nohtmltag($out, 0);

@@ -606,16 +629,18 @@ 
                 $out = trim($out);

                 // '"' is dangerous because param in url can close the href= or src= and add javascript functions.

                 // '../' is dangerous because it allows dir transversals

-                if (preg_match('/"/', $out))

-                    $out = '';

-                else if (preg_match('/\.\.\//', $out))

-                    $out = '';

+                if (preg_match('/"/', $out)) {
+                                    $out = '';
+                } else if (preg_match('/\.\.\//', $out)) {
+                                    $out = '';
+                }
                 $out = dol_string_nohtmltag($out);

             }

             break;

         case 'custom':

-            if (empty($filter))

-                return 'BadFourthParameterForGETPOST';

+            if (empty($filter)) {
+                            return 'BadFourthParameterForGETPOST';
+            }
             $out = filter_var($out, $filter, $options);

             break;

     }

@@ -655,10 +680,11 @@ 
         // If prefix is for email

         if ($mode == 'email') {

             if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) { // If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)

-                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME')

-                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;

-                else if (isset($_SERVER["SERVER_NAME"]))

-                    return $_SERVER["SERVER_NAME"];

+                if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
+                                    return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
+                } else if (isset($_SERVER["SERVER_NAME"])) {
+                                    return $_SERVER["SERVER_NAME"];
+                }
             }

             return dol_hash(DOL_DOCUMENT_ROOT . DOL_URL_ROOT);

         }

@@ -729,22 +755,27 @@ 
             }

         }

         if ($returnemptyifnotfound) {        // Not found into alternate dir

-            if ($returnemptyifnotfound == 1 || !file_exists($res))

-                return '';

+            if ($returnemptyifnotfound == 1 || !file_exists($res)) {
+                            return '';
+            }
         }

-    }

-    else {    // For an url path

+    } else {    // For an url path

         // We try to get local path of file on filesystem from url

         // Note that trying to know if a file on disk exist by forging path on disk from url

         // works only for some web server and some setup. This is bugged when

         // using proxy, rewriting, virtual path, etc...

         $res = '';

-        if ($type == 1)

-            $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;   // Standard value

-        if ($type == 2)

-            $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;  // Standard value

-        if ($type == 3)

-            $res = DOL_URL_ROOT . '/' . $path;

+        if ($type == 1) {
+                    $res = /* DOL_URL_ROOT */ DOL_BASE_URI . '/' . $path;
+        }
+        // Standard value

+        if ($type == 2) {
+                    $res = /* DOL_MAIN_URL_ROOT */ DOL_BASE_PATH . '/' . $path;
+        }
+        // Standard value

+        if ($type == 3) {
+                    $res = DOL_URL_ROOT . '/' . $path;
+        }
 

         foreach ($conf->file->dol_document_root as $key => $dirroot) { // ex: array(["main"]=>"/home/main/htdocs", ["alt0"]=>"/home/dirmod/htdocs", ...)

             if ($key == 'main') {

@@ -824,13 +855,15 @@ 
 function dol_size($size, $type = '')

 {

     global $conf;

-    if (empty($conf->dol_optimize_smallscreen))

-        return $size;

-    if ($type == 'width' && $size > 250)

-        return 250;

-    else

-        return 10;

-}

+    if (empty($conf->dol_optimize_smallscreen)) {
+            return $size;
+    }
+    if ($type == 'width' && $size > 250) {
+            return 250;
+    } else {
+            return 10;
+    }
+    }

 

 /**

  * 	Clean a string to use it as a file name

@@ -929,8 +962,9 @@ 
 {

     $forbidden_chars_to_replace = array(" ", "'", "/", "\\", ":", "*", "?", "\"", "<", ">", "|", "[", "]", ",", ";", "=", '°');  // more complete than dol_sanitizeFileName

     $forbidden_chars_to_remove = array();

-    if (is_array($badcharstoreplace))

-        $forbidden_chars_to_replace = $badcharstoreplace;

+    if (is_array($badcharstoreplace)) {
+            $forbidden_chars_to_replace = $badcharstoreplace;
+    }
     //$forbidden_chars_to_remove=array("(",")");

 

     return str_replace($forbidden_chars_to_replace, $newstr, str_replace($forbidden_chars_to_remove, "", $str));

@@ -967,9 +1001,9 @@ 
     if (empty($mode)) {

         $substitjs["'"] = "\\'";

         $substitjs['"'] = "\\'";

-    } else if ($mode == 1)

-        $substitjs["'"] = "\\'";

-    else if ($mode == 2) {

+    } else if ($mode == 1) {
+            $substitjs["'"] = "\\'";
+    } else if ($mode == 2) {

         $substitjs['"'] = '\\"';

     } else if ($mode == 3) {

         $substitjs["'"] = "\\'";

@@ -991,10 +1025,12 @@ 
 {

     // escape quotes and backslashes, newlines, etc.

     $tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8');  // TODO Use htmlspecialchars_decode instead, that make only required change for html tags

-    if (!$keepb)

-        $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));

-    if (!$keepn)

-        $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));

+    if (!$keepb) {
+            $tmp = strtr($tmp, array("<b>" => '', '</b>' => ''));
+    }
+    if (!$keepn) {
+            $tmp = strtr($tmp, array("\r" => '\\r', "\n" => '\\n'));
+    }
     return htmlentities($tmp, ENT_COMPAT, 'UTF-8');      // TODO Use htmlspecialchars instead, that make only required change for html tags

 }

 

@@ -1045,8 +1081,9 @@ 
     global $conf, $user;

 

     // If syslog module enabled

-    if (empty($conf->syslog->enabled))

-        return;

+    if (empty($conf->syslog->enabled)) {
+            return;
+    }
 

     if ($ident < 0) {

         foreach ($conf->loghandlers as $loghandlerinstance) {

@@ -1060,8 +1097,9 @@ 
         if (!in_array($level, $logLevels, true)) {

             throw new Exception('Incorrect log level');

         }

-        if ($level > $conf->global->SYSLOG_LEVEL)

-            return;

+        if ($level > $conf->global->SYSLOG_LEVEL) {
+                    return;
+        }
 

         $message = preg_replace('/password=\'[^\']*\'/', 'password=\'hidden\'', $message); // protection to avoid to have value of password in log

         // If adding log inside HTML page is required

@@ -1086,24 +1124,30 @@ 
         );

 

         // This is when server run behind a reverse proxy

-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))

-            $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);

+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                    $data['ip'] = $_SERVER['HTTP_X_FORWARDED_FOR'] . (empty($_SERVER["REMOTE_ADDR"]) ? '' : '->' . $_SERVER['REMOTE_ADDR']);
+        }
         // This is when server run normally on a server

-        else if (!empty($_SERVER["REMOTE_ADDR"]))

-            $data['ip'] = $_SERVER['REMOTE_ADDR'];

+        else if (!empty($_SERVER["REMOTE_ADDR"])) {
+                    $data['ip'] = $_SERVER['REMOTE_ADDR'];
+        }
         // This is when PHP session is ran inside a web server but not inside a client request (example: init code of apache)

-        else if (!empty($_SERVER['SERVER_ADDR']))

-            $data['ip'] = $_SERVER['SERVER_ADDR'];

+        else if (!empty($_SERVER['SERVER_ADDR'])) {
+                    $data['ip'] = $_SERVER['SERVER_ADDR'];
+        }
         // This is when PHP session is ran outside a web server, like from Windows command line (Not always defined, but useful if OS defined it).

-        else if (!empty($_SERVER['COMPUTERNAME']))

-            $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);

+        else if (!empty($_SERVER['COMPUTERNAME'])) {
+                    $data['ip'] = $_SERVER['COMPUTERNAME'] . (empty($_SERVER['USERNAME']) ? '' : '@' . $_SERVER['USERNAME']);
+        }
         // This is when PHP session is ran outside a web server, like from Linux command line (Not always defined, but usefull if OS defined it).

-        else if (!empty($_SERVER['LOGNAME']))

-            $data['ip'] = '???@' . $_SERVER['LOGNAME'];

+        else if (!empty($_SERVER['LOGNAME'])) {
+                    $data['ip'] = '???@' . $_SERVER['LOGNAME'];
+        }
         // Loop on each log handler and send output

         foreach ($conf->loghandlers as $loghandlerinstance) {

-            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler)

-                continue;

+            if ($restricttologhandler && $loghandlerinstance->code != $restricttologhandler) {
+                            continue;
+            }
             $loghandlerinstance->export($data, $suffixinfilename);

         }

         unset($data);

@@ -1159,13 +1203,15 @@ 
 

     // Show title

     $showtitle = 1;

-    if (!empty($conf->dol_optimize_smallscreen))

-        $showtitle = 0;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $showtitle = 0;
+    }
     if (!empty($title) && $showtitle) {

         $limittitle = 30;

         $out .= '<a class="tabTitle">';

-        if ($picto)

-            $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';

+        if ($picto) {
+                    $out .= img_picto($title, ($pictoisfullpath ? '' : 'object_') . $picto, '', $pictoisfullpath) . ' ';
+        }
         $out .= '<span class="tabTitleText">' . dol_trunc($title, $limittitle) . '</span>';

         $out .= '</a>';

     }

@@ -1174,12 +1220,14 @@ 
     $maxkey = -1;

     if (is_array($links) && !empty($links)) {

         $keys = array_keys($links);

-        if (count($keys))

-            $maxkey = max($keys);

+        if (count($keys)) {
+                    $maxkey = max($keys);
+        }
     }

 

-    if (!empty($conf->dol_optimize_smallscreen))

-        $conf->global->MAIN_MAXTABS_IN_CARD = 2;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $conf->global->MAIN_MAXTABS_IN_CARD = 2;
+    }
 

     // Show tabs

     $bactive = false;

@@ -1192,8 +1240,9 @@ 
     for ($i = 0; $i <= $maxkey; $i++) {

         if ((is_numeric($active) && $i == $active) || (!empty($links[$i][2]) && !is_numeric($active) && $active == $links[$i][2])) {

             // If active tab is already present

-            if ($i >= $limittoshow)

-                $limittoshow--;

+            if ($i >= $limittoshow) {
+                            $limittoshow--;
+            }
         }

     }

 

@@ -1234,12 +1283,12 @@ 
             }

             $outmore .= '<div class="popuptab wordwrap" style="display:inherit;">';

             if (isset($links[$i][2]) && $links[$i][2] == 'image') {

-                if (!empty($links[$i][0]))

-                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";

-                else

-                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";

-            }

-            else if (!empty($links[$i][1])) {

+                if (!empty($links[$i][0])) {
+                                    $outmore .= '<a class="tabimage' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">' . $links[$i][1] . '</a>' . "\n";
+                } else {
+                                    $outmore .= '<span class="tabspan">' . $links[$i][1] . '</span>' . "\n";
+                }
+            } else if (!empty($links[$i][1])) {

                 $outmore .= '<a' . (!empty($links[$i][2]) ? ' id="' . $links[$i][2] . '"' : '') . ' class="wordwrap inline-block' . ($morecss ? ' ' . $morecss : '') . '" href="' . $links[$i][0] . '">';

                 $outmore .= preg_replace('/([a-z])\/([a-z])/i', '\\1 / \\2', $links[$i][1]); // Replace x/y with x / y to allow wrap on long composed texts.

                 $outmore .= '</a>' . "\n";

@@ -1250,8 +1299,9 @@ 
         }

         $displaytab = $i;

     }

-    if ($popuptab)

-        $outmore .= '</div>';

+    if ($popuptab) {
+            $outmore .= '</div>';
+    }
 

     if ($displaytab > $limittoshow) {

         $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');

@@ -1274,8 +1324,9 @@ 
 

     $out .= "</div>\n";

 

-    if (!$notab || $notab == -1)

-        $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";

+    if (!$notab || $notab == -1) {
+            $out .= "\n" . '<div class="tabBar' . ($notab == -1 ? '' : ' tabBarWithBottom') . '">' . "\n";
+    }
 

     $parameters = array('tabname' => $active, 'out' => $out);

     $reshook = $hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead"

@@ -1305,11 +1356,12 @@ 
  */

 function dol_get_fiche_end($notab = 0)

 {

-    if (!$notab || $notab == -1)

-        return "\n</div>\n";

-    else

-        return '';

-}

+    if (!$notab || $notab == -1) {
+            return "\n</div>\n";
+    } else {
+            return '';
+    }
+    }

 

 /**

  *  Show tab footer of a card.

@@ -1340,40 +1392,55 @@ 
     $showimage = 1;

     $entity = (empty($object->entity) ? $conf->entity : $object->entity);

     $showbarcode = empty($conf->barcode->enabled) ? 0 : ($object->barcode ? 1 : 0);

-    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance))

-        $showbarcode = 0;

+    if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->barcode->lire_advance)) {
+            $showbarcode = 0;
+    }
     $modulepart = 'unknown';

 

-    if ($object->element == 'societe')

-        $modulepart = 'societe';

-    if ($object->element == 'contact')

-        $modulepart = 'contact';

-    if ($object->element == 'member')

-        $modulepart = 'memberphoto';

-    if ($object->element == 'user')

-        $modulepart = 'userphoto';

-    if ($object->element == 'product')

-        $modulepart = 'product';

+    if ($object->element == 'societe') {
+            $modulepart = 'societe';
+    }
+    if ($object->element == 'contact') {
+            $modulepart = 'contact';
+    }
+    if ($object->element == 'member') {
+            $modulepart = 'memberphoto';
+    }
+    if ($object->element == 'user') {
+            $modulepart = 'userphoto';
+    }
+    if ($object->element == 'product') {
+            $modulepart = 'product';
+    }
 

     if (class_exists("Imagick")) {

-        if ($object->element == 'propal')

-            $modulepart = 'propal';

-        if ($object->element == 'commande')

-            $modulepart = 'commande';

-        if ($object->element == 'facture')

-            $modulepart = 'facture';

-        if ($object->element == 'fichinter')

-            $modulepart = 'ficheinter';

-        if ($object->element == 'contrat')

-            $modulepart = 'contract';

-        if ($object->element == 'supplier_proposal')

-            $modulepart = 'supplier_proposal';

-        if ($object->element == 'order_supplier')

-            $modulepart = 'supplier_order';

-        if ($object->element == 'invoice_supplier')

-            $modulepart = 'supplier_invoice';

-        if ($object->element == 'expensereport')

-            $modulepart = 'expensereport';

+        if ($object->element == 'propal') {
+                    $modulepart = 'propal';
+        }
+        if ($object->element == 'commande') {
+                    $modulepart = 'commande';
+        }
+        if ($object->element == 'facture') {
+                    $modulepart = 'facture';
+        }
+        if ($object->element == 'fichinter') {
+                    $modulepart = 'ficheinter';
+        }
+        if ($object->element == 'contrat') {
+                    $modulepart = 'contract';
+        }
+        if ($object->element == 'supplier_proposal') {
+                    $modulepart = 'supplier_proposal';
+        }
+        if ($object->element == 'order_supplier') {
+                    $modulepart = 'supplier_order';
+        }
+        if ($object->element == 'invoice_supplier') {
+                    $modulepart = 'supplier_invoice';
+        }
+        if ($object->element == 'expensereport') {
+                    $modulepart = 'expensereport';
+        }
     }

 

     if ($object->element == 'product') {

@@ -1381,11 +1448,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->product->multidir_output[$entity]);

         $maxvisiblephotos = (isset($conf->global->PRODUCT_MAX_VISIBLE_PHOTO) ? $conf->global->PRODUCT_MAX_VISIBLE_PHOTO : 5);

-        if ($conf->browser->layout == 'phone')

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('product', $conf->product->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

             if (!empty($conf->global->PRODUCT_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1401,11 +1469,12 @@ 
         $cssclass = 'photoref';

         $showimage = $object->is_photo_available($conf->ticket->multidir_output[$entity] . '/' . $object->track_id);

         $maxvisiblephotos = (isset($conf->global->TICKETSUP_MAX_VISIBLE_PHOTO) ? $conf->global->TICKETSUP_MAX_VISIBLE_PHOTO : 2);

-        if ($conf->browser->layout == 'phone')

-            $maxvisiblephotos = 1;

-        if ($showimage)

-            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';

-        else {

+        if ($conf->browser->layout == 'phone') {
+                    $maxvisiblephotos = 1;
+        }
+        if ($showimage) {
+                    $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0) . '</div>';
+        } else {

             if (!empty($conf->global->TICKETSUP_NODISPLAYIFNOPHOTO)) {

                 $nophoto = '';

                 $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"></div>';

@@ -1430,8 +1499,10 @@ 
                     } else {

                         $subdir = get_exdir($object->id, 0, 0, 1, $object, $modulepart);

                     }

-                    if (empty($subdir))

-                        $subdir = 'errorgettingsubdirofobject'; // Protection to avoid to return empty path

+                    if (empty($subdir)) {
+                                            $subdir = 'errorgettingsubdirofobject';
+                    }
+                    // Protection to avoid to return empty path

 

                     $filepath = $dir_output . $subdir . "/";

 

@@ -1452,14 +1523,16 @@ 
                             if (empty($conf->global->MAIN_DISABLE_PDF_THUMBS)) {  // If you experienc trouble with pdf thumb generation and imagick, you can disable here.

                                 include_once DOL_BASE_PATH . '/core/lib/files.lib.php';

                                 $ret = dol_convert_file($file, 'png', $fileimage);

-                                if ($ret < 0)

-                                    $error++;

+                                if ($ret < 0) {
+                                                                    $error++;
+                                }
                             }

                         }

 

                         $heightforphotref = 70;

-                        if (!empty($conf->dol_optimize_smallscreen))

-                            $heightforphotref = 60;

+                        if (!empty($conf->dol_optimize_smallscreen)) {
+                                                    $heightforphotref = 60;
+                        }
                         // Si fichier png PDF d'1 page trouve

                         if (file_exists($fileimage)) {

                             $phototoshow = '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';

@@ -1495,8 +1568,10 @@ 
                     $width = 14;

                     $cssclass = 'photorefcenter';

                     $picto = $object->picto;

-                    if ($object->element == 'project' && !$object->public)

-                        $picto = 'project'; // instead of projectpub

+                    if ($object->element == 'project' && !$object->public) {
+                                            $picto = 'project';
+                    }
+                    // instead of projectpub

                     $nophoto = img_picto('', 'object_' . $picto, '', false, 1);

                 }

                 $morehtmlleft .= '<!-- No photo to show -->';

@@ -1507,8 +1582,9 @@ 
         }

     }

 

-    if ($showbarcode)

-        $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';

+    if ($showbarcode) {
+            $morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">' . $form->showbarcode($object) . '</div>';
+    }
 

     if ($object->element == 'societe') {

         if (!empty($conf->use_javascript_ajax) && $user->rights->societe->creer && !empty($conf->global->MAIN_DIRECT_STATUS_UPDATE)) {

@@ -1532,35 +1608,37 @@ 
         }

     } elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan'))) {

         $tmptxt = $object->getLibStatut(6, $object->totalpaye);

-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')

-            $tmptxt = $object->getLibStatut(5, $object->totalpaye);

+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5, $object->totalpaye);
+        }
         $morehtmlstatus .= $tmptxt;

-    }

-    elseif ($object->element == 'contrat' || $object->element == 'contract') {

-        if ($object->statut == 0)

-            $morehtmlstatus .= $object->getLibStatut(5);

-        else

-            $morehtmlstatus .= $object->getLibStatut(4);

-    }

-    elseif ($object->element == 'facturerec') {

-        if ($object->frequency == 0)

-            $morehtmlstatus .= $object->getLibStatut(2);

-        else

-            $morehtmlstatus .= $object->getLibStatut(5);

-    }

-    elseif ($object->element == 'project_task') {

+    } elseif ($object->element == 'contrat' || $object->element == 'contract') {

+        if ($object->statut == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(4);
+        }
+    } elseif ($object->element == 'facturerec') {

+        if ($object->frequency == 0) {
+                    $morehtmlstatus .= $object->getLibStatut(2);
+        } else {
+                    $morehtmlstatus .= $object->getLibStatut(5);
+        }
+    } elseif ($object->element == 'project_task') {

         $object->fk_statut = 1;

-        if ($object->progress > 0)

-            $object->fk_statut = 2;

-        if ($object->progress >= 100)

-            $object->fk_statut = 3;

+        if ($object->progress > 0) {
+                    $object->fk_statut = 2;
+        }
+        if ($object->progress >= 100) {
+                    $object->fk_statut = 3;
+        }
         $tmptxt = $object->getLibStatut(5);

         $morehtmlstatus .= $tmptxt;  // No status on task

-    }

-    else { // Generic case

+    } else { // Generic case

         $tmptxt = $object->getLibStatut(6);

-        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone')

-            $tmptxt = $object->getLibStatut(5);

+        if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3) || $conf->browser->layout == 'phone') {
+                    $tmptxt = $object->getLibStatut(5);
+        }
         $morehtmlstatus .= $tmptxt;

     }

 

@@ -1574,13 +1652,15 @@ 
     }

 

     // Add alias for thirdparty

-    if (!empty($object->name_alias))

-        $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';

+    if (!empty($object->name_alias)) {
+            $morehtmlref .= '<div class="refidno">' . $object->name_alias . '</div>';
+    }
 

     // Add label

     if ($object->element == 'product' || $object->element == 'bank_account' || $object->element == 'project_task') {

-        if (!empty($object->label))

-            $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';

+        if (!empty($object->label)) {
+                    $morehtmlref .= '<div class="refidno">' . $object->label . '</div>';
+        }
     }

 

     if (method_exists($object, 'getBannerAddress') && $object->element != 'product' && $object->element != 'bookmark' && $object->element != 'ecm_directories' && $object->element != 'ecm_files') {

@@ -1613,15 +1693,19 @@ 
 {

     global $conf, $langs;

     $ret = '';

-    if ($fieldrequired)

-        $ret .= '<span class="fieldrequired">';

-    if (($conf->dol_use_jmobile != 4))

-        $ret .= '<label for="' . $fieldkey . '">';

+    if ($fieldrequired) {
+            $ret .= '<span class="fieldrequired">';
+    }
+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '<label for="' . $fieldkey . '">';
+    }
     $ret .= $langs->trans($langkey);

-    if (($conf->dol_use_jmobile != 4))

-        $ret .= '</label>';

-    if ($fieldrequired)

-        $ret .= '</span>';

+    if (($conf->dol_use_jmobile != 4)) {
+            $ret .= '</label>';
+    }
+    if ($fieldrequired) {
+            $ret .= '</span>';
+    }
     return $ret;

 }

 

@@ -1636,8 +1720,9 @@ 
 {

     global $bc;

     $ret = ' ' . $bc[$var];

-    if ($moreclass)

-        $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);

+    if ($moreclass) {
+            $ret = preg_replace('/class=\"/', 'class="' . $moreclass . ' ', $ret);
+    }
     return $ret;

 }

 

@@ -1668,18 +1753,18 @@ 
         if ($object->state) {

             $ret .= ($ret ? ", " : '') . $object->state;

         }

-        if ($object->zip)

-            $ret .= ($ret ? ", " : '') . $object->zip;

-    }

-    else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

+        if ($object->zip) {
+                    $ret .= ($ret ? ", " : '') . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('GB', 'UK'))) { // UK: title firstname name \n address lines \n town state \n zip \n country

         $ret .= ($ret ? $sep : '' ) . $object->town;

         if ($object->state) {

             $ret .= ($ret ? ", " : '') . $object->state;

         }

-        if ($object->zip)

-            $ret .= ($ret ? $sep : '' ) . $object->zip;

-    }

-    else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

+        if ($object->zip) {
+                    $ret .= ($ret ? $sep : '' ) . $object->zip;
+        }
+    } else if (in_array($object->country_code, array('ES', 'TR'))) { // ES: title firstname name \n address lines \n zip town \n state \n country

         $ret .= ($ret ? $sep : '' ) . $object->zip;

         $ret .= ($object->town ? (($object->zip ? ' ' : '') . $object->town) : '');

         if ($object->state) {

@@ -1696,8 +1781,9 @@ 
             $ret .= ($ret ? ", " : '') . $object->state;

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
     if ($withcountry) {

         $langs->load("dict");

         $ret .= ($object->country_code ? ($ret ? $sep : '') . $outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country" . $object->country_code)) : '');

@@ -1718,9 +1804,10 @@ 
 {

     if ((abs($ts) <= 0x7FFFFFFF)) { // check if number in 32-bit signed range

         return ($is_gmt) ? @gmstrftime($fmt, $ts) : @strftime($fmt, $ts);

-    } else

-        return 'Error date into a not supported range';

-}

+    } else {
+            return 'Error date into a not supported range';
+    }
+    }

 

 /**

  * 	Output date in a string format according to outputlangs (or langs if not defined).

@@ -1766,10 +1853,12 @@ 
             }

         }

     }

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

-    if (!$format)

-        $format = 'daytextshort';

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
+    if (!$format) {
+            $format = 'daytextshort';
+    }
     $reduceformat = (!empty($conf->dol_optimize_smallscreen) && in_array($format, array('day', 'dayhour'))) ? 1 : 0;

     $formatwithoutreduce = preg_replace('/reduceformat/', '', $format);

     if ($formatwithoutreduce != $format) {

@@ -1778,40 +1867,46 @@ 
     }  // so format 'dayreduceformat' is processed like day

     // Change predefined format into computer format. If found translation in lang file we use it, otherwise we use default.

     // TODO Add format daysmallyear and dayhoursmallyear

-    if ($format == 'day')

-        $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);

-    else if ($format == 'hour')

-        $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);

-    else if ($format == 'hourduration')

-        $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);

-    else if ($format == 'daytext')

-        $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);

-    else if ($format == 'daytextshort')

-    // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

-        $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);

-    else if ($format == 'dayhour')

-        $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);

-    else if ($format == 'dayhoursec')

-        $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);

-    else if ($format == 'dayhourtext')

-        $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);

-    else if ($format == 'dayhourtextshort')

-        $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);

+    if ($format == 'day') {
+            $format = ($outputlangs->trans("FormatDateShort") != "FormatDateShort" ? $outputlangs->trans("FormatDateShort") : $conf->format_date_short);
+    } else if ($format == 'hour') {
+            $format = ($outputlangs->trans("FormatHourShort") != "FormatHourShort" ? $outputlangs->trans("FormatHourShort") : $conf->format_hour_short);
+    } else if ($format == 'hourduration') {
+            $format = ($outputlangs->trans("FormatHourShortDuration") != "FormatHourShortDuration" ? $outputlangs->trans("FormatHourShortDuration") : $conf->format_hour_short_duration);
+    } else if ($format == 'daytext') {
+            $format = ($outputlangs->trans("FormatDateText") != "FormatDateText" ? $outputlangs->trans("FormatDateText") : $conf->format_date_text);
+    } else if ($format == 'daytextshort') {
+        // Notice: Undefined property: stdClass::$format_date_text_short in \alixar\dolibarr\htdocs\core\lib\functions.lib.php on line 1781

+        $format = ($outputlangs->trans("FormatDateTextShort") != "FormatDateTextShort" ? $outputlangs->trans("FormatDateTextShort") : $conf->format_date_text_short);
+    } else if ($format == 'dayhour') {
+            $format = ($outputlangs->trans("FormatDateHourShort") != "FormatDateHourShort" ? $outputlangs->trans("FormatDateHourShort") : $conf->format_date_hour_short);
+    } else if ($format == 'dayhoursec') {
+            $format = ($outputlangs->trans("FormatDateHourSecShort") != "FormatDateHourSecShort" ? $outputlangs->trans("FormatDateHourSecShort") : $conf->format_date_hour_sec_short);
+    } else if ($format == 'dayhourtext') {
+            $format = ($outputlangs->trans("FormatDateHourText") != "FormatDateHourText" ? $outputlangs->trans("FormatDateHourText") : $conf->format_date_hour_text);
+    } else if ($format == 'dayhourtextshort') {
+            $format = ($outputlangs->trans("FormatDateHourTextShort") != "FormatDateHourTextShort" ? $outputlangs->trans("FormatDateHourTextShort") : $conf->format_date_hour_text_short);
+    }
     // Format not sensitive to language

-    else if ($format == 'dayhourlog')

-        $format = '%Y%m%d%H%M%S';

-    else if ($format == 'dayhourldap')

-        $format = '%Y%m%d%H%M%SZ';

-    else if ($format == 'dayhourxcard')

-        $format = '%Y%m%dT%H%M%SZ';

-    else if ($format == 'dayxcard')

-        $format = '%Y%m%d';

-    else if ($format == 'dayrfc')

-        $format = '%Y-%m-%d';             // DATE_RFC3339

-    else if ($format == 'dayhourrfc')

-        $format = '%Y-%m-%dT%H:%M:%SZ';   // DATETIME RFC3339

-    else if ($format == 'standard')

-        $format = '%Y-%m-%d %H:%M:%S';

+    else if ($format == 'dayhourlog') {
+            $format = '%Y%m%d%H%M%S';
+    } else if ($format == 'dayhourldap') {
+            $format = '%Y%m%d%H%M%SZ';
+    } else if ($format == 'dayhourxcard') {
+            $format = '%Y%m%dT%H%M%SZ';
+    } else if ($format == 'dayxcard') {
+            $format = '%Y%m%d';
+    } else if ($format == 'dayrfc') {
+            $format = '%Y-%m-%d';
+    }
+    // DATE_RFC3339

+    else if ($format == 'dayhourrfc') {
+            $format = '%Y-%m-%dT%H:%M:%SZ';
+    }
+    // DATETIME RFC3339

+    else if ($format == 'standard') {
+            $format = '%Y-%m-%d %H:%M:%S';
+    }
 

     if ($reduceformat) {

         $format = str_replace('%Y', '%y', $format);

@@ -1819,8 +1914,10 @@ 
     }

 

     // If date undefined or "", we return ""

-    if (dol_strlen($time) == 0)

-        return '';  // $time=0 allowed (it means 01/01/1970 00:00:00)

+    if (dol_strlen($time) == 0) {
+            return '';
+    }
+    // $time=0 allowed (it means 01/01/1970 00:00:00)

 

 

 

@@ -1868,8 +1965,9 @@ 
             $timetouse = $time + $offsettz + $offsetdst; // TODO Replace this with function Date PHP. We also should not use anymore offsettz and offsetdst but only offsettzstring.

 

             $ret = adodb_strftime($format, $timetouse, $to_gmt);

-        } else

-            $ret = 'Bad value ' . $time . ' for date';

+        } else {
+                    $ret = 'Bad value ' . $time . ' for date';
+        }
     }

 

     if (preg_match('/__b__/i', $format)) {

@@ -1940,10 +2038,14 @@ 
     global $conf;

 

     $usealternatemethod = false;

-    if ($timestamp <= 0)

-        $usealternatemethod = true;    // <= 1970

-    if ($timestamp >= 2145913200)

-        $usealternatemethod = true;  // >= 2038

+    if ($timestamp <= 0) {
+            $usealternatemethod = true;
+    }
+    // <= 1970

+    if ($timestamp >= 2145913200) {
+            $usealternatemethod = true;
+    }
+    // >= 2038

 

     if ($usealternatemethod) {

         $arrayinfo = adodb_getdate($timestamp, $fast);

@@ -1978,27 +2080,36 @@ 
     global $conf;

     //print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";

     // Clean parameters

-    if ($hour == -1 || empty($hour))

-        $hour = 0;

-    if ($minute == -1 || empty($minute))

-        $minute = 0;

-    if ($second == -1 || empty($second))

-        $second = 0;

+    if ($hour == -1 || empty($hour)) {
+            $hour = 0;
+    }
+    if ($minute == -1 || empty($minute)) {
+            $minute = 0;
+    }
+    if ($second == -1 || empty($second)) {
+            $second = 0;
+    }
 

     // Check parameters

     if ($check) {

-        if (!$month || !$day)

-            return '';

-        if ($day > 31)

-            return '';

-        if ($month > 12)

-            return '';

-        if ($hour < 0 || $hour > 24)

-            return '';

-        if ($minute < 0 || $minute > 60)

-            return '';

-        if ($second < 0 || $second > 60)

-            return '';

+        if (!$month || !$day) {
+                    return '';
+        }
+        if ($day > 31) {
+                    return '';
+        }
+        if ($month > 12) {
+                    return '';
+        }
+        if ($hour < 0 || $hour > 24) {
+                    return '';
+        }
+        if ($minute < 0 || $minute > 60) {
+                    return '';
+        }
+        if ($second < 0 || $second > 60) {
+                    return '';
+        }
     }

 

     if (method_exists('DateTime', 'getTimestamp')) {

@@ -2055,8 +2166,10 @@ 
 

     // Note that gmmktime and mktime return same value (GMT) when used without parameters

     //if ($mode == 'gmt') $ret=gmmktime(); // Strict Standards: gmmktime(): You should be using the time() function instead

-    if ($mode == 'gmt')

-        $ret = time(); // Time for now at greenwich.

+    if ($mode == 'gmt') {
+            $ret = time();
+    }
+    // Time for now at greenwich.

     else if ($mode == 'tzserver') {  // Time for now with PHP server timezone added

         require_once DOL_BASE_PATH . '/core/lib/date.lib.php';

         $tzsecond = getServerTimeZoneInt('now');    // Contains tz+dayling saving time

@@ -2090,8 +2203,9 @@ 
     global $conf, $langs;

     $level = 1024;

 

-    if (!empty($conf->dol_optimize_smallscreen))

-        $shortunit = 1;

+    if (!empty($conf->dol_optimize_smallscreen)) {
+            $shortunit = 1;
+    }
 

     // Set value text

     if (empty($shortvalue) || $size < ($level * 10)) {

@@ -2126,19 +2240,23 @@ 
 {

     global $langs;

 

-    if (empty($url))

-        return '';

+    if (empty($url)) {
+            return '';
+    }
 

     $link = '<a href="';

-    if (!preg_match('/^http/i', $url))

-        $link .= 'http://';

+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= $url;

     $link .= '"';

-    if ($target)

-        $link .= ' target="' . $target . '"';

+    if ($target) {
+            $link .= ' target="' . $target . '"';
+    }
     $link .= '>';

-    if (!preg_match('/^http/i', $url))

-        $link .= 'http://';

+    if (!preg_match('/^http/i', $url)) {
+            $link .= 'http://';
+    }
     $link .= dol_trunc($url, $max);

     $link .= '</a>';

     return '<div class="nospan float" style="margin-right: 10px">' . ($withpicto ? img_picto($langs->trans("Url"), 'object_globe.png') . ' ' : '') . $link . '</div>';

@@ -2162,13 +2280,15 @@ 
 

     $newemail = $email;

 

-    if (empty($email))

-        return '&nbsp;';

+    if (empty($email)) {
+            return '&nbsp;';
+    }
 

     if (!empty($addlink)) {

         $newemail = '<a style="text-overflow: ellipsis;" href="';

-        if (!preg_match('/^mailto:/i', $email))

-            $newemail .= 'mailto:';

+        if (!preg_match('/^mailto:/i', $email)) {
+                    $newemail .= 'mailto:';
+        }
         $newemail .= $email;

         $newemail .= '">';

         $newemail .= dol_trunc($email, $max);

@@ -2181,13 +2301,14 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

             $type = 'AC_EMAIL';

             $link = '';

-            if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            if ($link)

-                $newemail = '<div>' . $newemail . ' ' . $link . '</div>';

+            if (!empty($conf->global->AGENDA_ADDACTIONFOREMAIL)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newemail = '<div>' . $newemail . ' ' . $link . '</div>';
+            }
         }

-    }

-    else {

+    } else {

         if ($showinvalid && !isValidEmail($email)) {

             $langs->load("errors");

             $newemail .= img_warning($langs->trans("ErrorBadEMail", $email));

@@ -2219,8 +2340,9 @@ 
 

     $newskype = $value;

 

-    if (empty($value))

-        return '&nbsp;';

+    if (empty($value)) {
+            return '&nbsp;';
+    }
 

     if (!empty($type)) {

         $newskype = '<div class="divsocialnetwork inline-block valignmiddle">';

@@ -2241,13 +2363,13 @@ 
         if (($cid || $socid) && !empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create && $type == 'skype') {

             $addlink = 'AC_SKYPE';

             $link = '';

-            if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

+            if (!empty($conf->global->AGENDA_ADDACTIONFORSKYPE)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $addlink . '&amp;contactid=' . $cid . '&amp;socid=' . $socid . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
             $newskype .= ($link ? ' ' . $link : '');

         }

         $newskype .= '</div>';

-    }

-    else {

+    } else {

         $langs->load("errors");

         $newskype .= img_warning($langs->trans("ErrorBadSocialNetworkValue", $value));

     }

@@ -2277,12 +2399,14 @@ 
     if (empty($phone)) {

         return '';

     }

-    if (empty($countrycode))

-        $countrycode = $mysoc->country_code;

+    if (empty($countrycode)) {
+            $countrycode = $mysoc->country_code;
+    }
 

     // Short format for small screens

-    if ($conf->dol_optimize_smallscreen)

-        $separ = '';

+    if ($conf->dol_optimize_smallscreen) {
+            $separ = '';
+    }
 

     $newphone = $phone;

     if (strtoupper($countrycode) == "FR") {

@@ -2448,15 +2572,18 @@ 
             $newphone = '<a href="tel:' . $phone . '"';

             $newphone .= '>' . $phone . '</a>';

         } else if (!empty($conf->clicktodial->enabled) && $addlink == 'AC_TEL') {  // If click to dial, we use click to dial url

-            if (empty($user->clicktodial_loaded))

-                $user->fetch_clicktodial();

+            if (empty($user->clicktodial_loaded)) {
+                            $user->fetch_clicktodial();
+            }
 

             // Define urlmask

             $urlmask = 'ErrorClickToDialModuleNotConfigured';

-            if (!empty($conf->global->CLICKTODIAL_URL))

-                $urlmask = $conf->global->CLICKTODIAL_URL;

-            if (!empty($user->clicktodial_url))

-                $urlmask = $user->clicktodial_url;

+            if (!empty($conf->global->CLICKTODIAL_URL)) {
+                            $urlmask = $conf->global->CLICKTODIAL_URL;
+            }
+            if (!empty($user->clicktodial_url)) {
+                            $urlmask = $user->clicktodial_url;
+            }
 

             $clicktodial_poste = (!empty($user->clicktodial_poste) ? urlencode($user->clicktodial_poste) : '');

             $clicktodial_login = (!empty($user->clicktodial_login) ? urlencode($user->clicktodial_login) : '');

@@ -2471,8 +2598,9 @@ 
             $url = make_substitutions($url, $substitarray);

             $newphonesav = $newphone;

             $newphone = '<a href="' . $url . '"';

-            if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET))

-                $newphone .= ' target="_blank"';

+            if (!empty($conf->global->CLICKTODIAL_FORCENEWTARGET)) {
+                            $newphone .= ' target="_blank"';
+            }
             $newphone .= '>' . $newphonesav . '</a>';

         }

 

@@ -2480,12 +2608,15 @@ 
         if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {

             $type = 'AC_TEL';

             $link = '';

-            if ($addlink == 'AC_FAX')

-                $type = 'AC_FAX';

-            if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE))

-                $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';

-            if ($link)

-                $newphone = '<div>' . $newphone . ' ' . $link . '</div>';

+            if ($addlink == 'AC_FAX') {
+                            $type = 'AC_FAX';
+            }
+            if (!empty($conf->global->AGENDA_ADDACTIONFORPHONE)) {
+                            $link = '<a href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create&amp;backtopage=1&amp;actioncode=' . $type . ($cid ? '&amp;contactid=' . $cid : '') . ($socid ? '&amp;socid=' . $socid : '') . '">' . img_object($langs->trans("AddAction"), "calendar") . '</a>';
+            }
+            if ($link) {
+                            $newphone = '<div>' . $newphone . ' ' . $link . '</div>';
+            }
         }

     }

 

@@ -2512,15 +2643,17 @@ 
                 $picto = '';

             }

         }

-        if ($adddivfloat)

-            $rep .= '<div class="nospan float" style="margin-right: 10px">';

-        else

-            $rep .= '<span style="margin-right: 10px;">';

+        if ($adddivfloat) {
+                    $rep .= '<div class="nospan float" style="margin-right: 10px">';
+        } else {
+                    $rep .= '<span style="margin-right: 10px;">';
+        }
         $rep .= ($withpicto ? img_picto($titlealt, 'object_' . $picto . '.png') . ' ' : '') . $newphone;

-        if ($adddivfloat)

-            $rep .= '</div>';

-        else

-            $rep .= '</span>';

+        if ($adddivfloat) {
+                    $rep .= '</div>';
+        } else {
+                    $rep .= '</span>';
+        }
     }

 

     return $rep;

@@ -2539,16 +2672,18 @@ 
 

     $ret = '';

 

-    if (empty($mode))

-        $ret .= $ip;

+    if (empty($mode)) {
+            $ret .= $ip;
+    }
 

     if ($mode != 2) {

         $countrycode = dolGetCountryCodeFromIp($ip);

         if ($countrycode) { // If success, countrycode is us, fr, ...

             if (file_exists(DOL_BASE_PATH . 'theme/common/flags/' . $countrycode . '.png')) {

                 $ret .= ' ' . img_picto($countrycode . ' ' . $langs->trans("AccordingToGeoIPDatabase"), /* DOL_URL_ROOT */ DOL_BASE_URI . '/theme/common/flags/' . $countrycode . '.png', '', 1);

-            } else

-                $ret .= ' (' . $countrycode . ')';

+            } else {
+                            $ret .= ' (' . $countrycode . ')';
+            }
         }

     }

 

@@ -2646,26 +2781,33 @@ 
             $out .= $hookmanager->resPrint;

         }

         if (empty($reshook)) {

-            if (empty($charfornl))

-                $out .= nl2br($address);

-            else

-                $out .= preg_replace('/[\r\n]+/', $charfornl, $address);

+            if (empty($charfornl)) {
+                            $out .= nl2br($address);
+            } else {
+                            $out .= preg_replace('/[\r\n]+/', $charfornl, $address);
+            }
 

             $showgmap = $showomap = 0;

 

             // TODO Add a hook here

-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS))

-                $showgmap = 1;

-            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS))

-                $showgmap = 1;

-            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS))

-                $showgmap = 1;

-            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS))

-                $showomap = 1;

-            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS))

-                $showomap = 1;

-            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS))

-                $showomap = 1;

+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_CONTACTS)) {
+                            $showgmap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->google->enabled) && !empty($conf->global->GOOGLE_ENABLE_GMAPS_MEMBERS)) {
+                            $showgmap = 1;
+            }
+            if (($mode == 'thirdparty' || $mode == 'societe') && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'contact' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_CONTACTS)) {
+                            $showomap = 1;
+            }
+            if ($mode == 'member' && !empty($conf->openstreetmap->enabled) && !empty($conf->global->OPENSTREETMAP_ENABLE_MAPS_MEMBERS)) {
+                            $showomap = 1;
+            }
 

             if ($showgmap) {

                 $url = dol_buildpath('/google/gmaps.php?mode=' . $mode . '&id=' . $id, 1);

@@ -2677,11 +2819,12 @@ 
             }

         }

     }

-    if ($noprint)

-        return $out;

-    else

-        print $out;

-}

+    if ($noprint) {
+            return $out;
+    } else {
+            print $out;
+    }
+    }

 

 /**

  * 	Return true if email syntax is ok

@@ -2692,10 +2835,12 @@ 
  */

 function isValidEmail($address, $acceptsupervisorkey = 0)

 {

-    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__')

-        return true;

-    if (filter_var($address, FILTER_VALIDATE_EMAIL))

-        return true;

+    if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
+            return true;
+    }
+    if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
+            return true;
+    }
 

     return false;

 }

@@ -2717,10 +2862,12 @@ 
             $mxhosts = array();

             $weight = array();

             getmxrr(idn_to_ascii($domain), $mxhosts, $weight);

-            if (count($mxhosts) > 1)

-                return 1;

-            if (count($mxhosts) == 1 && !empty($mxhosts[0]))

-                return 1;

+            if (count($mxhosts) > 1) {
+                            return 1;
+            }
+            if (count($mxhosts) == 1 && !empty($mxhosts[0])) {
+                            return 1;
+            }
 

             return 0;

         }

@@ -2749,11 +2896,12 @@ 
  */

 function dol_strlen($string, $stringencoding = 'UTF-8')

 {

-    if (function_exists('mb_strlen'))

-        return mb_strlen($string, $stringencoding);

-    else

-        return strlen($string);

-}

+    if (function_exists('mb_strlen')) {
+            return mb_strlen($string, $stringencoding);
+    } else {
+            return strlen($string);
+    }
+    }

 

 /**

  * Make a substring. Works even if mbstring module is not enabled for better compatibility.

@@ -2769,8 +2917,9 @@ 
 {

     global $langs;

 

-    if (empty($stringencoding))

-        $stringencoding = $langs->charset_output;

+    if (empty($stringencoding)) {
+            $stringencoding = $langs->charset_output;
+    }
 

     $ret = '';

     if (empty($trunconbytes)) {

@@ -2806,49 +2955,56 @@ 
 {

     global $conf;

 

-    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC))

-        return $string;

+    if ($size == 0 || !empty($conf->global->MAIN_DISABLE_TRUNC)) {
+            return $string;
+    }
 

-    if (empty($stringencoding))

-        $stringencoding = 'UTF-8';

+    if (empty($stringencoding)) {
+            $stringencoding = 'UTF-8';
+    }
     // reduce for small screen

-    if ($conf->dol_optimize_smallscreen == 1 && $display == 1)

-        $size = round($size / 3);

+    if ($conf->dol_optimize_smallscreen == 1 && $display == 1) {
+            $size = round($size / 3);
+    }
 

     // We go always here

     if ($trunc == 'right') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');

-        else

-        //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

-            return $string;

-    }

-    elseif ($trunc == 'middle') {

+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+            return dol_substr($newstring, 0, $size, $stringencoding) . ($nodot ? '' : '...');
+        } else {
+                //return 'u'.$size.'-'.$newstring.'-'.dol_strlen($newstring,$stringencoding).'-'.$string;

+            return $string;
+        }
+    } elseif ($trunc == 'middle') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

         if (dol_strlen($newstring, $stringencoding) > 2 && dol_strlen($newstring, $stringencoding) > ($size + 1)) {

             $size1 = round($size / 2);

             $size2 = round($size / 2);

             return dol_substr($newstring, 0, $size1, $stringencoding) . '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size2, $size2, $stringencoding);

-        } else

-            return $string;

-    }

-    elseif ($trunc == 'left') {

+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'left') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3)))    // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

-            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);

-        else

-            return $string;

-    }

-    elseif ($trunc == 'wrap') {

+        if (dol_strlen($newstring, $stringencoding) > ($size + ($nodot ? 0 : 3))) {
+            // If nodot is 0 and size is 1,2 or 3 chars more, we don't trunc and don't add ...

+            return '...' . dol_substr($newstring, dol_strlen($newstring, $stringencoding) - $size, $size, $stringencoding);
+        } else {
+                    return $string;
+        }
+    } elseif ($trunc == 'wrap') {

         $newstring = dol_textishtml($string) ? dol_string_nohtmltag($string, 1) : $string;

-        if (dol_strlen($newstring, $stringencoding) > ($size + 1))

-            return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);

-        else

-            return $string;

-    } else

-        return 'BadParam3CallingDolTrunc';

-}

+        if (dol_strlen($newstring, $stringencoding) > ($size + 1)) {
+                    return dol_substr($newstring, 0, $size, $stringencoding) . "\n" . dol_trunc(dol_substr($newstring, $size, dol_strlen($newstring, $stringencoding) - $size, $stringencoding), $size, $trunc);
+        } else {
+                    return $string;
+        }
+    } else {
+            return 'BadParam3CallingDolTrunc';
+    }
+    }

 

 /**

  * 	Show picto whatever it's its name (generic function)

@@ -3057,8 +3213,9 @@ 
 {

     global $conf;

 

-    if (!preg_match('/(\.png|\.gif)$/i', $picto))

-        $picto .= '.png';

+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 

     //$path = DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/weather/' . $picto;

     $path = DOL_BASE_URI . '/theme/' . $conf->theme . '/img/weather/' . $picto;

@@ -3080,19 +3237,21 @@ 
 {

     global $conf;

 

-    if (!preg_match('/(\.png|\.gif)$/i', $picto))

-        $picto .= '.png';

+    if (!preg_match('/(\.png|\.gif)$/i', $picto)) {
+            $picto .= '.png';
+    }
 

-    if ($pictoisfullpath)

-        $path = $picto;

-    else {

+    if ($pictoisfullpath) {
+            $path = $picto;
+    } else {

         $path = DOL_URL_ROOT . '/theme/common/' . $picto;

 

         if (!empty($conf->global->MAIN_MODULE_CAN_OVERWRITE_COMMONICONS)) {

             $themepath = DOL_BASE_PATH . 'theme/' . $conf->theme . '/img/' . $picto;

 

-            if (file_exists($themepath))

-                $path = $themepath;

+            if (file_exists($themepath)) {
+                            $path = $themepath;
+            }
         }

     }

 

@@ -3131,8 +3290,9 @@ 
             $numaction = 0;

         }

     }

-    if (!is_numeric($numaction))

-        $numaction = 0;

+    if (!is_numeric($numaction)) {
+            $numaction = 0;
+    }
 

     return img_picto($titlealt, 'stcomm' . $numaction . '.png');

 }

@@ -3148,8 +3308,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Show');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Show');
+    }
 

     return img_picto($titlealt, 'pdf' . $size . '.png');

 }

@@ -3165,8 +3326,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Add');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Add');
+    }
 

     return img_picto($titlealt, 'edit_add.png', $other);

 }

@@ -3182,8 +3344,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Remove');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Remove');
+    }
 

     return img_picto($titlealt, 'edit_remove.png', $other);

 }

@@ -3200,8 +3363,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Modify');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Modify');
+    }
 

     return img_picto($titlealt, 'edit.png', ($float ? 'style="float: ' . ($langs->tab_translate["DIRECTION"] == 'rtl' ? 'left' : 'right') . '"' : "") . ($other ? ' ' . $other : ''));

 }

@@ -3218,8 +3382,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('View');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('View');
+    }
 

     $moreatt = ($float ? 'style="float: right" ' : '') . $other;

 

@@ -3237,8 +3402,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Delete');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Delete');
+    }
 

     return img_picto($titlealt, 'delete.png', $other);

     //return '<span class="fa fa-trash fa-2x fa-fw" style="font-size: 1.7em;" title="'.$titlealt.'"></span>';

@@ -3254,8 +3420,9 @@ 
 function img_printer($titlealt = "default", $other = '')

 {

     global $conf, $langs;

-    if ($titlealt == "default")

-        $titlealt = $langs->trans("Print");

+    if ($titlealt == "default") {
+            $titlealt = $langs->trans("Print");
+    }
     return img_picto($titlealt, 'printer.png', $other);

 }

 

@@ -3270,8 +3437,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Split');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Split');
+    }
 

     return img_picto($titlealt, 'split.png', $other);

 }

@@ -3288,10 +3456,11 @@ 
     global $conf, $langs;

 

     if ($usealttitle) {

-        if (is_string($usealttitle))

-            $usealttitle = dol_escape_htmltag($usealttitle);

-        else

-            $usealttitle = $langs->trans('Info');

+        if (is_string($usealttitle)) {
+                    $usealttitle = dol_escape_htmltag($usealttitle);
+        } else {
+                    $usealttitle = $langs->trans('Info');
+        }
     }

 

     return img_picto($usealttitle, 'info.png', 'style="vertical-align: middle;' . ($usehelpcursor == 1 ? ' cursor: help' : ($usehelpcursor == 2 ? ' cursor: pointer' : '')) . '"');

@@ -3307,8 +3476,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Informations');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Informations');
+    }
 

     return img_picto($titlealt, 'info.png', 'style="vertical-align: middle;"');

 }

@@ -3324,8 +3494,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Warning');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Warning');
+    }
 

     //return '<div class="imglatecoin">'.img_picto($titlealt, 'warning_white.png', 'class="pictowarning valignmiddle"'.($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' '.$moreatt): '')).'</div>';

     return img_picto($titlealt, 'warning.png', 'class="pictowarning valignmiddle"' . ($moreatt ? ($moreatt == '1' ? ' style="float: right"' : ' ' . $moreatt) : ''));

@@ -3341,8 +3512,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Error');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Error');
+    }
 

     return img_picto($titlealt, 'error.png', 'class="valigntextbottom"');

 }

@@ -3358,8 +3530,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Next');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Next');
+    }
 

     //return img_picto($titlealt, 'next.png', $moreatt);

     return '<span class="fa fa-chevron-right paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3376,8 +3549,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Previous');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Previous');
+    }
 

     //return img_picto($titlealt, 'previous.png', $moreatt);

     return '<span class="fa fa-chevron-left paddingright paddingleft" title="' . dol_escape_htmltag($titlealt) . '"></span>';

@@ -3395,8 +3569,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Down');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Down');
+    }
 

     return img_picto($titlealt, ($selected ? '1downarrow_selected.png' : '1downarrow.png'), 'class="imgdown' . ($moreclass ? " " . $moreclass : "") . '"');

 }

@@ -3413,8 +3588,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Up');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Up');
+    }
 

     return img_picto($titlealt, ($selected ? '1uparrow_selected.png' : '1uparrow.png'), 'class="imgup' . ($moreclass ? " " . $moreclass : "") . '"');

 }

@@ -3431,8 +3607,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Left');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Left');
+    }
 

     return img_picto($titlealt, ($selected ? '1leftarrow_selected.png' : '1leftarrow.png'), $moreatt);

 }

@@ -3449,8 +3626,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Right');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Right');
+    }
 

     return img_picto($titlealt, ($selected ? '1rightarrow_selected.png' : '1rightarrow.png'), $moreatt);

 }

@@ -3466,11 +3644,13 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Active');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Active');
+    }
 

-    if ($allow == 1)

-        return img_picto($titlealt, 'tick.png');

+    if ($allow == 1) {
+            return img_picto($titlealt, 'tick.png');
+    }
 

     return '-';

 }

@@ -3518,8 +3698,9 @@ 
     $mimeimg = dol_mimetype($file, '', 2);

     $mimefa = dol_mimetype($file, '', 4);

 

-    if (empty($titlealt))

-        $titlealt = 'Mime type: ' . $mimetype;

+    if (empty($titlealt)) {
+            $titlealt = 'Mime type: ' . $mimetype;
+    }
 

     //return img_picto_common($titlealt, 'mime/'.$mimeimg, 'class="'.$morecss.'"');

     return '<i class="fa fa-' . $mimefa . ' paddingright"></i>';

@@ -3541,13 +3722,15 @@ 
 

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Call');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Call');
+    }
 

-    if ($option == 1)

-        $img = 'call';

-    else

-        $img = 'call_out';

+    if ($option == 1) {
+            $img = 'call';
+    } else {
+            $img = 'call_out';
+    }
 

     return img_picto($titlealt, $img);

 }

@@ -3563,8 +3746,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Search');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 

     $img = img_picto($titlealt, 'search.png', $other, false, 1);

 

@@ -3585,8 +3769,9 @@ 
 {

     global $conf, $langs;

 

-    if ($titlealt == 'default')

-        $titlealt = $langs->trans('Search');

+    if ($titlealt == 'default') {
+            $titlealt = $langs->trans('Search');
+    }
 

     $img = img_picto($titlealt, 'searchclear.png', $other, false, 1);

 

@@ -3648,14 +3833,16 @@ 
 

     if ($_SERVER['DOCUMENT_ROOT']) {    // Mode web

         $out .= $langs->trans("DolibarrHasDetectedError") . ".<br>\n";

-        if (!empty($conf->global->MAIN_FEATURES_LEVEL))

-            $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";

+        if (!empty($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "You use an experimental or develop level of features, so please do NOT report any bugs, except if problem is confirmed moving option MAIN_FEATURES_LEVEL back to 0.<br>\n";
+        }
         $out .= $langs->trans("InformationToHelpDiagnose") . ":<br>\n";

 

         $out .= "<b>" . $langs->trans("Date") . ":</b> " . dol_print_date(time(), 'dayhourlog') . "<br>\n";

         $out .= "<b>" . $langs->trans("Dolibarr") . ":</b> " . DOL_VERSION . "<br>\n";

-        if (isset($conf->global->MAIN_FEATURES_LEVEL))

-            $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";

+        if (isset($conf->global->MAIN_FEATURES_LEVEL)) {
+                    $out .= "<b>" . $langs->trans("LevelOfFeature") . ":</b> " . $conf->global->MAIN_FEATURES_LEVEL . "<br>\n";
+        }
         if (function_exists("phpversion")) {

             $out .= "<b>" . $langs->trans("PHP") . ":</b> " . phpversion() . "<br>\n";

         }

@@ -3698,18 +3885,20 @@ 
         $langs->load("errors");

 

         // Merge all into $errors array

-        if (is_array($error) && is_array($errors))

-            $errors = array_merge($error, $errors);

-        elseif (is_array($error))

-            $errors = $error;

-        elseif (is_array($errors))

-            $errors = array_merge(array($error), $errors);

-        else

-            $errors = array_merge(array($error));

+        if (is_array($error) && is_array($errors)) {
+                    $errors = array_merge($error, $errors);
+        } elseif (is_array($error)) {
+                    $errors = $error;
+        } elseif (is_array($errors)) {
+                    $errors = array_merge(array($error), $errors);
+        } else {
+                    $errors = array_merge(array($error));
+        }
 

         foreach ($errors as $msg) {

-            if (empty($msg))

-                continue;

+            if (empty($msg)) {
+                            continue;
+            }
             if ($_SERVER['DOCUMENT_ROOT']) {  // Mode web

                 $out .= "<b>" . $langs->trans("Message") . ":</b> " . dol_escape_htmltag($msg) . "<br>\n";

             } else {                        // Mode CLI

@@ -3727,9 +3916,9 @@ 
         $out .= "<br>\n";

     }

 

-    if (empty($dolibarr_main_prod))

-        print $out;

-    else {

+    if (empty($dolibarr_main_prod)) {
+            print $out;
+    } else {

         print $langs->trans("DolibarrHasDetectedError") . '. ';

         print $langs->trans("YouCanSetOptionDolibarrMainProdToZero");

         define("MAIN_CORE_ERROR", 1);

@@ -3752,16 +3941,18 @@ 
 {

     global $langs, $conf;

 

-    if (empty($email))

-        $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;

+    if (empty($email)) {
+            $email = $conf->global->MAIN_INFO_SOCIETE_MAIL;
+    }
 

     $langs->load("errors");

     $now = dol_now();

 

     print '<br><div class="center login_main_message"><div class="' . $morecss . '">';

     print $langs->trans("ErrorContactEMail", $email, $prefixcode . dol_print_date($now, '%Y%m%d'));

-    if ($errormessage)

-        print '<br><br>' . $errormessage;

+    if ($errormessage) {
+            print '<br><br>' . $errormessage;
+    }
     if (is_array($errormessages) && count($errormessages)) {

         foreach ($errormessages as $mesgtoshow) {

             print '<br><br>' . $mesgtoshow;

@@ -4004,12 +4195,15 @@ 
     $savtotalnboflines = $totalnboflines;

     $totalnboflines = abs($totalnboflines);

 

-    if ($picto == 'setup')

-        $picto = 'title_setup.png';

-    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png')

-        $picto = 'title.gif';

-    if ($limit < 0)

-        $limit = $conf->liste_limit;

+    if ($picto == 'setup') {
+            $picto = 'title_setup.png';
+    }
+    if (($conf->browser->name == 'ie') && $picto == 'title_generic.png') {
+            $picto = 'title.gif';
+    }
+    if ($limit < 0) {
+            $limit = $conf->liste_limit;
+    }
     if ($savlimit != 0 && (($num > $limit) || ($num == -1) || ($limit == 0))) {

         $nextpage = 1;

     } else {

@@ -4023,11 +4217,13 @@ 
     // Left

     //if ($picto && $titre) print '<td class="nobordernopadding hideonsmartphone" width="40" align="left" valign="middle">'.img_picto('', $picto, 'id="pictotitle"', $pictoisfullpath).'</td>';

     print '<td class="nobordernopadding valignmiddle">';

-    if ($picto && $titre)

-        print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);

+    if ($picto && $titre) {
+            print img_picto('', $picto, 'class="hideonsmartphone valignmiddle opacityhigh pictotitle widthpictotitle"', $pictoisfullpath);
+    }
     print '<div class="titre inline-block">' . $titre;

-    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '')

-        print ' (' . $totalnboflines . ')';

+    if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') {
+            print ' (' . $totalnboflines . ')';
+    }
     print '</div></td>';

 

     // Center

@@ -4037,10 +4233,12 @@ 
 

     // Right

     print '<td class="nobordernopadding valignmiddle" align="right">';

-    if ($sortfield)

-        $options .= "&sortfield=" . urlencode($sortfield);

-    if ($sortorder)

-        $options .= "&sortorder=" . urlencode($sortorder);

+    if ($sortfield) {
+            $options .= "&sortfield=" . urlencode($sortfield);
+    }
+    if ($sortorder) {
+            $options .= "&sortorder=" . urlencode($sortorder);
+    }
     // Show navigation bar

     $pagelist = '';

     if ($savlimit != 0 && ($page > 0 || $num > $limit)) {

@@ -4048,10 +4246,11 @@ 
             // Define nb of extra page links before and after selected page + ... + first or last

             $maxnbofpage = (empty($conf->dol_optimize_smallscreen) ? 4 : 1);

 

-            if ($limit > 0)

-                $nbpages = ceil($totalnboflines / $limit);

-            else

-                $nbpages = 1;

+            if ($limit > 0) {
+                            $nbpages = ceil($totalnboflines / $limit);
+            } else {
+                            $nbpages = 1;
+            }
             $cpt = ($page - $maxnbofpage);

             if ($cpt < 0) {

                 $cpt = 0;

@@ -4059,10 +4258,11 @@ 
 

             if ($cpt >= 1) {

                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=0' . $options . '">1</a></li>';

-                if ($cpt > 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                else if ($cpt == 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';

+                if ($cpt > 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=1' . $options . '">2</a></li>';
+                }
             }

 

             do {

@@ -4075,14 +4275,14 @@ 
             } while ($cpt < $nbpages && $cpt <= $page + $maxnbofpage);

 

             if ($cpt < $nbpages) {

-                if ($cpt < $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';

-                else if ($cpt == $nbpages - 2)

-                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';

+                if ($cpt < $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="inactive"' : '') . '>...</span></li>';
+                } else if ($cpt == $nbpages - 2) {
+                                    $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 2) . $options . '">' . ($nbpages - 1) . '</a></li>';
+                }
                 $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><a href="' . $file . '?page=' . ($nbpages - 1) . $options . '">' . $nbpages . '</a></li>';

             }

-        }

-        else {

+        } else {

             $pagelist .= '<li' . (($conf->dol_use_jmobile != 4) ? ' class="pagination"' : '') . '><span ' . (($conf->dol_use_jmobile != 4) ? 'class="active"' : '') . '>' . ($page + 1) . "</li>";

         }

     }

@@ -4118,18 +4318,21 @@ 
         $pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000';

         //$pagesizechoices.=',0:'.$langs->trans("All");     // Not yet supported

         //$pagesizechoices.=',2:2';

-        if (!empty($conf->global->MAIN_PAGESIZE_CHOICES))

-            $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;

+        if (!empty($conf->global->MAIN_PAGESIZE_CHOICES)) {
+                    $pagesizechoices = $conf->global->MAIN_PAGESIZE_CHOICES;
+        }
 

         print '<li class="pagination">';

         print '<select class="flat selectlimit" name="limit" title="' . dol_escape_htmltag($langs->trans("MaxNbOfRecordPerPage")) . '">';

         $tmpchoice = explode(',', $pagesizechoices);

         $tmpkey = $limit . ':' . $limit;

-        if (!in_array($tmpkey, $tmpchoice))

-            $tmpchoice[] = $tmpkey;

+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         $tmpkey = $conf->liste_limit . ':' . $conf->liste_limit;

-        if (!in_array($tmpkey, $tmpchoice))

-            $tmpchoice[] = $tmpkey;

+        if (!in_array($tmpkey, $tmpchoice)) {
+                    $tmpchoice[] = $tmpkey;
+        }
         asort($tmpchoice, SORT_NUMERIC);

         $found = false;

         foreach ($tmpchoice as $val) {

@@ -4205,14 +4408,15 @@ 
     }

 

     // If rate is '9/9/9' we don't change it.  If rate is '9.000' we apply price()

-    if (!preg_match('/\//', $rate))

-        $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');

-    else {

+    if (!preg_match('/\//', $rate)) {
+            $ret = price($rate, 0, '', 0, 0) . ($addpercent ? '%' : '');
+    } else {

         // TODO Split on / and output with a price2num to have clean numbers without ton of 000.

         $ret = $rate . ($addpercent ? '%' : '');

     }

-    if (($info_bits & 1) && $usestarfornpr >= 0)

-        $ret .= ' *';

+    if (($info_bits & 1) && $usestarfornpr >= 0) {
+            $ret .= ' *';
+    }
     $ret .= $morelabel;

     return $ret;

 }

@@ -4237,11 +4441,14 @@ 
     global $langs, $conf;

 

     // Clean parameters

-    if (empty($amount))

-        $amount = 0; // To have a numeric value if amount not defined or = ''

+    if (empty($amount)) {
+            $amount = 0;
+    }
+    // To have a numeric value if amount not defined or = ''

     $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)

-    if ($rounding < 0)

-        $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);

+    if ($rounding < 0) {
+            $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
+    }
     $nbdecimal = $rounding;

 

     // Output separators by default (french)

@@ -4249,17 +4456,21 @@ 
     $thousand = ' ';

 

     // If $outlangs not forced, we use use language

-    if (!is_object($outlangs))

-        $outlangs = $langs;

-

-    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-        $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");

-    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-        $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");

-    if ($thousand == 'None')

-        $thousand = '';

-    else if ($thousand == 'Space')

-        $thousand = ' ';

+    if (!is_object($outlangs)) {
+            $outlangs = $langs;
+    }
+

+    if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } else if ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

     //print "amount=".$amount."-";

     $amount = str_replace(',', '.', $amount); // should be useless

@@ -4271,8 +4482,9 @@ 
     $end = '';

 

     // We increase nbdecimal if there is more decimal than asked (to not loose information)

-    if (dol_strlen($decpart) > $nbdecimal)

-        $nbdecimal = dol_strlen($decpart);

+    if (dol_strlen($decpart) > $nbdecimal) {
+            $nbdecimal = dol_strlen($decpart);
+    }
     // Si on depasse max

     if ($trunc && $nbdecimal > $conf->global->MAIN_MAX_DECIMALS_SHOWN) {

         $nbdecimal = $conf->global->MAIN_MAX_DECIMALS_SHOWN;

@@ -4283,8 +4495,9 @@ 
     }

 

     // If force rounding

-    if ($forcerounding >= 0)

-        $nbdecimal = $forcerounding;

+    if ($forcerounding >= 0) {
+            $nbdecimal = $forcerounding;
+    }
 

     // Format number

     $output = number_format($amount, $nbdecimal, $dec, $thousand);

@@ -4295,13 +4508,14 @@ 
     // Add symbol of currency if requested

     $cursymbolbefore = $cursymbolafter = '';

     if ($currency_code) {

-        if ($currency_code == 'auto')

-            $currency_code = $conf->currency;

+        if ($currency_code == 'auto') {
+                    $currency_code = $conf->currency;
+        }
 

         $listofcurrenciesbefore = array('USD', 'GBP', 'AUD', 'MXN', 'PEN', 'CNY');

-        if (in_array($currency_code, $listofcurrenciesbefore))

-            $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);

-        else {

+        if (in_array($currency_code, $listofcurrenciesbefore)) {
+                    $cursymbolbefore .= $outlangs->getCurrencySymbol($currency_code);
+        } else {

             $tmpcur = $outlangs->getCurrencySymbol($currency_code);

             $cursymbolafter .= ($tmpcur == $currency_code ? ' ' . $tmpcur : $tmpcur);

         }

@@ -4335,14 +4549,17 @@ 
     // Decimal delimiter for PHP and database SQL requests must be '.'

     $dec = ',';

     $thousand = ' ';

-    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal")

-        $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");

-    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand")

-        $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");

-    if ($thousand == 'None')

-        $thousand = '';

-    elseif ($thousand == 'Space')

-        $thousand = ' ';

+    if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+            $dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+    }
+    if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+            $thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+    }
+    if ($thousand == 'None') {
+            $thousand = '';
+    } elseif ($thousand == 'Space') {
+            $thousand = ' ';
+    }
     //print "amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";

     // Convert value to universal number format (no thousand separator, '.' as decimal separator)

     if ($alreadysqlnb != 1) { // If not a PHP number or unknown, we change format

@@ -4358,8 +4575,10 @@ 
         }

         //print "QQ".$amount.'<br>';

         // Now make replace (the main goal of function)

-        if ($thousand != ',' && $thousand != '.')

-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users

         $amount = str_replace(' ', '', $amount);  // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

@@ -4368,19 +4587,23 @@ 
     // Now, make a rounding if required

     if ($rounding) {

         $nbofdectoround = '';

-        if ($rounding == 'MU')

-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;

-        elseif ($rounding == 'MT')

-            $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;

-        elseif ($rounding == 'MS')

-            $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;

-        elseif (is_numeric($rounding))

-            $nbofdectoround = $rounding;

+        if ($rounding == 'MU') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_UNIT;
+        } elseif ($rounding == 'MT') {
+                    $nbofdectoround = $conf->global->MAIN_MAX_DECIMALS_TOT;
+        } elseif ($rounding == 'MS') {
+                    $nbofdectoround = empty($conf->global->MAIN_MAX_DECIMALS_STOCK) ? 5 : $conf->global->MAIN_MAX_DECIMALS_STOCK;
+        } elseif (is_numeric($rounding)) {
+                    $nbofdectoround = $rounding;
+        }
         //print "RR".$amount.' - '.$nbofdectoround.'<br>';

-        if (dol_strlen($nbofdectoround))

-            $amount = round($amount, $nbofdectoround); // $nbofdectoround can be 0.

-        else

-            return 'ErrorBadParameterProvidedToFunction';

+        if (dol_strlen($nbofdectoround)) {
+                    $amount = round($amount, $nbofdectoround);
+        }
+        // $nbofdectoround can be 0.

+        else {
+                    return 'ErrorBadParameterProvidedToFunction';
+        }
         //print 'SS'.$amount.' - '.$nbofdec.' - '.$dec.' - '.$thousand.' - '.$nbofdectoround.'<br>';

         // Convert amount to format with dolibarr dec and thousand (this is because PHP convert a number

         // to format defined by LC_NUMERIC after a calculation and we want source format to be defined by Dolibarr setup.

@@ -4394,8 +4617,10 @@ 
         //print "TT".$amount.'<br>';

         // Always make replace because each math function (like round) replace

         // with local values and we want a number that has a SQL string format x.y

-        if ($thousand != ',' && $thousand != '.')

-            $amount = str_replace(',', '.', $amount); // To accept 2 notations for french users

+        if ($thousand != ',' && $thousand != '.') {
+                    $amount = str_replace(',', '.', $amount);
+        }
+        // To accept 2 notations for french users

         $amount = str_replace(' ', '', $amount);  // To avoid spaces

         $amount = str_replace($thousand, '', $amount); // Replace of thousand before replace of dec to avoid pb if thousand is .

         $amount = str_replace($dec, '.', $amount);

@@ -4454,8 +4679,9 @@ 
 {

     global $db, $conf, $mysoc;

 

-    if (empty($thirdparty_seller) || !is_object($thirdparty_seller))

-        $thirdparty_seller = $mysoc;

+    if (empty($thirdparty_seller) || !is_object($thirdparty_seller)) {
+            $thirdparty_seller = $mysoc;
+    }
 

     dol_syslog("get_localtax tva=" . $vatrate . " local=" . $local . " thirdparty_buyer id=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->id : '') . "/country_code=" . (is_object($thirdparty_buyer) ? $thirdparty_buyer->country_code : '') . " thirdparty_seller id=" . $thirdparty_seller->id . "/country_code=" . $thirdparty_seller->country_code . " thirdparty_seller localtax1_assuj=" . $thirdparty_seller->localtax1_assuj . "  thirdparty_seller localtax2_assuj=" . $thirdparty_seller->localtax2_assuj);

 

@@ -4473,37 +4699,43 @@ 
     // Some test to guess with no need to make database access

     if ($mysoc->country_code == 'ES') { // For spain localtaxes 1 and 2, tax is qualified if buyer use local tax

         if ($local == 1) {

-            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0")

-                return 0;

+            if (!$mysoc->localtax1_assuj || (string) $vatratecleaned == "0") {
+                            return 0;
+            }
             if ($thirdparty_seller->id == $mysoc->id) {

-                if (!$thirdparty_buyer->localtax1_assuj)

-                    return 0;

-            }

-            else {

-                if (!$thirdparty_seller->localtax1_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax1_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax1_assuj) {
+                                    return 0;
+                }
             }

         }

 

         if ($local == 2) {

             //if (! $mysoc->localtax2_assuj || (string) $vatratecleaned == "0") return 0;

-            if (!$mysoc->localtax2_assuj)

-                return 0;  // If main vat is 0, IRPF may be different than 0.

+            if (!$mysoc->localtax2_assuj) {
+                            return 0;
+            }
+            // If main vat is 0, IRPF may be different than 0.

             if ($thirdparty_seller->id == $mysoc->id) {

-                if (!$thirdparty_buyer->localtax2_assuj)

-                    return 0;

-            }

-            else {

-                if (!$thirdparty_seller->localtax2_assuj)

-                    return 0;

+                if (!$thirdparty_buyer->localtax2_assuj) {
+                                    return 0;
+                }
+            } else {

+                if (!$thirdparty_seller->localtax2_assuj) {
+                                    return 0;
+                }
             }

         }

-    }

-    else {

-        if ($local == 1 && !$thirdparty_seller->localtax1_assuj)

-            return 0;

-        if ($local == 2 && !$thirdparty_seller->localtax2_assuj)

-            return 0;

+    } else {

+        if ($local == 1 && !$thirdparty_seller->localtax1_assuj) {
+                    return 0;
+        }
+        if ($local == 2 && !$thirdparty_seller->localtax2_assuj) {
+                    return 0;
+        }
     }

 

     // For some country MAIN_GET_LOCALTAXES_VALUES_FROM_THIRDPARTY is forced to on.

@@ -4545,19 +4777,23 @@ 
     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

     $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $thirdparty_seller->country_code . "'";

     $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-    if ($vatratecode)

-        $sql .= " AND t.code ='" . $vatratecode . "'";  // If we have the code, we use it in priority

-    else

-        $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";

+    if ($vatratecode) {
+            $sql .= " AND t.code ='" . $vatratecode . "'";
+    }
+    // If we have the code, we use it in priority

+    else {
+            $sql .= " AND t.recuperableonly ='" . $vatnpr . "'";
+    }
     dol_syslog("get_localtax", LOG_DEBUG);

     $resql = $db->query($sql);

 

     if ($resql) {

         $obj = $db->fetch_object($resql);

-        if ($local == 1)

-            return $obj->localtax1;

-        elseif ($local == 2)

-            return $obj->localtax2;

+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }

 

     return 0;

@@ -4603,10 +4839,11 @@ 
     $resql = $db->query($sql);

     if ($resql) {

         $obj = $db->fetch_object($resql);

-        if ($local == 1)

-            return $obj->localtax1;

-        elseif ($local == 2)

-            return $obj->localtax2;

+        if ($local == 1) {
+                    return $obj->localtax1;
+        } elseif ($local == 2) {
+                    return $obj->localtax2;
+        }
     }

 

     return 0;

@@ -4632,9 +4869,9 @@ 
     // Search local taxes

     $sql = "SELECT t.rowid, t.code, t.taux as rate, t.recuperableonly as npr, t.accountancy_code_sell, t.accountancy_code_buy";

     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-    if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

-    else {

+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "xx (yy)"

@@ -4647,19 +4884,22 @@ 
           else $sql.= " WHERE t.fk_pays = c.rowid AND c.code = '".$seller->country_code."'"; */

         $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }

 

     $resql = $db->query($sql);

     if ($resql) {

         $obj = $db->fetch_object($resql);

-        if ($obj)

-            return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);

-        else

-            return array();

-    } else

-        dol_print_error($db);

+        if ($obj) {
+                    return array('rowid' => $obj->rowid, 'code' => $obj->code, 'rate' => $obj->rate, 'npr' => $obj->npr, 'accountancy_code_sell' => $obj->accountancy_code_sell, 'accountancy_code_buy' => $obj->accountancy_code_buy);
+        } else {
+                    return array();
+        }
+    } else {
+            dol_print_error($db);
+    }
 

     return array();

 }

@@ -4689,9 +4929,9 @@ 
     // Search local taxes

     $sql = "SELECT t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.accountancy_code_sell, t.accountancy_code_buy";

     $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t";

-    if ($firstparamisid)

-        $sql .= " WHERE t.rowid = " . (int) $vatrate;

-    else {

+    if ($firstparamisid) {
+            $sql .= " WHERE t.rowid = " . (int) $vatrate;
+    } else {

         $vatratecleaned = $vatrate;

         $vatratecode = '';

         if (preg_match('/^(.*)\s*\((.*)\)$/', $vatrate, $reg)) {      // If vat is "x.x (yy)"

@@ -4700,13 +4940,17 @@ 
         }

 

         $sql .= ", " . MAIN_DB_PREFIX . "c_country as c";

-        if ($mysoc->country_code == 'ES')

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";    // local tax in spain use the buyer country ??

-        else

-            $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";

+        if ($mysoc->country_code == 'ES') {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $buyer->country_code . "'";
+        }
+        // local tax in spain use the buyer country ??

+        else {
+                    $sql .= " WHERE t.fk_pays = c.rowid AND c.code = '" . $seller->country_code . "'";
+        }
         $sql .= " AND t.taux = " . ((float) $vatratecleaned) . " AND t.active = 1";

-        if ($vatratecode)

-            $sql .= " AND t.code = '" . $vatratecode . "'";

+        if ($vatratecode) {
+                    $sql .= " AND t.code = '" . $vatratecode . "'";
+        }
     }

 

     $resql = $db->query($sql);

@@ -4752,17 +4996,17 @@ 
             if ($idprodfournprice > 0) {     // We want vat for product for a "supplier" object

                 $product->get_buyprice($idprodfournprice, 0, 0, 0);

                 $ret = $product->vatrate_supplier;

-                if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

-            }

-            else {

+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
+            } else {

                 $ret = $product->tva_tx;    // Default vat of product we defined

-                if ($product->default_vat_code)

-                    $ret .= ' (' . $product->default_vat_code . ')';

+                if ($product->default_vat_code) {
+                                    $ret .= ' (' . $product->default_vat_code . ')';
+                }
             }

             $found = 1;

-        }

-        else {

+        } else {

             // TODO Read default product vat according to countrycode and product. Vat for couple countrycode/product is a feature not implemeted yet.

             // May be usefull/required if hidden option SERVICE_ARE_ECOMMERCE_200238EC is on

         }

@@ -4782,14 +5026,18 @@ 
                 $obj = $db->fetch_object($resql);

                 if ($obj) {

                     $ret = $obj->vat_rate;

-                    if ($obj->default_vat_code)

-                        $ret .= ' (' . $obj->default_vat_code . ')';

+                    if ($obj->default_vat_code) {
+                                            $ret .= ' (' . $obj->default_vat_code . ')';
+                    }
                 }

                 $db->free($sql);

-            } else

-                dol_print_error($db);

-        } else

-            $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;    // Forced value if autodetect fails

+            } else {
+                            dol_print_error($db);
+            }
+        } else {
+                    $ret = $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS;
+        }
+        // Forced value if autodetect fails

     }

 

     dol_syslog("get_product_vat_for_country: ret=" . $ret);

@@ -4844,13 +5092,15 @@ 
         if ($resql) {

             $obj = $db->fetch_object($resql);

             if ($obj) {

-                if ($local == 1)

-                    $ret = $obj->localtax1;

-                elseif ($local == 2)

-                    $ret = $obj->localtax2;

+                if ($local == 1) {
+                                    $ret = $obj->localtax1;
+                } elseif ($local == 2) {
+                                    $ret = $obj->localtax2;
+                }
             }

-        } else

-            dol_print_error($db);

+        } else {
+                    dol_print_error($db);
+        }
     }

 

     dol_syslog("get_product_localtax_for_country: ret=" . $ret);

@@ -4953,15 +5203,16 @@ 
     global $db;

 

     if ($idprodfournprice > 0) {

-        if (!class_exists('ProductFournisseur'))

-            require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';

+        if (!class_exists('ProductFournisseur')) {
+                    require_once DOL_BASE_PATH . '/fourn/class/fournisseur.product.class.php';
+        }
         $prodprice = new ProductFournisseur($db);

         $prodprice->fetch_product_fournisseur_price($idprodfournprice);

         return $prodprice->fourn_tva_npr;

-    }

-    elseif ($idprod > 0) {

-        if (!class_exists('Product'))

-            require_once DOL_BASE_PATH . 'product/class/product.class.php';

+    } elseif ($idprod > 0) {

+        if (!class_exists('Product')) {
+                    require_once DOL_BASE_PATH . 'product/class/product.class.php';
+        }
         $prod = new Product($db);

         $prod->fetch($idprod);

         return $prod->tva_npr;

@@ -4987,30 +5238,35 @@ 
 {

     global $mysoc;

 

-    if (!is_object($thirdparty_seller))

-        return -1;

-    if (!is_object($thirdparty_buyer))

-        return -1;

+    if (!is_object($thirdparty_seller)) {
+            return -1;
+    }
+    if (!is_object($thirdparty_buyer)) {
+            return -1;
+    }
 

     if ($local == 1) { // Localtax 1

         if ($mysoc->country_code == 'ES') {

-            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj)

-                return 0;

-        }

-        else {

+            if (is_numeric($thirdparty_buyer->localtax1_assuj) && !$thirdparty_buyer->localtax1_assuj) {
+                            return 0;
+            }
+        } else {

             // Si vendeur non assujeti a Localtax1, localtax1 par default=0

-            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj)

-                return 0;

-            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off')

-                return 0;

-        }

-    }

-    elseif ($local == 2) { //I Localtax 2

+            if (is_numeric($thirdparty_seller->localtax1_assuj) && !$thirdparty_seller->localtax1_assuj) {
+                            return 0;
+            }
+            if (!is_numeric($thirdparty_seller->localtax1_assuj) && $thirdparty_seller->localtax1_assuj == 'localtax1off') {
+                            return 0;
+            }
+        }

+    } elseif ($local == 2) { //I Localtax 2

         // Si vendeur non assujeti a Localtax2, localtax2 par default=0

-        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj)

-            return 0;

-        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off')

-            return 0;

+        if (is_numeric($thirdparty_seller->localtax2_assuj) && !$thirdparty_seller->localtax2_assuj) {
+                    return 0;
+        }
+        if (!is_numeric($thirdparty_seller->localtax2_assuj) && $thirdparty_seller->localtax2_assuj == 'localtax2off') {
+                    return 0;
+        }
     }

 

     if ($thirdparty_seller->country_code == $thirdparty_buyer->country_code) {

@@ -5035,31 +5291,38 @@ 
     $classname = '';

     if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') {  // A mettre avant test sur no a cause du == 0

         $result = $langs->trans('yes');

-        if ($case == 1 || $case == 3)

-            $result = $langs->trans("Yes");

-        if ($case == 2)

-            $result = '<input type="checkbox" value="1" checked disabled>';

-        if ($case == 3)

-            $result = '<input type="checkbox" value="1" checked disabled> ' . $result;

+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("Yes");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="1" checked disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="1" checked disabled> ' . $result;
+        }
 

         $classname = 'ok';

-    }

-    elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

+    } elseif ($yesno == 0 || strtolower($yesno) == 'no' || strtolower($yesno) == 'false') {

         $result = $langs->trans("no");

-        if ($case == 1 || $case == 3)

-            $result = $langs->trans("No");

-        if ($case == 2)

-            $result = '<input type="checkbox" value="0" disabled>';

-        if ($case == 3)

-            $result = '<input type="checkbox" value="0" disabled> ' . $result;

-

-        if ($color == 2)

-            $classname = 'ok';

-        else

-            $classname = 'error';

-    }

-    if ($color)

-        return '<font class="' . $classname . '">' . $result . '</font>';

+        if ($case == 1 || $case == 3) {
+                    $result = $langs->trans("No");
+        }
+        if ($case == 2) {
+                    $result = '<input type="checkbox" value="0" disabled>';
+        }
+        if ($case == 3) {
+                    $result = '<input type="checkbox" value="0" disabled> ' . $result;
+        }
+

+        if ($color == 2) {
+                    $classname = 'ok';
+        } else {
+                    $classname = 'error';
+        }
+    }

+    if ($color) {
+            return '<font class="' . $classname . '">' . $result . '</font>';
+    }
     return $result;

 }

 

@@ -5085,23 +5348,27 @@ 
     $path = '';

 

     $arrayforoldpath = array('cheque', 'user', 'category', 'holiday', 'supplier_invoice', 'invoice_supplier', 'mailing', 'supplier_payment');

-    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO))

-        $arrayforoldpath[] = 'product';

+    if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+            $arrayforoldpath[] = 'product';
+    }
     if (!empty($level) && in_array($modulepart, $arrayforoldpath)) {

         // This part should be removed once all code is using "get_exdir" to forge path, with all parameters provided.

-        if (empty($alpha))

-            $num = preg_replace('/([^0-9])/i', '', $num);

-        else

-            $num = preg_replace('/^.*\-/i', '', $num);

+        if (empty($alpha)) {
+                    $num = preg_replace('/([^0-9])/i', '', $num);
+        } else {
+                    $num = preg_replace('/^.*\-/i', '', $num);
+        }
         $num = substr("000" . $num, -$level);

-        if ($level == 1)

-            $path = substr($num, 0, 1);

-        if ($level == 2)

-            $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);

-        if ($level == 3)

-            $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);

-    }

-    else {

+        if ($level == 1) {
+                    $path = substr($num, 0, 1);
+        }
+        if ($level == 2) {
+                    $path = substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+        if ($level == 3) {
+                    $path = substr($num, 2, 1) . '/' . substr($num, 1, 1) . '/' . substr($num, 0, 1);
+        }
+    } else {

         // TODO

         // We will enhance here a common way of forging path for document storage

         // Here, object->id, object->ref and modulepart are required.

@@ -5112,8 +5379,9 @@ 
         }

     }

 

-    if (empty($withoutslash) && !empty($path))

-        $path .= '/';

+    if (empty($withoutslash) && !empty($path)) {
+            $path .= '/';
+    }
 

     return $path;

 }

@@ -5133,8 +5401,9 @@ 
     dol_syslog("functions.lib::dol_mkdir: dir=" . $dir, LOG_INFO);

 

     $dir_osencoded = dol_osencode($dir);

-    if (@is_dir($dir_osencoded))

-        return 0;

+    if (@is_dir($dir_osencoded)) {
+            return 0;
+    }
 

     $nberr = 0;

     $nbcreated = 0;

@@ -5149,12 +5418,15 @@ 
     $cdir = explode("/", $dir);

     $num = count($cdir);

     for ($i = 0; $i < $num; $i++) {

-        if ($i > 0)

-            $ccdir .= '/' . $cdir[$i];

-        else

-            $ccdir .= $cdir[$i];

-        if (preg_match("/^.:$/", $ccdir, $regs))

-            continue; // Si chemin Windows incomplet, on poursuit par rep suivant

+        if ($i > 0) {
+                    $ccdir .= '/' . $cdir[$i];
+        } else {
+                    $ccdir .= $cdir[$i];
+        }
+        if (preg_match("/^.:$/", $ccdir, $regs)) {
+                    continue;
+        }
+        // Si chemin Windows incomplet, on poursuit par rep suivant

 

 

 

@@ -5226,8 +5498,9 @@ 
  */

 function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto = 'UTF-8', $strip_tags = 0)

 {

-    if ($removelinefeed == 2)

-        $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);

+    if ($removelinefeed == 2) {
+            $stringtoclean = preg_replace('/<br[^>]*>\n+/ims', '<br>', $stringtoclean);
+    }
     $temp = preg_replace('/<br[^>]*>/i', "\n", $stringtoclean);

 

     if ($strip_tags) {

@@ -5244,8 +5517,9 @@ 
     $temp = dol_html_entity_decode($temp, ENT_COMPAT, $pagecodeto);

 

     // Supprime aussi les retours

-    if ($removelinefeed == 1)

-        $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);

+    if ($removelinefeed == 1) {
+            $temp = str_replace(array("\r\n", "\r", "\n"), " ", $temp);
+    }
 

     // et les espaces doubles

     while (strpos($temp, "  ")) {

@@ -5331,18 +5605,21 @@ 
         if ($charset == 'UTF-8') {

             $pattern = '/(<br[^>]*>)/Uu';

         } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-        else

-            $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+        else {
+                    $pattern = '/(<br[^>]*>)/U';
+        }
+        // /U is to have UNGREEDY regex to limit to one html tag.

         $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

         $firstline = '';

         $i = 0;

         $nba = count($a); // 2x nb of lines in $a because $a contains also a line for each new line separator

         while (($i < $nba) && ($i < ($nboflines * 2))) {

-            if ($i % 2 == 0)

-                $firstline .= $a[$i];

-            elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1)))

-                $firstline .= ($ishtml ? "<br>\n" : "\n");

+            if ($i % 2 == 0) {
+                            $firstline .= $a[$i];
+            } elseif (($i < (($nboflines * 2) - 1)) && ($i < ($nba - 1))) {
+                            $firstline .= ($ishtml ? "<br>\n" : "\n");
+            }
             $i++;

         }

         unset($a);

@@ -5391,15 +5668,18 @@ 
     $newstring = $stringtoencode;

     if (dol_textishtml($stringtoencode)) { // Check if text is already HTML or not

         $newstring = preg_replace('/<br(\s[\sa-zA-Z_="]*)?\/?>/i', '<br>', $newstring); // Replace "<br type="_moz" />" by "<br>". It's same and avoid pb with FPDF.

-        if ($removelasteolbr)

-            $newstring = preg_replace('/<br>$/i', '', $newstring); // Remove last <br> (remove only last one)

+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/<br>$/i', '', $newstring);
+        }
+        // Remove last <br> (remove only last one)

         $newstring = strtr($newstring, array('&' => '__and__', '<' => '__lt__', '>' => '__gt__', '"' => '__dquot__'));

         $newstring = dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom); // Make entity encoding

         $newstring = strtr($newstring, array('__and__' => '&', '__lt__' => '<', '__gt__' => '>', '__dquot__' => '"'));

-    }

-    else {

-        if ($removelasteolbr)

-            $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring); // Remove last \n (may remove several)

+    } else {

+        if ($removelasteolbr) {
+                    $newstring = preg_replace('/(\r\n|\r|\n)$/i', '', $newstring);
+        }
+        // Remove last \n (may remove several)

         $newstring = dol_nl2br(dol_htmlentities($newstring, ENT_COMPAT, $pagecodefrom), $nl2brmode);

     }

     // Other substitutions that htmlentities does not do

@@ -5501,8 +5781,9 @@ 
  */

 function dol_nboflines($s, $maxchar = 0)

 {

-    if ($s == '')

-        return 0;

+    if ($s == '') {
+            return 0;
+    }
     $arraystring = explode("\n", $s);

     $nb = count($arraystring);

 

@@ -5521,15 +5802,18 @@ 
 function dol_nboflines_bis($text, $maxlinesize = 0, $charset = 'UTF-8')

 {

     $repTable = array("\t" => " ", "\n" => "<br>", "\r" => " ", "\0" => " ", "\x0B" => " ");

-    if (dol_textishtml($text))

-        $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");

+    if (dol_textishtml($text)) {
+            $repTable = array("\t" => " ", "\n" => " ", "\r" => " ", "\0" => " ", "\x0B" => " ");
+    }
 

     $text = strtr($text, $repTable);

     if ($charset == 'UTF-8') {

         $pattern = '/(<br[^>]*>)/Uu';

     } // /U is to have UNGREEDY regex to limit to one html tag. /u is for UTF8 support

-    else

-        $pattern = '/(<br[^>]*>)/U';       // /U is to have UNGREEDY regex to limit to one html tag.

+    else {
+            $pattern = '/(<br[^>]*>)/U';
+    }
+    // /U is to have UNGREEDY regex to limit to one html tag.

     $a = preg_split($pattern, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);

 

     $nblines = (int) floor((count($a) + 1) / 2);

@@ -5576,39 +5860,47 @@ 
 function dol_textishtml($msg, $option = 0)

 {

     if ($option == 1) {

-        if (preg_match('/<html/i', $msg))

-            return true;

-        elseif (preg_match('/<body/i', $msg))

-            return true;

-        elseif (preg_match('/<br/i', $msg))

-            return true;

+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br/i', $msg)) {
+                    return true;
+        }
         return false;

-    }

-    else {

-        if (preg_match('/<html/i', $msg))

-            return true;

-        elseif (preg_match('/<body/i', $msg))

-            return true;

-        elseif (preg_match('/<(b|em|i|u)>/i', $msg))

-            return true;

-        elseif (preg_match('/<br\/>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg))

-            return true;

-        elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg))

-            return true;

-        elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg))

-            return true; // must accept <img src="http://example.com/aaa.png" />

-        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg))

-            return true; // must accept <a href="http://example.com/aaa.png" />

-        elseif (preg_match('/<h[0-9]>/i', $msg))

-            return true;

-        elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg))

-            return true;    // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

-        elseif (preg_match('/&#[0-9]{2,3};/i', $msg))

-            return true;    // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

+    } else {

+        if (preg_match('/<html/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<body/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(b|em|i|u)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<br\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<(br|div|font|li|p|span|strong|table)\s+[^<>\/]*\/>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/<img\s+[^<>]*src[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <img src="http://example.com/aaa.png" />

+        elseif (preg_match('/<a\s+[^<>]*href[^<>]*>/i', $msg)) {
+                    return true;
+        }
+        // must accept <a href="http://example.com/aaa.png" />

+        elseif (preg_match('/<h[0-9]>/i', $msg)) {
+                    return true;
+        } elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+                    return true;
+        }
+        // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)

+        elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
+                    return true;
+        }
+        // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)

 

         return false;

     }

@@ -5760,12 +6052,14 @@ 
             $birthday = dol_print_date($object->birth, 'day');

 

             $substitutionarray['__MEMBER_ID__'] = $object->id;

-            if (method_exists($object, 'getCivilityLabel'))

-                $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();

+            if (method_exists($object, 'getCivilityLabel')) {
+                            $substitutionarray['__MEMBER_CIVILITY__'] = $object->getCivilityLabel();
+            }
             $substitutionarray['__MEMBER_FIRSTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->firstname) : $object->firstname;

             $substitutionarray['__MEMBER_LASTNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->lastname) : $object->lastname;

-            if (method_exists($object, 'getFullName'))

-                $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);

+            if (method_exists($object, 'getFullName')) {
+                            $substitutionarray['__MEMBER_FULLNAME__'] = $msgishtml ? dol_htmlentitiesbr($object->getFullName($outputlangs)) : $object->getFullName($outputlangs);
+            }
             $substitutionarray['__MEMBER_COMPANY__'] = $msgishtml ? dol_htmlentitiesbr($object->societe) : $object->societe;

             $substitutionarray['__MEMBER_ADDRESS__'] = $msgishtml ? dol_htmlentitiesbr($object->address) : $object->address;

             $substitutionarray['__MEMBER_ZIP__'] = $msgishtml ? dol_htmlentitiesbr($object->zip) : $object->zip;

@@ -5813,10 +6107,12 @@ 
                 $dateplannedstart = '';

                 $datenextexpiration = '';

                 foreach ($object->lines as $line) {

-                    if ($line->date_ouverture_prevue > $dateplannedstart)

-                        $dateplannedstart = $line->date_ouverture_prevue;

-                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration))

-                        $datenextexpiration = $line->date_fin_prevue;

+                    if ($line->date_ouverture_prevue > $dateplannedstart) {
+                                            $dateplannedstart = $line->date_ouverture_prevue;
+                    }
+                    if ($line->statut == 4 && $line->date_fin_prevue && (!$datenextexpiration || $line->date_fin_prevue < $datenextexpiration)) {
+                                            $datenextexpiration = $line->date_fin_prevue;
+                    }
                 }

                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATE__'] = dol_print_date($dateplannedstart, 'dayrfc');

                 $substitutionarray['__CONTRACT_HIGHEST_PLANNED_START_DATETIME__'] = dol_print_date($dateplannedstart, 'standard');

@@ -5826,8 +6122,9 @@ 
 

             // Create dynamic tags for __EXTRAFIELD_FIELD__

             if ($object->table_element && $object->id > 0) {

-                if (!is_object($extrafields))

-                    $extrafields = new ExtraFields($db);

+                if (!is_object($extrafields)) {
+                                    $extrafields = new ExtraFields($db);
+                }
                 $extrafields->fetch_name_optionals_label($object->table_element, true);

 

                 if ($object->fetch_optionals() > 0) {

@@ -5848,12 +6145,15 @@ 
                 require_once DOL_BASE_PATH . '/core/lib/payments.lib.php';

                 $outputlangs->loadLangs(array('paypal', 'other'));

                 $typeforonlinepayment = 'free';

-                if (is_object($object) && $object->element == 'commande')

-                    $typeforonlinepayment = 'order';

-                if (is_object($object) && $object->element == 'facture')

-                    $typeforonlinepayment = 'invoice';

-                if (is_object($object) && $object->element == 'member')

-                    $typeforonlinepayment = 'member';

+                if (is_object($object) && $object->element == 'commande') {
+                                    $typeforonlinepayment = 'order';
+                }
+                if (is_object($object) && $object->element == 'facture') {
+                                    $typeforonlinepayment = 'invoice';
+                }
+                if (is_object($object) && $object->element == 'member') {
+                                    $typeforonlinepayment = 'member';
+                }
                 $url = getOnlinePaymentUrl(0, $typeforonlinepayment, $substitutionarray['__REF__']);

                 $paymenturl = $url;

             }

@@ -5863,16 +6163,19 @@ 
 

             if (!empty($conf->global->PROPOSAL_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'propal') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_PROPOSAL__'] = '';
+            }
             if (!empty($conf->global->ORDER_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'commande') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_ORDER__'] = '';
+            }
             if (!empty($conf->global->INVOICE_ALLOW_EXTERNAL_DOWNLOAD) && is_object($object) && $object->element == 'facture') {

                 $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = $object->getLastMainDocLink($object->element);

-            } else

-                $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';

+            } else {
+                            $substitutionarray['__DIRECTDOWNLOAD_URL_INVOICE__'] = '';
+            }
         }

     }

     if (empty($exclude) || !in_array('objectamount', $exclude)) {

@@ -5882,18 +6185,22 @@ 
         $substitutionarray['__AMOUNT__'] = is_object($object) ? $object->total_ttc : '';

         $substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';

         $substitutionarray['__AMOUNT_VAT__'] = is_object($object) ? ($object->total_vat ? $object->total_vat : $object->total_tva) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2__'] = is_object($object) ? $object->total_localtax1 : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3__'] = is_object($object) ? $object->total_localtax2 : '';
+        }
 

         $substitutionarray['__AMOUNT_FORMATED__'] = is_object($object) ? price($object->total_ttc, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? price($object->total_ht, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

         $substitutionarray['__AMOUNT_VAT_FORMATED__'] = is_object($object) ? ($object->total_vat ? price($object->total_vat, 0, $outputlangs, 0, 0, -1, $conf->currency) : price($object->total_tva, 0, $outputlangs, 0, 0, -1, $conf->currency)) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(1))

-            $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

-        if ($onlykey != 2 || $mysoc->useLocalTax(2))

-            $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';

+        if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
+                    $substitutionarray['__AMOUNT_TAX2_FORMATED__'] = is_object($object) ? price($object->total_localtax1, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
+        if ($onlykey != 2 || $mysoc->useLocalTax(2)) {
+                    $substitutionarray['__AMOUNT_TAX3_FORMATED__'] = is_object($object) ? price($object->total_localtax2, 0, $outputlangs, 0, 0, -1, $conf->currency) : '';
+        }
 

         // TODO Add keys for foreign multicurrency

         // For backward compatibility

@@ -5963,23 +6270,27 @@ 
 {

     global $conf, $langs;

 

-    if (!is_array($substitutionarray))

-        return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';

+    if (!is_array($substitutionarray)) {
+            return 'ErrorBadParameterSubstitutionArrayWhenCalling_make_substitutions';
+    }
 

-    if (empty($outputlangs))

-        $outputlangs = $langs;

+    if (empty($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     // Make substitution for language keys

     if (is_object($outputlangs)) {

         while (preg_match('/__\(([^\)]+)\)__/', $text, $reg)) {

             $msgishtml = 0;

-            if (dol_textishtml($text, 1))

-                $msgishtml = 1;

+            if (dol_textishtml($text, 1)) {
+                            $msgishtml = 1;
+            }
 

             // If key is __(TranslationKey|langfile)__, then force load of langfile.lang

             $tmp = explode('|', $reg[1]);

-            if (!empty($tmp[1]))

-                $outputlangs->load($tmp[1]);

+            if (!empty($tmp[1])) {
+                            $outputlangs->load($tmp[1]);
+            }
 

             $text = preg_replace('/__\(' . preg_quote($reg[1], '/') . '\)__/', $msgishtml ? dol_htmlentitiesbr($outputlangs->transnoentitiesnoconv($reg[1])) : $outputlangs->transnoentitiesnoconv($reg[1]), $text);

         }

@@ -5989,23 +6300,29 @@ 
     // it is also converted.

     while (preg_match('/__\[([^\]]+)\]__/', $text, $reg)) {

         $msgishtml = 0;

-        if (dol_textishtml($text, 1))

-            $msgishtml = 1;

+        if (dol_textishtml($text, 1)) {
+                    $msgishtml = 1;
+        }
 

         $keyfound = $reg[1];

-        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound))

-            $newval = '*****forbidden*****';

-        else

-            $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;

+        if (preg_match('/(_pass|password|secret|_key|key$)/i', $keyfound)) {
+                    $newval = '*****forbidden*****';
+        } else {
+                    $newval = empty($conf->global->$keyfound) ? '' : $conf->global->$keyfound;
+        }
         $text = preg_replace('/__\[' . preg_quote($keyfound, '/') . '\]__/', $msgishtml ? dol_htmlentitiesbr($newval) : $newval, $text);

     }

 

     // Make substitition for array $substitutionarray

     foreach ($substitutionarray as $key => $value) {

-        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = '';  // Protection

-        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)))

-            $value = ''; // Protection

+        if ($key == '__SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection

+        if ($key == '__USER_SIGNATURE__' && (!empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN))) {
+                    $value = '';
+        }
+        // Protection

 

         $text = str_replace("$key", "$value", $text); // We must keep the " to work when value is 123.5 for example

     }

@@ -6051,8 +6368,9 @@ 
         $dir = dol_buildpath($reldir, 0);

 

         // Check if directory exists

-        if (!dol_is_dir($dir))

-            continue;

+        if (!dol_is_dir($dir)) {
+                    continue;
+        }
 

         $substitfiles = dol_dir_list($dir, 'files', 0, 'functions_');

         foreach ($substitfiles as $substitfile) {

@@ -6064,8 +6382,9 @@ 
                 require_once $dir . $substitfile['name'];

                 // Call the user's function, and only if it is defined

                 $function_name = $module . "_" . $callfunc;

-                if (function_exists($function_name))

-                    $function_name($substitutionarray, $outputlangs, $object, $parameters);

+                if (function_exists($function_name)) {
+                                    $function_name($substitutionarray, $outputlangs, $object, $parameters);
+                }
             }

         }

     }

@@ -6101,8 +6420,9 @@ 
 

     $out = '';

 

-    if (!is_object($outputlangs))

-        $outputlangs = $langs;

+    if (!is_object($outputlangs)) {
+            $outputlangs = $langs;
+    }
 

     if ($date_start && $date_end) {

         $out .= ($withparenthesis ? ' (' : '') . $outputlangs->transnoentitiesnoconv('DateFromTo', dol_print_date($date_start, $format, false, $outputlangs), dol_print_date($date_end, $format, false, $outputlangs)) . ($withparenthesis ? ')' : '');

@@ -6131,20 +6451,22 @@ 
 

     $ret = '';

     // If order not defined, we use the setup

-    if ($nameorder < 0)

-        $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);

+    if ($nameorder < 0) {
+            $nameorder = (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? 1 : 0);
+    }
     if ($nameorder && ((string) $nameorder != '2')) {

         $ret .= $firstname;

-        if ($firstname && $lastname)

-            $ret .= ' ';

+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $lastname;

-    }

-    else if ($nameorder == 2) {

+    } else if ($nameorder == 2) {

         $ret .= $firstname;

     } else {

         $ret .= $lastname;

-        if ($firstname && $lastname)

-            $ret .= ' ';

+        if ($firstname && $lastname) {
+                    $ret .= ' ';
+        }
         $ret .= $firstname;

     }

     return $ret;

@@ -6164,13 +6486,14 @@ 
 {

     //dol_syslog(__FUNCTION__ . " is deprecated", LOG_WARNING);		This is not deprecated, it is used by setEventMessages function

     if (!is_array($mesgs)) {  // If mesgs is a string

-        if ($mesgs)

-            $_SESSION['dol_events'][$style][] = $mesgs;

-    }

-    else {      // If mesgs is an array

+        if ($mesgs) {
+                    $_SESSION['dol_events'][$style][] = $mesgs;
+        }
+    } else {      // If mesgs is an array

         foreach ($mesgs as $mesg) {

-            if ($mesg)

-                $_SESSION['dol_events'][$style][] = $mesg;

+            if ($mesg) {
+                            $_SESSION['dol_events'][$style][] = $mesg;
+            }
         }

     }

 }

@@ -6190,13 +6513,16 @@ 
     if (empty($mesg) && empty($mesgs)) {

         dol_syslog("Try to add a message in stack with empty message", LOG_WARNING);

     } else {

-        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors')))

-            dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');

-        if (empty($mesgs))

-            setEventMessage($mesg, $style);

-        else {

-            if (!empty($mesg) && !in_array($mesg, $mesgs))

-                setEventMessage($mesg, $style); // Add message string if not already into array

+        if (!in_array((string) $style, array('mesgs', 'warnings', 'errors'))) {
+                    dol_print_error('', 'Bad parameter style=' . $style . ' for setEventMessages');
+        }
+        if (empty($mesgs)) {
+                    setEventMessage($mesg, $style);
+        } else {

+            if (!empty($mesg) && !in_array($mesg, $mesgs)) {
+                            setEventMessage($mesg, $style);
+            }
+            // Add message string if not already into array

             setEventMessage($mesgs, $style);

         }

     }

@@ -6215,22 +6541,25 @@ 
 {

     // Show mesgs

     if (isset($_SESSION['dol_events']['mesgs'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['mesgs']);
+        }
         unset($_SESSION['dol_events']['mesgs']);

     }

 

     // Show errors

     if (isset($_SESSION['dol_events']['errors'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['errors'], 'error');
+        }
         unset($_SESSION['dol_events']['errors']);

     }

 

     // Show warnings

     if (isset($_SESSION['dol_events']['warnings'])) {

-        if (empty($disabledoutputofmessages))

-            dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');

+        if (empty($disabledoutputofmessages)) {
+                    dol_htmloutput_mesg('', $_SESSION['dol_events']['warnings'], 'warning');
+        }
         unset($_SESSION['dol_events']['warnings']);

     }

 }

@@ -6271,8 +6600,9 @@ 
             foreach ($mesgarray as $message) {

                 $ret++;

                 $out .= $langs->trans($message);

-                if ($ret < count($mesgarray))

-                    $out .= "<br>\n";

+                if ($ret < count($mesgarray)) {
+                                    $out .= "<br>\n";
+                }
             }

         }

         if ($mesgstring) {

@@ -6338,8 +6668,9 @@ 
  */

 function dol_htmloutput_mesg($mesgstring = '', $mesgarray = array(), $style = 'ok', $keepembedded = 0)

 {

-    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0))

-        return;

+    if (empty($mesgstring) && (!is_array($mesgarray) || count($mesgarray) == 0)) {
+            return;
+    }
 

     $iserror = 0;

     $iswarning = 0;

@@ -6354,14 +6685,17 @@ 
                 break;

             }

         }

-    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring))

-        $iserror++;

-    else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring))

-        $iswarning++;

-    if ($style == 'error')

-        $iserror++;

-    if ($style == 'warning')

-        $iswarning++;

+    } else if ($mesgstring && preg_match('/class="error"/i', $mesgstring)) {
+            $iserror++;
+    } else if ($mesgstring && preg_match('/class="warning"/i', $mesgstring)) {
+            $iswarning++;
+    }
+    if ($style == 'error') {
+            $iserror++;
+    }
+    if ($style == 'warning') {
+            $iswarning++;
+    }
 

     if ($iserror || $iswarning) {

         // Remove div from texts

@@ -6380,9 +6714,10 @@ 
             $mesgarray = $newmesgarray;

         }

         print get_htmloutput_mesg($mesgstring, $mesgarray, ($iserror ? 'error' : 'warning'), $keepembedded);

-    } else

-        print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);

-}

+    } else {
+            print get_htmloutput_mesg($mesgstring, $mesgarray, 'ok', $keepembedded);
+    }
+    }

 

 /**

  *  Print formated error messages to output (Used to show messages on html output).

@@ -6422,15 +6757,17 @@ 
         $sizearray = count($array);

         if ($sizearray > 0) {

             $temp = array();

-            foreach (array_keys($array) as $key)

-                $temp[$key] = $array[$key][$index];

+            foreach (array_keys($array) as $key) {
+                            $temp[$key] = $array[$key][$index];
+            }
 

-            if (!$natsort)

-                ($order == 'asc') ? asort($temp) : arsort($temp);

-            else {

+            if (!$natsort) {
+                            ($order == 'asc') ? asort($temp) : arsort($temp);
+            } else {

                 ($case_sensitive) ? natsort($temp) : natcasesort($temp);

-                if ($order != 'asc')

-                    $temp = array_reverse($temp, true);

+                if ($order != 'asc') {
+                                    $temp = array_reverse($temp, true);
+                }
             }

 

             $sorted = array();

@@ -6456,23 +6793,38 @@ 
     // We must use here a binary strlen function (so not dol_strlen)

     $strLength = dol_strlen($str);

     for ($i = 0; $i < $strLength; $i++) {

-        if (ord($str[$i]) < 0x80)

-            continue; // 0bbbbbbb

-        elseif ((ord($str[$i]) & 0xE0) == 0xC0)

-            $n = 1; // 110bbbbb

-        elseif ((ord($str[$i]) & 0xF0) == 0xE0)

-            $n = 2; // 1110bbbb

-        elseif ((ord($str[$i]) & 0xF8) == 0xF0)

-            $n = 3; // 11110bbb

-        elseif ((ord($str[$i]) & 0xFC) == 0xF8)

-            $n = 4; // 111110bb

-        elseif ((ord($str[$i]) & 0xFE) == 0xFC)

-            $n = 5; // 1111110b

-        else

-            return false; // Does not match any model

+        if (ord($str[$i]) < 0x80) {
+                    continue;
+        }
+        // 0bbbbbbb

+        elseif ((ord($str[$i]) & 0xE0) == 0xC0) {
+                    $n = 1;
+        }
+        // 110bbbbb

+        elseif ((ord($str[$i]) & 0xF0) == 0xE0) {
+                    $n = 2;
+        }
+        // 1110bbbb

+        elseif ((ord($str[$i]) & 0xF8) == 0xF0) {
+                    $n = 3;
+        }
+        // 11110bbb

+        elseif ((ord($str[$i]) & 0xFC) == 0xF8) {
+                    $n = 4;
+        }
+        // 111110bb

+        elseif ((ord($str[$i]) & 0xFE) == 0xFC) {
+                    $n = 5;
+        }
+        // 1111110b

+        else {
+                    return false;
+        }
+        // Does not match any model

         for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?

-            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80))

-                return false;

+            if (( ++$i == strlen($str)) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+                            return false;
+            }
         }

     }

     return true;

@@ -6490,15 +6842,21 @@ 
     global $conf;

 

     $tmp = ini_get("unicode.filesystem_encoding");      // Disponible avec PHP 6.0

-    if (empty($tmp) && !empty($_SERVER["WINDIR"]))

-        $tmp = 'iso-8859-1'; // By default for windows

-    if (empty($tmp))

-        $tmp = 'utf-8';          // By default for other

-    if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING))

-        $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;

-

-    if ($tmp == 'iso-8859-1')

-        return utf8_decode($str);

+    if (empty($tmp) && !empty($_SERVER["WINDIR"])) {
+            $tmp = 'iso-8859-1';
+    }
+    // By default for windows

+    if (empty($tmp)) {
+            $tmp = 'utf-8';
+    }
+    // By default for other

+    if (!empty($conf->global->MAIN_FILESYSTEM_ENCODING)) {
+            $tmp = $conf->global->MAIN_FILESYSTEM_ENCODING;
+    }
+

+    if ($tmp == 'iso-8859-1') {
+            return utf8_decode($str);
+    }
     return $str;

 }

 

@@ -6520,8 +6878,9 @@ 
     global $cache_codes;

 

     // If key empty

-    if ($key == '')

-        return '';

+    if ($key == '') {
+            return '';
+    }
 

     // Check in cache

     if (isset($cache_codes[$tablename][$key][$fieldid])) { // Can be defined to 0 or ''

@@ -6533,20 +6892,21 @@ 
     $sql = "SELECT " . $fieldid . " as valuetoget";

     $sql .= " FROM " . MAIN_DB_PREFIX . $tablename;

     $sql .= " WHERE " . $fieldkey . " = '" . $db->escape($key) . "'";

-    if (!empty($entityfilter))

-        $sql .= " AND entity IN (" . getEntity($tablename) . ")";

+    if (!empty($entityfilter)) {
+            $sql .= " AND entity IN (" . getEntity($tablename) . ")";
+    }
 

     $resql = $db->query($sql);

     if ($resql) {

         $obj = $db->fetch_object($resql);

-        if ($obj)

-            $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;

-        else

-            $cache_codes[$tablename][$key][$fieldid] = '';

+        if ($obj) {
+                    $cache_codes[$tablename][$key][$fieldid] = $obj->valuetoget;
+        } else {
+                    $cache_codes[$tablename][$key][$fieldid] = '';
+        }
         $db->free($resql);

         return $cache_codes[$tablename][$key][$fieldid];

-    }

-    else {

+    } else {

         return -1;

     }

 }

@@ -6593,16 +6953,17 @@ 
     global $soc;       // For backward compatibility

     //print $s."<br>\n";

     if ($returnvalue) {

-        if ($hideerrors)

-            return @eval('return ' . $s . ';');

-        else

-            return eval('return ' . $s . ';');

-    }

-    else {

-        if ($hideerrors)

-            @eval($s);

-        else

-            eval($s);

+        if ($hideerrors) {
+                    return @eval('return ' . $s . ';');
+        } else {
+                    return eval('return ' . $s . ';');
+        }
+    } else {

+        if ($hideerrors) {
+                    @eval($s);
+        } else {
+                    eval($s);
+        }
     }

 }

 

@@ -6628,8 +6989,9 @@ 
 {

     global $langs;

 

-    if (empty($codelang))

-        return '';

+    if (empty($codelang)) {
+            return '';
+    }
 

     if ($codelang == 'auto') {

         return '<span class="fa fa-globe"></span>';

@@ -6643,9 +7005,9 @@ 
         'sv_SV' => 'se'

     );

 

-    if (isset($langtocountryflag[$codelang]))

-        $flagImage = $langtocountryflag[$codelang];

-    else {

+    if (isset($langtocountryflag[$codelang])) {
+            $flagImage = $langtocountryflag[$codelang];
+    } else {

         $tmparray = explode('_', $codelang);

         $flagImage = empty($tmparray[1]) ? $tmparray[0] : $tmparray[1];

     }

@@ -6663,15 +7025,20 @@ 
 {

     global $mysoc;

 

-    if (strtoupper($countrycode) == 'MQ')

-        return 'fr_CA';

-    if (strtoupper($countrycode) == 'SE')

-        return 'sv_SE'; // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

+    if (strtoupper($countrycode) == 'MQ') {
+            return 'fr_CA';
+    }
+    if (strtoupper($countrycode) == 'SE') {
+            return 'sv_SE';
+    }
+    // se_SE is Sami/Sweden, and we want in priority sv_SE for SE country

     if (strtoupper($countrycode) == 'CH') {

-        if ($mysoc->country_code == 'FR')

-            return 'fr_CH';

-        if ($mysoc->country_code == 'DE')

-            return 'de_CH';

+        if ($mysoc->country_code == 'FR') {
+                    return 'fr_CH';
+        }
+        if ($mysoc->country_code == 'DE') {
+                    return 'de_CH';
+        }
     }

 

     // Locale list taken from:

@@ -6849,8 +7216,9 @@ 
     );

 

     $buildprimarykeytotest = strtolower($countrycode) . '-' . strtoupper($countrycode);

-    if (in_array($buildprimarykeytotest, $locales))

-        return strtolower($countrycode) . '_' . strtoupper($countrycode);

+    if (in_array($buildprimarykeytotest, $locales)) {
+            return strtolower($countrycode) . '_' . strtoupper($countrycode);
+    }
 

     foreach ($locales as $locale) {

         $locale_language = locale_get_primary_language($locale);

@@ -6904,18 +7272,21 @@ 
 

             if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {

                 if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'

-                    if ($values[0] != $type)

-                        continue;

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
 

                     if (verifCond($values[4])) {

-                        if ($values[3])

-                            $langs->load($values[3]);

+                        if ($values[3]) {
+                                                    $langs->load($values[3]);
+                        }
                         if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                             $substitutionarray = array();

                             complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                             $label = make_substitutions($reg[1], $substitutionarray);

-                        } else

-                            $label = $langs->trans($values[2]);

+                        } else {
+                                                    $label = $langs->trans($values[2]);
+                        }
 

                         //$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);

                         $head[$h][0] = BASE_URI . preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]);

@@ -6923,30 +7294,32 @@ 
                         $head[$h][2] = str_replace('+', '', $values[1]);

                         $h++;

                     }

-                }

-                else if (count($values) == 5) {       // deprecated

+                } else if (count($values) == 5) {       // deprecated

                     dol_syslog('Passing 5 values in tabs module_parts is deprecated. Please update to 6 with permissions.', LOG_WARNING);

 

-                    if ($values[0] != $type)

-                        continue;

-                    if ($values[3])

-                        $langs->load($values[3]);

+                    if ($values[0] != $type) {
+                                            continue;
+                    }
+                    if ($values[3]) {
+                                            $langs->load($values[3]);
+                    }
                     if (preg_match('/SUBSTITUTION_([^_]+)/i', $values[2], $reg)) {

                         $substitutionarray = array();

                         complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey' => $values[2]));

                         $label = make_substitutions($reg[1], $substitutionarray);

-                    } else

-                        $label = $langs->trans($values[2]);

+                    } else {
+                                            $label = $langs->trans($values[2]);
+                    }
 

                     $head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[4]), 1);

                     $head[$h][1] = $label;

                     $head[$h][2] = str_replace('+', '', $values[1]);

                     $h++;

                 }

-            }

-            else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

-                if ($values[0] != $type)

-                    continue;

+            } else if ($mode == 'remove' && preg_match('/^\-/', $values[1])) {

+                if ($values[0] != $type) {
+                                    continue;
+                }
                 $tabname = str_replace('-', '', $values[1]);

                 foreach ($head as $key => $val) {

                     $condition = (!empty($values[3]) ? verifCond($values[3]) : 1);

@@ -6988,10 +7361,11 @@ 
     global $action;

     global $micro_start_time;

 

-    if ($zone == 'private')

-        print "\n" . '<!-- Common footer for private page -->' . "\n";

-    else

-        print "\n" . '<!-- Common footer for public page -->' . "\n";

+    if ($zone == 'private') {
+            print "\n" . '<!-- Common footer for private page -->' . "\n";
+    } else {
+            print "\n" . '<!-- Common footer for public page -->' . "\n";
+    }
 

     // A div to store page_y POST parameter so we can read it using javascript

     print "\n<!-- A div to store page_y POST paramater -->\n";

@@ -7000,8 +7374,9 @@ 
     $parameters = array();

     $reshook = $hookmanager->executeHooks('printCommonFooter', $parameters);    // Note that $action and $object may have been modified by some hooks

     if (empty($reshook)) {

-        if (!empty($conf->global->MAIN_HTML_FOOTER))

-            print $conf->global->MAIN_HTML_FOOTER . "\n";

+        if (!empty($conf->global->MAIN_HTML_FOOTER)) {
+                    print $conf->global->MAIN_HTML_FOOTER . "\n";
+        }
 

         print "\n";

         if (!empty($conf->use_javascript_ajax)) {

@@ -7024,8 +7399,9 @@ 
                 print '/* JS CODE TO ENABLE to manage focus and mandatory form fields */' . "\n";

                 $relativepathstring = $_SERVER["PHP_SELF"];

                 // Clean $relativepathstring

-                if (constant('DOL_URL_ROOT'))

-                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);

+                if (constant('DOL_URL_ROOT')) {
+                                    $relativepathstring = preg_replace('/^' . preg_quote(constant('DOL_URL_ROOT'), '/') . '/', '', $relativepathstring);
+                }
                 $relativepathstring = preg_replace('/^\//', '', $relativepathstring);

                 $relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);

                 $tmpqueryarraywehave = explode('&', dol_string_nohtmltag($_SERVER['QUERY_STRING']));

@@ -7036,14 +7412,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $foundintru = 0;

                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                    $foundintru = 1;

+                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                    $foundintru = 1;
+                                }
                             }

-                            if (!$foundintru)

-                                $qualified = 1;

+                            if (!$foundintru) {
+                                                            $qualified = 1;
+                            }
                             //var_dump($defkey.'-'.$qualified);

-                        } else

-                            $qualified = 1;

+                        } else {
+                                                    $qualified = 1;
+                        }
 

                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7062,14 +7441,17 @@ 
                             $tmpqueryarraytohave = explode('&', $defkey);

                             $foundintru = 0;

                             foreach ($tmpqueryarraytohave as $tmpquerytohave) {

-                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave))

-                                    $foundintru = 1;

+                                if (!in_array($tmpquerytohave, $tmpqueryarraywehave)) {
+                                                                    $foundintru = 1;
+                                }
                             }

-                            if (!$foundintru)

-                                $qualified = 1;

+                            if (!$foundintru) {
+                                                            $qualified = 1;
+                            }
                             //var_dump($defkey.'-'.$qualified);

-                        } else

-                            $qualified = 1;

+                        } else {
+                                                    $qualified = 1;
+                        }
 

                         if ($qualified) {

                             foreach ($defval as $paramkey => $paramval) {

@@ -7108,8 +7490,9 @@ 
                 print "\n";

                 print "/* JS CODE TO ENABLE to add memory info */\n";

                 print 'window.console && console.log("';

-                if (!empty($conf->global->MEMCACHED_SERVER))

-                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';

+                if (!empty($conf->global->MEMCACHED_SERVER)) {
+                                    print 'MEMCACHED_SERVER=' . $conf->global->MEMCACHED_SERVER . ' - ';
+                }
                 print 'MAIN_OPTIMIZE_SPEED=' . (isset($conf->global->MAIN_OPTIMIZE_SPEED) ? $conf->global->MAIN_OPTIMIZE_SPEED : 'off');

                 if (!empty($micro_start_time)) {   // Works only if MAIN_SHOW_TUNING_INFO is defined at $_SERVER level. Not in global variable.

                     $micro_end_time = microtime(true);

@@ -7239,8 +7622,9 @@ 
 

     $crits = explode(' ', $value);

     $res = '';

-    if (!is_array($fields))

-        $fields = array($fields);

+    if (!is_array($fields)) {
+            $fields = array($fields);
+    }
 

     $nboffields = count($fields);

     $end2 = count($crits);

@@ -7303,8 +7687,9 @@ 
                 $tmpcrits = explode('|', $crit);

                 $i3 = 0;

                 foreach ($tmpcrits as $tmpcrit) {

-                    if (empty($tmpcrit))

-                        continue;

+                    if (empty($tmpcrit)) {
+                                            continue;
+                    }
 

                     $newres .= (($i2 > 0 || $i3 > 0) ? ' OR ' : '');

 

@@ -7340,8 +7725,9 @@ 
             }

             $i++;

         }

-        if ($newres)

-            $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');

+        if ($newres) {
+                    $res = $res . ($res ? ' AND ' : '') . ($i2 > 1 ? '(' : '') . $newres . ($i2 > 1 ? ')' : '');
+        }
         $j++;

     }

     $res = ($nofirstand ? "" : " AND ") . "(" . $res . ")";

@@ -7381,29 +7767,37 @@ 
 function getImageFileNameForSize($file, $extName, $extImgTarget = '')

 {

     $dirName = dirname($file);

-    if ($dirName == '.')

-        $dirName = '';

+    if ($dirName == '.') {
+            $dirName = '';
+    }
 

     $fileName = preg_replace('/(\.gif|\.jpeg|\.jpg|\.png|\.bmp)$/i', '', $file); // We remove extension, whatever is its case

     $fileName = basename($fileName);

 

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');

-    if (empty($extImgTarget))

-        $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');

-

-    if (!$extImgTarget)

-        return $file;

+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpg$/i', $file) ? '.jpg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.jpeg$/i', $file) ? '.jpeg' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.gif$/i', $file) ? '.gif' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.png$/i', $file) ? '.png' : '');
+    }
+    if (empty($extImgTarget)) {
+            $extImgTarget = (preg_match('/\.bmp$/i', $file) ? '.bmp' : '');
+    }
+

+    if (!$extImgTarget) {
+            return $file;
+    }
 

     $subdir = '';

-    if ($extName)

-        $subdir = 'thumbs/';

+    if ($extName) {
+            $subdir = 'thumbs/';
+    }
 

     return ($dirName ? $dirName . '/' : '') . $subdir . $fileName . $extName . $extImgTarget; // New filename for thumb

 }

@@ -7421,8 +7815,9 @@ 
 {

     global $conf, $langs;

 

-    if (empty($conf->use_javascript_ajax))

-        return '';

+    if (empty($conf->use_javascript_ajax)) {
+            return '';
+    }
 

     $mime_preview = array('bmp', 'jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css', 'svg+xml');

     //$mime_preview[]='vnd.oasis.opendocument.presentation';

@@ -7430,18 +7825,20 @@ 
     $num_mime = array_search(dol_mimetype($relativepath, '', 1), $mime_preview);

 

     if ($alldata == 1) {

-        if ($num_mime !== false)

-            return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);

-        else

-            return array();

+        if ($num_mime !== false) {
+                    return array('target' => '_blank', 'css' => 'documentpreview', 'url' => DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : ''), 'mime' => dol_mimetype($relativepath),);
+        } else {
+                    return array();
+        }
     }

 

     // old behavior

-    if ($num_mime !== false)

-        return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';

-    else

-        return '';

-}

+    if ($num_mime !== false) {
+            return 'javascript:document_preview(\'' . dol_escape_js(DOL_URL_ROOT . '/document.php?modulepart=' . $modulepart . '&attachment=0&file=' . urlencode($relativepath) . ($param ? '&' . $param : '')) . '\', \'' . dol_mimetype($relativepath) . '\', \'' . dol_escape_js($langs->trans('Preview')) . '\')';
+    } else {
+            return '';
+    }
+    }

 

 /**

  * Make content of an input box selected when we click into input field.

@@ -7458,8 +7855,9 @@ 
 				    jQuery("#' . $htmlname . '").click(function() { jQuery(this).select(); } );

 				});

 		    </script>';

-    if ($addlink)

-        $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';

+    if ($addlink) {
+            $out .= ' <a href="' . $addlink . '" target="_blank">' . $langs->trans("Link") . '</a>';
+    }
     return $out;

 }

 

@@ -7841,8 +8239,9 @@ 
     if (!isset($dictvalues[$tablename])) {

         $dictvalues[$tablename] = array();

         $sql = 'SELECT * FROM ' . $tablename . ' WHERE 1';

-        if ($checkentity)

-            $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';

+        if ($checkentity) {
+                    $sql .= ' AND entity IN (0,' . getEntity($tablename) . ')';
+        }
 

         $resql = $db->query($sql);

         if ($resql) {

@@ -7854,11 +8253,14 @@ 
         }

     }

 

-    if (!empty($dictvalues[$tablename][$id]))

-        return $dictvalues[$tablename][$id]->{$field}; // Found

+    if (!empty($dictvalues[$tablename][$id])) {
+            return $dictvalues[$tablename][$id]->{$field};
+    }
+    // Found

     else { // Not found

-        if ($id > 0)

-            return $id;

+        if ($id > 0) {
+                    return $id;
+        }
         return '';

     }

 }

@@ -7888,8 +8290,9 @@ 
             $b = hexdec($hexb);

         }

         $bright = (max($r, $g, $b) + min($r, $g, $b)) / 510.0;    // HSL algorithm

-        if ($bright > 0.6)

-            $res = 1;

+        if ($bright > 0.6) {
+                    $res = 1;
+        }
     }

     return $res;

 }

@@ -7908,8 +8311,10 @@ 
 

     //print 'type_user='.$type_user.' module='.$menuentry['module'].' enabled='.$menuentry['enabled'].' perms='.$menuentry['perms'];

     //print 'ok='.in_array($menuentry['module'], $listofmodulesforexternal);

-    if (empty($menuentry['enabled']))

-        return 0; // Entry disabled by condition

+    if (empty($menuentry['enabled'])) {
+            return 0;
+    }
+    // Entry disabled by condition

     if ($type_user && $menuentry['module']) {

         $tmploops = explode('|', $menuentry['module']);

         $found = 0;

@@ -7919,15 +8324,23 @@ 
                 break;

             }

         }

-        if (!$found)

-            return 0; // Entry is for menus all excluded to external users

-    }

-    if (!$menuentry['perms'] && $type_user)

-        return 0;            // No permissions and user is external

-    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED))

-        return 0; // No permissions and option to hide when not allowed, even for internal user, is on

-    if (!$menuentry['perms'])

-        return 2;               // No permissions and user is external

+        if (!$found) {
+                    return 0;
+        }
+        // Entry is for menus all excluded to external users

+    }

+    if (!$menuentry['perms'] && $type_user) {
+            return 0;
+    }
+    // No permissions and user is external

+    if (!$menuentry['perms'] && !empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED)) {
+            return 0;
+    }
+    // No permissions and option to hide when not allowed, even for internal user, is on

+    if (!$menuentry['perms']) {
+            return 2;
+    }
+    // No permissions and user is external

     return 1;

 }

 

dolibarr/htdocs/core/menus/standard/eldy.lib.php

Spacing +410 added lines, -410 removed lines

@@ -27,7 +27,7 @@ 
  *  \file		htdocs/core/menus/standard/eldy.lib.php

  *  \brief		Library for file eldy menus

  */

-require_once DOL_DOCUMENT_ROOT . '/core/class/menubase.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/menubase.class.php';

 

 /**

  * Core function to output top menu eldy

@@ -378,13 +378,13 @@ 
                 $param = (isset($tmp[1]) ? $tmp[1] : '');

 

                 if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param))

-                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';

+                    $param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';

 //$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

-                $url = dol_buildpath($url, 1) . ($param ? '?' . $param : '');

+                $url = dol_buildpath($url, 1).($param ? '?'.$param : '');

 //$shorturl = $shorturl.($param?'?'.$param:'');

                 $shorturl = $url;

                 if (DOL_URL_ROOT)

-                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);

+                    $shorturl = preg_replace('/^'.preg_quote(DOL_URL_ROOT, '/').'/', '', $shorturl);

             }

 

 // Define the class (top menu selected or not)

@@ -408,7 +408,7 @@ 
     if (empty($noout)) {

         foreach ($menu->liste as $menkey => $menuval) {

             print_start_menu_entry($menuval['idsel'], $menuval['classname'], $menuval['enabled']);

-            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '') . $menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

+            print_text_menu_entry($menuval['titre'], $menuval['enabled'], (($menuval['url'] != '#' && !preg_match('/^(http:\/\/|https:\/\/)/i', $menuval['url'])) ? DOL_URL_ROOT : '').$menuval['url'], $menuval['id'], $menuval['idsel'], $menuval['classname'], ($menuval['target'] ? $menuval['target'] : $atarget));

             print_end_menu_entry($menuval['enabled']);

         }

     }

@@ -433,7 +433,7 @@ 
     global $conf;

 

     print '<div class="tmenudiv">';

-    print '<ul class="tmenu"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"') . '>';

+    print '<ul class="tmenu"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' title="Top menu"').'>';

 }

 

 /**

@@ -447,7 +447,7 @@ 
 function print_start_menu_entry($idsel, $classname, $showmode)

 {

     if ($showmode) {

-        print '<li ' . $classname . ' id="mainmenutd_' . $idsel . '">';

+        print '<li '.$classname.' id="mainmenutd_'.$idsel.'">';

 //print '<div class="tmenuleft tmenusep"></div>';

         print '<div class="tmenucenter">';

     }

@@ -470,17 +470,17 @@ 
     global $langs;

 

     if ($showmode == 1) {

-        print '<a class="tmenuimage" tabindex="-1" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';

-        print '<div class="' . $id . ' ' . $idsel . ' topmenuimage"><span class="' . $id . ' tmenuimage" id="mainmenuspan_' . $idsel . '"></span></div>';

+        print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

+        print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';

         print '</a>';

-        print '<a ' . $classname . ' id="mainmenua_' . $idsel . '" href="' . $url . '"' . ($atarget ? ' target="' . $atarget . '"' : '') . '>';

+        print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';

         print '<span class="mainmenuaspan">';

         print $text;

         print '</span>';

         print '</a>';

     } elseif ($showmode == 2) {

-        print '<div class="' . $id . ' ' . $idsel . ' topmenuimage tmenudisabled"><span class="' . $id . '" id="mainmenuspan_' . $idsel . '"></span></div>';

-        print '<a class="tmenudisabled" id="mainmenua_' . $idsel . '" href="#" title="' . dol_escape_htmltag($langs->trans("NotAllowed")) . '">';

+        print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';

+        print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';

         print '<span class="mainmenuaspan">';

         print $text;

         print '</span>';

@@ -545,38 +545,38 @@ 
 // Show logo company

     if (empty($conf->global->MAIN_MENU_INVERT) && empty($noout) && !empty($conf->global->MAIN_SHOW_LOGO) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {

         $mysoc->logo_mini = $conf->global->MAIN_INFO_SOCIETE_LOGO_MINI;

-        if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output . '/logos/thumbs/' . $mysoc->logo_mini)) {

-            $urllogo = DOL_BASE_URI . '/viewimage.php?cache=1&modulepart=mycompany&file=' . urlencode('logos/thumbs/' . $mysoc->logo_mini);

+        if (!empty($mysoc->logo_mini) && is_readable($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini)) {

+            $urllogo = DOL_BASE_URI.'/viewimage.php?cache=1&modulepart=mycompany&file='.urlencode('logos/thumbs/'.$mysoc->logo_mini);

         } else {

-            $urllogo = DOL_BASE_URI . '/theme/dolibarr_logo.png';

+            $urllogo = DOL_BASE_URI.'/theme/dolibarr_logo.png';

         }

         $title = $langs->trans("GoIntoSetupToChangeLogo");

-        print "\n" . '<!-- Show logo on menu -->' . "\n";

-        print '<div class="blockvmenuimpair blockvmenulogo">' . "\n";

+        print "\n".'<!-- Show logo on menu -->'."\n";

+        print '<div class="blockvmenuimpair blockvmenulogo">'."\n";

         print '<div class="menu_titre" id="menu_titre_logo"></div>';

         print '<div class="menu_top" id="menu_top_logo"></div>';

         print '<div class="menu_contenu" id="menu_contenu_logo">';

-        print '<div class="center"><img class="mycompany" title="' . dol_escape_htmltag($title) . '" alt="" src="' . $urllogo . '" style="max-width: 70%"></div>' . "\n";

+        print '<div class="center"><img class="mycompany" title="'.dol_escape_htmltag($title).'" alt="" src="'.$urllogo.'" style="max-width: 70%"></div>'."\n";

         print '</div>';

         print '<div class="menu_end" id="menu_end_logo"></div>';

-        print '</div>' . "\n";

+        print '</div>'."\n";

     }

 

     if (is_array($moredata) && !empty($moredata['searchform'])) { // searchform can contains select2 code or link to show old search form or link to switch on search page

         print "\n";

         print "<!-- Begin SearchForm -->\n";

-        print '<div id="blockvmenusearch" class="blockvmenusearch">' . "\n";

+        print '<div id="blockvmenusearch" class="blockvmenusearch">'."\n";

         print $moredata['searchform'];

-        print '</div>' . "\n";

+        print '</div>'."\n";

         print "<!-- End SearchForm -->\n";

     }

 

     if (is_array($moredata) && !empty($moredata['bookmarks'])) {

         print "\n";

         print "<!-- Begin Bookmarks -->\n";

-        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">' . "\n";

+        print '<div id="blockvmenubookmarks" class="blockvmenubookmarks">'."\n";

         print $moredata['bookmarks'];

-        print '</div>' . "\n";

+        print '</div>'."\n";

         print "<!-- End Bookmarks -->\n";

     }

 

@@ -593,11 +593,11 @@ 
 

 // Home - dashboard

 //$newmenu->add("/index.php?mainmenu=home&leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

-            $newmenu->add(BASE_URI . "?controller=home&method=home&mainmenu=home&leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

+            $newmenu->add(BASE_URI."?controller=home&method=home&mainmenu=home&leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright"></i>');

 

 // Setup

 //$newmenu->add("/admin/index.php?mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

-            $newmenu->add(BASE_URI . "?controller=admin&method=index&mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

+            $newmenu->add(BASE_URI."?controller=admin&method=index&mainmenu=home&leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-wrench fa-fw paddingright"></i>');

 

             if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {

 // Load translation files required by the page

@@ -606,14 +606,14 @@ 
                 $warnpicto = '';

                 if (empty($conf->global->MAIN_INFO_SOCIETE_NOM) || empty($conf->global->MAIN_INFO_SOCIETE_COUNTRY)) {

                     $langs->load("errors");

-                    $warnpicto = ' ' . img_warning($langs->trans("WarningMandatorySetupNotComplete"));

+                    $warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));

                 }

 //$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup") . $warnpicto, 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=company&mainmenu=home", $langs->trans("MenuCompanySetup") . $warnpicto, 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=company&mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);

                 $warnpicto = '';

                 if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) { // If only user module enabled

                     $langs->load("errors");

-                    $warnpicto = ' ' . img_warning($langs->trans("WarningMandatorySetupNotComplete"));

+                    $warnpicto = ' '.img_warning($langs->trans("WarningMandatorySetupNotComplete"));

                 }

                 /*

                   $newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules") . $warnpicto, 1);

@@ -632,42 +632,42 @@ 
                   $newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);

                   $newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);

                  */

-                $newmenu->add(BASE_URI . "?controller=admin&method=modules&mainmenu=home", $langs->trans("Modules") . $warnpicto, 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=menus&mainmenu=home", $langs->trans("Menus"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=ihm&mainmenu=home", $langs->trans("GUISetup"), 1);

-

-                $newmenu->add(BASE_URI . "?controller=admin&method=translation&mainmenu=home", $langs->trans("Translation"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=defaultvalues&mainmenu=home", $langs->trans("DefaultValues"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=boxes&mainmenu=home", $langs->trans("Boxes"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=delais&mainmenu=home", $langs->trans("MenuWarnings"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=security_other&mainmenu=home", $langs->trans("Security"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=limits&mainmenu=home", $langs->trans("MenuLimits"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=pdf&mainmenu=home", $langs->trans("PDF"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=mails&mainmenu=home", $langs->trans("Emails"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=sms&mainmenu=home", $langs->trans("SMS"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=dict&mainmenu=home", $langs->trans("Dictionary"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin&method=const&mainmenu=home", $langs->trans("OtherSetup"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=modules&mainmenu=home", $langs->trans("Modules").$warnpicto, 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=menus&mainmenu=home", $langs->trans("Menus"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=ihm&mainmenu=home", $langs->trans("GUISetup"), 1);

+

+                $newmenu->add(BASE_URI."?controller=admin&method=translation&mainmenu=home", $langs->trans("Translation"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=defaultvalues&mainmenu=home", $langs->trans("DefaultValues"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=boxes&mainmenu=home", $langs->trans("Boxes"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=delais&mainmenu=home", $langs->trans("MenuWarnings"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=security_other&mainmenu=home", $langs->trans("Security"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=limits&mainmenu=home", $langs->trans("MenuLimits"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=pdf&mainmenu=home", $langs->trans("PDF"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=mails&mainmenu=home", $langs->trans("Emails"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=sms&mainmenu=home", $langs->trans("SMS"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=dict&mainmenu=home", $langs->trans("Dictionary"), 1);

+                $newmenu->add(BASE_URI."?controller=admin&method=const&mainmenu=home", $langs->trans("OtherSetup"), 1);

             }

 

 // System tools

 //$newmenu->add("/admin/tools/index.php?mainmenu=home&leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

-            $newmenu->add(BASE_URI . "?controller=admin/tools&method=index&mainmenu=home&leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

+            $newmenu->add(BASE_URI."?controller=admin/tools&method=index&mainmenu=home&leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright"></i>');

 

             if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {

 // Load translation files required by the page

                 $langs->loadLangs(array('admin', 'help'));

 

 //$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/system&method=dolibarr&mainmenu=home&leftmenu=admintools_info", $langs->trans('InfoDolibarr'), 1);

+                $newmenu->add(BASE_URI."?controller=admin/system&method=dolibarr&mainmenu=home&leftmenu=admintools_info", $langs->trans('InfoDolibarr'), 1);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {

                     /*

                       $newmenu->add('/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2);

                       $newmenu->add('/admin/triggers.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2);

                       $newmenu->add('/admin/system/filecheck.php?mainmenu=home&leftmenu=admintools_info', $langs->trans('FileCheck'), 2);

                      */

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=modules&mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2);

-                    $newmenu->add(BASE_URI . '?controller=admin&method=triggers&mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2);

-                    $newmenu->add(BASE_URI . '?controller=admin/system&method=filecheck&mainmenu=home&leftmenu=admintools_info', $langs->trans('FileCheck'), 2);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=modules&mainmenu=home&leftmenu=admintools_info', $langs->trans('Modules'), 2);

+                    $newmenu->add(BASE_URI.'?controller=admin&method=triggers&mainmenu=home&leftmenu=admintools_info', $langs->trans('Triggers'), 2);

+                    $newmenu->add(BASE_URI.'?controller=admin/system&method=filecheck&mainmenu=home&leftmenu=admintools_info', $langs->trans('FileCheck'), 2);

                 }

                 /*

                   $newmenu->add('/admin/system/browser.php?mainmenu=home&leftmenu=admintools', $langs->trans('InfoBrowser'), 1);

@@ -687,32 +687,32 @@ 
                   $newmenu->add("/admin/tools/listsessions.php?mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"), 1);

                   $newmenu->add('/admin/system/about.php?mainmenu=home&leftmenu=admintools', $langs->trans('ExternalResources'), 1);

                  */

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=browser&mainmenu=home&leftmenu=admintools', $langs->trans('InfoBrowser'), 1);

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=os&mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1);

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=web&mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1);

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=browser&mainmenu=home&leftmenu=admintools', $langs->trans('InfoBrowser'), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=os&mainmenu=home&leftmenu=admintools', $langs->trans('InfoOS'), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=web&mainmenu=home&leftmenu=admintools', $langs->trans('InfoWebServer'), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);

 //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

                 if (function_exists('eaccelerator_info'))

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);

+                    $newmenu->add(BASE_URI."?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);

 //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=purge&mainmenu=home&leftmenu=admintools", $langs->trans("Purge"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=listevents&mainmenu=home&leftmenu=admintools", $langs->trans("Audit"), 1);

-                $newmenu->add(BASE_URI . "?controller=admin/tools&method=listsessions&mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"), 1);

-                $newmenu->add(BASE_URI . '?controller=admin/system&method=about&mainmenu=home&leftmenu=admintools', $langs->trans('ExternalResources'), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=purge&mainmenu=home&leftmenu=admintools", $langs->trans("Purge"), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=listevents&mainmenu=home&leftmenu=admintools", $langs->trans("Audit"), 1);

+                $newmenu->add(BASE_URI."?controller=admin/tools&method=listsessions&mainmenu=home&leftmenu=admintools", $langs->trans("Sessions"), 1);

+                $newmenu->add(BASE_URI.'?controller=admin/system&method=about&mainmenu=home&leftmenu=admintools', $langs->trans('ExternalResources'), 1);

 

                 if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {

                     $langs->load("products");

 //$newmenu->add("/product/admin/product_tools.php?mainmenu=home&leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);

-                    $newmenu->add(BASE_URI . "?controller=product/admin&method=product_tools&mainmenu=home&leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);

+                    $newmenu->add(BASE_URI."?controller=product/admin&method=product_tools&mainmenu=home&leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);

                 }

             }

 

 //$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

-            $newmenu->add(BASE_URI . "?controller=user&method=home&leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

+            $newmenu->add(BASE_URI."?controller=user&method=home&leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', '<i class="fa fa-users fa-fw paddingright"></i>');

             if ($user->rights->user->user->lire) {

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {

                     $newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);

@@ -728,16 +728,16 @@ 
                       $newmenu->add("/user/group/card.php?leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

                       $newmenu->add("/user/group/list.php?leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

                      */

-                    $newmenu->add(BASE_URI . "?controller=user&method=card&leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');

-                    $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);

-                    $newmenu->add(BASE_URI . "?controller=user&method=hierarchy&leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);

+                    $newmenu->add(BASE_URI."?controller=user&method=card&leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');

+                    $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);

+                    $newmenu->add(BASE_URI."?controller=user&method=hierarchy&leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);

                     if (!empty($conf->categorie->enabled)) {

                         $langs->load("categories");

-                        $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                        $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                     }

                     $newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

-                    $newmenu->add(BASE_URI . "?controller=user/group&method=card&leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

-                    $newmenu->add(BASE_URI . "?controller=user/group&method=list&leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

+                    $newmenu->add(BASE_URI."?controller=user/group&method=card&leftmenu=users&action=create", $langs->trans("NewGroup"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

+                    $newmenu->add(BASE_URI."?controller=user/group&method=list&leftmenu=users", $langs->trans("ListOfGroups"), 2, (($conf->global->MAIN_USE_ADVANCED_PERMS ? $user->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));

                 }

             }

         }

@@ -750,26 +750,26 @@ 
             if (!empty($conf->societe->enabled)) {

                 $langs->load("companies");

 //$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');

-                $newmenu->add(BASE_URI . "?controller=societe&method=index&leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');

+                $newmenu->add(BASE_URI."?controller=societe&method=index&leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties');

 

                 if ($user->rights->societe->creer) {

 //$newmenu->add("/societe/card.php?action=create", $langs->trans("MenuNewThirdParty"), 1);

-                    $newmenu->add(BASE_URI . "?controller=societe&method=card&action=create", $langs->trans("MenuNewThirdParty"), 1);

+                    $newmenu->add(BASE_URI."?controller=societe&method=card&action=create", $langs->trans("MenuNewThirdParty"), 1);

                     if (!$conf->use_javascript_ajax) {

 //$newmenu->add("/societe/card.php?action=create&private=1", $langs->trans("MenuNewPrivateIndividual"), 1);

-                        $newmenu->add(BASE_URI . "?controller=societe&method=card&action=create&private=1", $langs->trans("MenuNewPrivateIndividual"), 1);

+                        $newmenu->add(BASE_URI."?controller=societe&method=card&action=create&private=1", $langs->trans("MenuNewPrivateIndividual"), 1);

                     }

                 }

             }

 

 //$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);

-            $newmenu->add(BASE_URI . "?controller=societe&method=list&leftmenu=thirdparties", $langs->trans("List"), 1);

+            $newmenu->add(BASE_URI."?controller=societe&method=list&leftmenu=thirdparties", $langs->trans("List"), 1);

 

 // Prospects

             if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {

                 $langs->load("commercial");

 //$newmenu->add("/societe/list.php?type=p&leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');

-                $newmenu->add(BASE_URI . "?controller=societe&method=list&type=p&leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');

+                $newmenu->add(BASE_URI."?controller=societe&method=list&type=p&leftmenu=prospects", $langs->trans("ListProspectsShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'prospects');

                 /* no more required, there is a filter that can do more

                   if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);

                   if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);

@@ -778,7 +778,7 @@ 
                   if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&sortfield=s.datec&sortorder=desc&begin=&search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);

                  */

 //$newmenu->add("/societe/card.php?leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);

-                $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);

+                $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=prospects&action=create&type=p", $langs->trans("MenuNewProspect"), 2, $user->rights->societe->creer);

 //$newmenu->add("/contact/list.php?leftmenu=customers&type=p", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);

             }

 

@@ -786,10 +786,10 @@ 
             if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

                 $langs->load("commercial");

 //$newmenu->add("/societe/list.php?type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');

-                $newmenu->add(BASE_URI . "?controller=societe&method=list&type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');

+                $newmenu->add(BASE_URI."?controller=societe&method=list&type=c&leftmenu=customers", $langs->trans("ListCustomersShort"), 1, $user->rights->societe->lire, '', $mainmenu, 'customers');

 

 //$newmenu->add("/societe/card.php?leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);

-                $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);

+                $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=customers&action=create&type=c", $langs->trans("MenuNewCustomer"), 2, $user->rights->societe->creer);

 //$newmenu->add("/contact/list.php?leftmenu=customers&type=c", $langs->trans("Contacts"), 2, $user->rights->societe->contact->lire);

             }

 

@@ -798,8 +798,8 @@ 
                 $langs->load("suppliers");

 //$newmenu->add("/societe/list.php?type=f&leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

 //$newmenu->add("/societe/card.php?leftmenu=suppliers&action=create&type=f", $langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));

-                $newmenu->add(BASE_URI . "?controller=societe&method=list&type=f&leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

-                $newmenu->add(BASE_URI . "?controller=societe&method=card&leftmenu=suppliers&action=create&type=f", $langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));

+                $newmenu->add(BASE_URI."?controller=societe&method=list&type=f&leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 1, ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');

+                $newmenu->add(BASE_URI."?controller=societe&method=card&leftmenu=suppliers&action=create&type=f", $langs->trans("MenuNewSupplier"), 2, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_proposal->lire));

             }

 

 // Categories

@@ -813,12 +813,12 @@ 
                     if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))

                         $menutoshow = $langs->trans("ProspectsCategoriesShort");

 //$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                 }

 // Categories suppliers

                 if (!empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/categories/index.php?leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=catfournish&type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);

                 }

             }

 

@@ -826,30 +826,30 @@ 
 //$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

 //$newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);

 //$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);

-            $newmenu->add(BASE_URI . "?controller=societe&method=index&leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

-            $newmenu->add(BASE_URI . "?controller=contact&method=card&leftmenu=contacts&action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);

-            $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);

+            $newmenu->add(BASE_URI."?controller=societe&method=index&leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');

+            $newmenu->add(BASE_URI."?controller=contact&method=card&leftmenu=contacts&action=create", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);

+            $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);

             if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);

-                $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);

+                $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);

             }

             if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);

-                $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);

+                $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);

             }

             if (!empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);

-                $newmenu->add(BASE_URI . "?controller=contact&method=list&leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);

+                $newmenu->add(BASE_URI."?controller=contact&method=list&leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);

             }

 //$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);

-            $newmenu->add(BASE_URI . "?controller=contact&methos=list&leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);

+            $newmenu->add(BASE_URI."?controller=contact&methos=list&leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);

 //$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);

 // Categories

             if (!empty($conf->categorie->enabled)) {

                 $langs->load("categories");

 // Categories Contact

 //$newmenu->add("/categories/index.php?leftmenu=catcontact&type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=catcontact&type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=catcontact&type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

             }

         }

 

@@ -865,9 +865,9 @@ 
 //$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);

 //$newmenu->add("/comm/propal/card.php?action=create&leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);

 //$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);

-                $newmenu->add(BASE_URI . "?controller=comm/propal&method=index&leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);

-                $newmenu->add(BASE_URI . "?controller=comm/propal&method=card&action=create&leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);

-                $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);

+                $newmenu->add(BASE_URI."?controller=comm/propal&method=index&leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $mainmenu, 'propals', 100);

+                $newmenu->add(BASE_URI."?controller=comm/propal&method=card&action=create&leftmenu=propals", $langs->trans("NewPropal"), 1, $user->rights->propale->creer);

+                $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {

                     /*

                       $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);

@@ -876,15 +876,15 @@ 
                       $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);

                       $newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=comm/propal&method=list&leftmenu=propals&viewstatut=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=comm/propal&method=list&leftmenu=propals&viewstatut=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);

 //$newmenu->add("/comm/propal/list.php?leftmenu=propals&viewstatut=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);

                 }

 //$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);

-                $newmenu->add(BASE_URI . "?controller=comm/propal/stats&method=index&leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);

+                $newmenu->add(BASE_URI."?controller=comm/propal/stats&method=index&leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);

             }

 

 // Customers orders

@@ -893,26 +893,26 @@ 
 //$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);

 //$newmenu->add("/commande/card.php?action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);

 //$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);

-                $newmenu->add(BASE_URI . "?controller=commande&method=index&leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);

-                $newmenu->add(BASE_URI . "?controller=commande&method=card&action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);

-                $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);

+                $newmenu->add(BASE_URI."?controller=commande&method=index&leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200);

+                $newmenu->add(BASE_URI."?controller=commande&method=card&action=create&leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);

+                $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);

                     if (!empty($conf->expedition->enabled)) {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);

                     }

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);

                 }

 //$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

-                $newmenu->add(BASE_URI . "?controller=commande/stats&method=index&leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

+                $newmenu->add(BASE_URI."?controller=commande/stats&method=index&leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);

             }

 

 // Suppliers orders

@@ -921,16 +921,16 @@ 
 //$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

 //$newmenu->add("/fourn/commande/card.php?action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);

-                $newmenu->add(BASE_URI . "?controller=fourn/commande&method=index&leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

-                $newmenu->add(BASE_URI . "?controller=fourn/commande&method=card&action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);

-                $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);

+                $newmenu->add(BASE_URI."?controller=fourn/commande&method=index&leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400);

+                $newmenu->add(BASE_URI."?controller=fourn/commande&method=card&action=create&leftmenu=orders_suppliers", $langs->trans("NewOrder"), 1, $user->rights->fournisseur->commande->creer);

+                $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);

 

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);

                     if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);

-                        $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);

+                        $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->fournisseur->commande->lire);

                     }

                     /*

                       $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);

@@ -940,16 +940,16 @@ 
                       $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);

                       $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=2", $langs->trans("StatusOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=3", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=4", $langs->trans("StatusOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=5", $langs->trans("StatusOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders_suppliers&statut=9", $langs->trans("StatusOrderRefused"), 2, $user->rights->fournisseur->commande->lire);

                 }

 // Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("StatusOrderBilled"), 2, $user->rights->fournisseur->commande->lire);

 //$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

-                $newmenu->add(BASE_URI . "?controller=commande/stats&method=index&leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

+                $newmenu->add(BASE_URI."?controller=commande/stats&method=index&leftmenu=orders_suppliers&mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

             }

 

 // Contrat

@@ -961,10 +961,10 @@ 
                   $newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);

                   $newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);

                  */

-                $newmenu->add(BASE_URI . "?controller=contrat&method=index&leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);

-                $newmenu->add(BASE_URI . "?controller=contrat&method=card&action=create&leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);

-                $newmenu->add(BASE_URI . "?controller=contrat&method=list&leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);

-                $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);

+                $newmenu->add(BASE_URI."?controller=contrat&method=index&leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->contrat->lire, '', $mainmenu, 'contracts', 2000);

+                $newmenu->add(BASE_URI."?controller=contrat&method=card&action=create&leftmenu=contracts", $langs->trans("NewContractSubscription"), 1, $user->rights->contrat->creer);

+                $newmenu->add(BASE_URI."?controller=contrat&method=list&leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);

+                $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {

                     /*

                       $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);

@@ -972,10 +972,10 @@ 
                       $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);

                       $newmenu->add("/contrat/services_list.php?leftmenu=contracts&mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);

-                    $newmenu->add(BASE_URI . "?controller=contrat&method=services_list&leftmenu=contracts&mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=4&filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);

+                    $newmenu->add(BASE_URI."?controller=contrat&method=services_list&leftmenu=contracts&mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);

                 }

             }

 

@@ -989,11 +989,11 @@ 
                   $newmenu->add("/fichinter/card-red.php?leftmenu=ficheinter", $langs->trans("ModelList"), 1, $user->rights->ficheinter->lire, '', '', '', 203);

                   $newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

                  */

-                $newmenu->add(BASE_URI . "?controller=fichinter&method=index&leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);

-                $newmenu->add(BASE_URI . "?controller=fichinter&method=card&action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);

-                $newmenu->add(BASE_URI . "?controller=fichinter&method=list&leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);

-                $newmenu->add(BASE_URI . "?controller=fichinter&method=card-red&leftmenu=ficheinter", $langs->trans("ModelList"), 1, $user->rights->ficheinter->lire, '', '', '', 203);

-                $newmenu->add(BASE_URI . "?controller=fichinter/stats&method=index&leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

+                $newmenu->add(BASE_URI."?controller=fichinter&method=index&leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->ficheinter->lire, '', $mainmenu, 'ficheinter', 2200);

+                $newmenu->add(BASE_URI."?controller=fichinter&method=card&action=create&leftmenu=ficheinter", $langs->trans("NewIntervention"), 1, $user->rights->ficheinter->creer, '', '', '', 201);

+                $newmenu->add(BASE_URI."?controller=fichinter&method=list&leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);

+                $newmenu->add(BASE_URI."?controller=fichinter&method=card-red&leftmenu=ficheinter", $langs->trans("ModelList"), 1, $user->rights->ficheinter->lire, '', '', '', 203);

+                $newmenu->add(BASE_URI."?controller=fichinter/stats&method=index&leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);

             }

         }

 

@@ -1011,9 +1011,9 @@ 
                   $newmenu->add("/compta/facture/card.php?action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);

                   $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

                  */

-                $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');

-                $newmenu->add(BASE_URI . "?controller=compta/facture&method=card&action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);

-                $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

+                $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->facture->lire, '', $mainmenu, 'customers_bills');

+                $newmenu->add(BASE_URI."?controller=compta/facture&method=card&action=create", $langs->trans("NewBill"), 1, $user->rights->facture->creer);

+                $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_list');

 

                 if ($usemenuhider || empty($leftmenu) || preg_match('/customers_bills(|_draft|_notpaid|_paid|_canceled)$/', $leftmenu)) {

                     /*

@@ -1022,24 +1022,24 @@ 
                       $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);

                       $newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_draft&search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_notpaid&search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/facture&method=list&leftmenu=customers_bills_canceled&search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_draft&search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->facture->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_notpaid&search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/facture&method=list&leftmenu=customers_bills_canceled&search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);

                 }

 //$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates');    // No need to see recurring invoices, if user has no permission to create invoice.

 //$newmenu->add("/compta/paiement/list.php?leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

-                $newmenu->add(BASE_URI . "?controller=compta/facture&method=invoicetemplate_list&leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates');    // No need to see recurring invoices, if user has no permission to create invoice.

-                $newmenu->add(BASE_URI . "?controller=compta/paiement&method=list&leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

+                $newmenu->add(BASE_URI."?controller=compta/facture&method=invoicetemplate_list&leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->facture->creer, '', $mainmenu, 'customers_bills_templates'); // No need to see recurring invoices, if user has no permission to create invoice.

+                $newmenu->add(BASE_URI."?controller=compta/paiement&method=list&leftmenu=customers_bills_payment", $langs->trans("Payments"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_payment');

 

                 if (!empty($conf->global->BILL_ADD_PAYMENT_VALIDATION)) {

 //$newmenu->add("/compta/paiement/tovalidate.php?leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement&method=tovalidate&leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

+                    $newmenu->add(BASE_URI."?controller=compta/paiement&method=tovalidate&leftmenu=customers_bills_tovalid", $langs->trans("MenuToValid"), 2, $user->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');

                 }

 //$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

 //$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

-                $newmenu->add(BASE_URI . "?controller=compta/paiement&method=rapport&leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

-                $newmenu->add(BASE_URI . "?controller=compta/facture/stats&method=index&leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

+                $newmenu->add(BASE_URI."?controller=compta/paiement&method=rapport&leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');

+                $newmenu->add(BASE_URI."?controller=compta/facture/stats&method=index&leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');

             }

 

 // Suppliers invoices

@@ -1048,25 +1048,25 @@ 
 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

 //$newmenu->add("/fourn/facture/card.php?leftmenu=suppliers_bills&action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

-                $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

-                $newmenu->add(BASE_URI . "?controller=fourn/facture&method=card&leftmenu=suppliers_bills&action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

-                $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

+                $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills');

+                $newmenu->add(BASE_URI."?controller=fourn/facture&method=card&leftmenu=suppliers_bills&action=create", $langs->trans("NewBill"), 1, $user->rights->fournisseur->facture->creer, '', $mainmenu, 'suppliers_bills_create');

+                $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');

 

                 if ($usemenuhider || empty($leftmenu) || preg_match('/suppliers_bills/', $leftmenu)) {

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_draft&search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_notpaid&search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

 //$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_draft&search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_notpaid&search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

-                    $newmenu->add(BASE_URI . "?controller=fourn/facture&method=list&leftmenu=suppliers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_draft&search_status=0", $langs->trans("BillShortStatusDraft"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_draft');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_notpaid&search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_notpaid');

+                    $newmenu->add(BASE_URI."?controller=fourn/facture&method=list&leftmenu=suppliers_bills_paid&search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');

                 }

 

 //$newmenu->add("/fourn/facture/paiement.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

 //$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

 //$newmenu->add("/compta/facture/stats/index.php?mode=supplier&leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

-                $newmenu->add(BASE_URI . "?controller=fourn/facture&method=paiement&leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

-                $newmenu->add(BASE_URI . "?controller=fourn/facture&method=rapport&leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

-                $newmenu->add(BASE_URI . "?controller=compta/facture/stats&method=index&mode=supplier&leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

+                $newmenu->add(BASE_URI."?controller=fourn/facture&method=paiement&leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');

+                $newmenu->add(BASE_URI."?controller=fourn/facture&method=rapport&leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');

+                $newmenu->add(BASE_URI."?controller=compta/facture/stats&method=index&mode=supplier&leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');

             }

 

 // Orders

@@ -1074,7 +1074,7 @@ 
                 $langs->load("orders");

                 if (!empty($conf->facture->enabled)) {

 //$newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

-                    $newmenu->add(BASE_URI . "?controller=commande&method=list&leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

+                    $newmenu->add(BASE_URI."?controller=commande&method=list&leftmenu=orders&viewstatut=-3&billed=0&contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

                 }

 //                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);

             }

@@ -1084,7 +1084,7 @@ 
                 if (!empty($conf->global->SUPPLIER_MENU_ORDER_RECEIVED_INTO_INVOICE)) {

                     $langs->load("supplier");

 //$newmenu->add("/fourn/commande/list.php?leftmenu=orders&search_status=5&billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

-                    $newmenu->add(BASE_URI . "?controller=fourn/commande&method=list&leftmenu=orders&search_status=5&billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

+                    $newmenu->add(BASE_URI."?controller=fourn/commande&method=list&leftmenu=orders&search_status=5&billed=0", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');

 //                  if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);

                 }

             }

@@ -1094,12 +1094,12 @@ 
             if (!empty($conf->don->enabled)) {

                 $langs->load("donations");

 //$newmenu->add("/don/index.php?leftmenu=donations&mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');

-                $newmenu->add(BASE_URI . "?controller=don&method=index&leftmenu=donations&mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');

+                $newmenu->add(BASE_URI."?controller=don&method=index&leftmenu=donations&mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->don->lire, '', $mainmenu, 'donations');

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "donations") {

 //$newmenu->add("/don/card.php?leftmenu=donations&action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);

 //$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);

-                    $newmenu->add(BASE_URI . "?controller=don&method=card&leftmenu=donations&action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);

-                    $newmenu->add(BASE_URI . "?controller=don&method=list&leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);

+                    $newmenu->add(BASE_URI."?controller=don&method=card&leftmenu=donations&action=create", $langs->trans("NewDonation"), 1, $user->rights->don->creer);

+                    $newmenu->add(BASE_URI."?controller=don&method=list&leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);

                 }

 // if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);

             }

@@ -1110,24 +1110,24 @@ 
 

                 $permtoshowmenu = ((!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read)) || (!empty($conf->loan->enabled) && $user->rights->loan->read) || (!empty($conf->banque->enabled) && $user->rights->banque->lire));

 //$newmenu->add("/compta/charges/index.php?leftmenu=tax&mainmenu=billing", $langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

-                $newmenu->add(BASE_URI . "?controller=compta/charges&method=index&leftmenu=tax&mainmenu=billing", $langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

+                $newmenu->add(BASE_URI."?controller=compta/charges&method=index&leftmenu=tax&mainmenu=billing", $langs->trans("MenuSpecialExpenses"), 0, $permtoshowmenu, '', $mainmenu, 'tax');

 

 // Social contributions

                 if (!empty($conf->tax->enabled)) {

 //$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/sociales&method=list&leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/sociales&method=list&leftmenu=tax_social", $langs->trans("MenuSocialContributions"), 1, $user->rights->tax->charges->lire);

                     if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {

 //$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);

 //$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

 //$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&mainmenu=billing&mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/sociales&method=card&leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);

-                        $newmenu->add(BASE_URI . "?controller=compta/sociales&method=list&leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/sociales&method=payments&leftmenu=tax_social&mainmenu=billing&mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/sociales&method=card&leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);

+                        $newmenu->add(BASE_URI."?controller=compta/sociales&method=list&leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/sociales&method=payments&leftmenu=tax_social&mainmenu=billing&mode=sconly", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);

                     }

 // VAT

                     if (empty($conf->global->TAX_DISABLE_VAT_MENUS)) {

 //$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat&mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

-                        $newmenu->add(BASE_URI . "?controller=compta/tva&method=list&leftmenu=tax_vat&mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

+                        $newmenu->add(BASE_URI."?controller=compta/tva&method=list&leftmenu=tax_vat&mainmenu=billing", $langs->transcountry("VAT", $mysoc->country_code), 1, $user->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');

                         if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {

                             /*

                               $newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

@@ -1136,18 +1136,18 @@ 
                               $newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

                               $newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                              */

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=card&leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=list&leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=index&leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=clients&leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/tva&method=quadri_detail&leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=card&leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=list&leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=index&leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=clients&leftmenu=tax_vat", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/tva&method=quadri_detail&leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                         }

                         global $mysoc;

 

 //Local Taxes 1

                         if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {

 //$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_1_vat&mainmenu=billing&localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

                             if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {

                                 /*

                                   $newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

@@ -1156,17 +1156,17 @@ 
                                   $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

                                   $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                                  */

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=card&leftmenu=tax_1_vat&action=create&localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=index&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=clients&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=quadri_detail&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=card&leftmenu=tax_1_vat&action=create&localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=index&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=clients&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=quadri_detail&leftmenu=tax_1_vat&localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                             }

                         }

 //Local Taxes 2

                         if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {

 //$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

-                            $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

+                            $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_2_vat&mainmenu=billing&localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);

                             if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {

                                 /*

                                   $newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

@@ -1175,11 +1175,11 @@ 
                                   $newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

                                   $newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                                  */

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=card&leftmenu=tax_2_vat&action=create&localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=list&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=index&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=clients&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

-                                $newmenu->add(BASE_URI . "?controller=compta/localtax&method=quadri_detail&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=card&leftmenu=tax_2_vat&action=create&localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=list&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=index&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=clients&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByCustomers"), 2, $user->rights->tax->charges->lire);

+                                $newmenu->add(BASE_URI."?controller=compta/localtax&method=quadri_detail&leftmenu=tax_2_vat&localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);

                             }

                         }

                     }

@@ -1189,14 +1189,14 @@ 
                 if (!empty($conf->salaries->enabled)) {

                     $langs->load("salaries");

 //$newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary&mainmenu=billing", $langs->trans("Salaries"), 1, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');

-                    $newmenu->add(BASE_URI . "?controller=compta/salaries&method=list&leftmenu=tax_salary&mainmenu=billing", $langs->trans("Salaries"), 1, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');

+                    $newmenu->add(BASE_URI."?controller=compta/salaries&method=list&leftmenu=tax_salary&mainmenu=billing", $langs->trans("Salaries"), 1, $user->rights->salaries->read, '', $mainmenu, 'tax_salary');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_salary/i', $leftmenu)) {

 //$newmenu->add("/compta/salaries/card.php?leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 2, $user->rights->salaries->write);

 //$newmenu->add("/compta/salaries/list.php?leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->rights->salaries->read);

 //$newmenu->add("/compta/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->rights->salaries->read);

-                        $newmenu->add(BASE_URI . "?controller=compta/salaries&method=card&leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 2, $user->rights->salaries->write);

-                        $newmenu->add(BASE_URI . "?controller=compta/salaries&method=list&leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->rights->salaries->read);

-                        $newmenu->add(BASE_URI . "?controller=compta/salaries/stats&method=index&leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->rights->salaries->read);

+                        $newmenu->add(BASE_URI."?controller=compta/salaries&method=card&leftmenu=tax_salary&action=create", $langs->trans("NewPayment"), 2, $user->rights->salaries->write);

+                        $newmenu->add(BASE_URI."?controller=compta/salaries&method=list&leftmenu=tax_salary", $langs->trans("Payments"), 2, $user->rights->salaries->read);

+                        $newmenu->add(BASE_URI."?controller=compta/salaries/stats&method=index&leftmenu=tax_salary", $langs->trans("Statistics"), 2, $user->rights->salaries->read);

                     }

                 }

 

@@ -1204,10 +1204,10 @@ 
                 if (!empty($conf->loan->enabled)) {

                     $langs->load("loan");

 //$newmenu->add("/loan/list.php?leftmenu=tax_loan&mainmenu=billing", $langs->trans("Loans"), 1, $user->rights->loan->read, '', $mainmenu, 'tax_loan');

-                    $newmenu->add(BASE_URI . "?controller=loan&method=list&leftmenu=tax_loan&mainmenu=billing", $langs->trans("Loans"), 1, $user->rights->loan->read, '', $mainmenu, 'tax_loan');

+                    $newmenu->add(BASE_URI."?controller=loan&method=list&leftmenu=tax_loan&mainmenu=billing", $langs->trans("Loans"), 1, $user->rights->loan->read, '', $mainmenu, 'tax_loan');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_loan/i', $leftmenu)) {

 //$newmenu->add("/loan/card.php?leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 2, $user->rights->loan->write);

-                        $newmenu->add(BASE_URI . "?controller=loan&method=card&leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 2, $user->rights->loan->write);

+                        $newmenu->add(BASE_URI."?controller=loan&method=card&leftmenu=tax_loan&action=create", $langs->trans("NewLoan"), 2, $user->rights->loan->write);

 //$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);

                     }

                 }

@@ -1216,12 +1216,12 @@ 
                 if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {

                     $langs->load("banks");

 //$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&mainmenu=billing", $langs->trans("MenuVariousPayment"), 1, $user->rights->banque->lire, '', $mainmenu, 'tax_various');

-                    $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=list&leftmenu=tax_various&mainmenu=billing", $langs->trans("MenuVariousPayment"), 1, $user->rights->banque->lire, '', $mainmenu, 'tax_various');

+                    $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=list&leftmenu=tax_various&mainmenu=billing", $langs->trans("MenuVariousPayment"), 1, $user->rights->banque->lire, '', $mainmenu, 'tax_various');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_various/i', $leftmenu)) {

 //$newmenu->add("/compta/bank/various_payment/card.php?leftmenu=tax_various&action=create", $langs->trans("New"), 2, $user->rights->banque->modifier);

 //$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 2, $user->rights->banque->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=card&leftmenu=tax_various&action=create", $langs->trans("New"), 2, $user->rights->banque->modifier);

-                        $newmenu->add(BASE_URI . "?controller=compta/bank/various_payment&method=list&leftmenu=tax_various", $langs->trans("List"), 2, $user->rights->banque->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=card&leftmenu=tax_various&action=create", $langs->trans("New"), 2, $user->rights->banque->modifier);

+                        $newmenu->add(BASE_URI."?controller=compta/bank/various_payment&method=list&leftmenu=tax_various", $langs->trans("List"), 2, $user->rights->banque->lire);

                     }

                 }

             }

@@ -1239,11 +1239,11 @@ 
 

                 $permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);

 //$newmenu->add("/accountancy/index.php?leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

-                $newmenu->add(BASE_URI . "?controller=accountancy&method=index&leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

+                $newmenu->add(BASE_URI."?controller=accountancy&method=index&leftmenu=accountancy", $langs->trans("MenuAccountancy"), 0, $permtoshowmenu, '', $mainmenu, 'accountancy');

 

 // Chart of account

 //$newmenu->add("/accountancy/index.php?leftmenu=accountancy_admin", $langs->trans("Setup"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

-                $newmenu->add(BASE_URI . "?controller=accountancy&method=index&leftmenu=accountancy_admin", $langs->trans("Setup"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

+                $newmenu->add(BASE_URI."?controller=accountancy&method=index&leftmenu=accountancy_admin", $langs->trans("Setup"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1);

                 if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {

                     /*

                       $newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

@@ -1253,71 +1253,71 @@ 
                       $newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

                       $newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

                      */

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=index&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=journals_list&id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 20);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=accountmodel&id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 30);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=account&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 40);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=categories_list&id=32&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=defaultaccounts&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=index&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_general', 10);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=journals_list&id=35&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingJournals"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 20);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=accountmodel&id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 30);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=account&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 40);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=categories_list&id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=defaultaccounts&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 50);

                     if (!empty($conf->banque->enabled)) {

 //$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

-                        $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

+                        $newmenu->add(BASE_URI."?controller=compta/bank&method=list&mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 51);

                     }

                     if (!empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled)) {

 //$newmenu->add("/admin/dict.php?id=10&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

-                        $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=10&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

+                        $newmenu->add(BASE_URI."?controller=admin&method=dict&id=10&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuVatAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 52);

                     }

                     if (!empty($conf->tax->enabled)) {

 //$newmenu->add("/admin/dict.php?id=7&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

-                        $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=7&from=accountancy&search_country_id=" . $mysoc->country_id . "&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

+                        $newmenu->add(BASE_URI."?controller=admin&method=dict&id=7&from=accountancy&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuTaxAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 53);

                     }

                     if (!empty($conf->expensereport->enabled)) {

 //$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

-                        $newmenu->add(BASE_URI . "?controller=admin&method=dict&id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

+                        $newmenu->add(BASE_URI."?controller=admin&method=dict&id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 54);

                     }

 //$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

 //$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=productaccount&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

-                    $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=export&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=productaccount&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_product', 55);

+                    $newmenu->add(BASE_URI."?controller=accountancy/admin&method=export&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 2, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 60);

 

 // Fiscal year

                     if ($conf->global->MAIN_FEATURES_LEVEL > 1) {

 // Not yet used. In a future will lock some periods.

 //$newmenu->add("/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

-                        $newmenu->add(BASE_URI . "?controller=accountancy/admin&method=fiscalyear&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

+                        $newmenu->add(BASE_URI."?controller=accountancy/admin&method=fiscalyear&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("FiscalPeriod"), 2, $user->rights->accounting->fiscalyear, '', $mainmenu, 'fiscalyear');

                     }

                 }

 

 // Binding

                 if (!empty($conf->facture->enabled)) {

 //$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

-                    $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=index&leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

+                    $newmenu->add(BASE_URI."?controller=accountancy/customer&method=index&leftmenu=accountancy_dispatch_customer&mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {

 //$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/customer&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/customer&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/customer&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

                     }

                 }

                 if (!empty($conf->supplier_invoice->enabled)) {

 //$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

-                    $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=index&leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

+                    $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=index&leftmenu=accountancy_dispatch_supplier&mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {

 //$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/supplier&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/supplier&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

                     }

                 }

 

                 if (!empty($conf->expensereport->enabled)) {

 //$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

-                    $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=index&leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

+                    $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=index&leftmenu=accountancy_dispatch_expensereport&mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {

 //$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

 //$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

-                        $newmenu->add(BASE_URI . "?controller=accountancy/expensereport&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=list&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);

+                        $newmenu->add(BASE_URI."?controller=accountancy/expensereport&method=lines&mainmenu=accountancy&leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);

                     }

                 }

 

@@ -1327,8 +1327,8 @@ 
 

 // Multi journal

                     $sql = "SELECT rowid, code, label, nature";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "accounting_journal";

-                    $sql .= " WHERE entity = " . $conf->entity;

+                    $sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";

+                    $sql .= " WHERE entity = ".$conf->entity;

                     $sql .= " AND active = 1";

                     $sql .= " ORDER BY label DESC";

 

@@ -1369,7 +1369,7 @@ 
                                     $langs->load('accountancy');

                                     $journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...

 //$newmenu->add('/accountancy/journal/' . $nature . 'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);

-                                    $newmenu->add(BASE_URI . '?controller=accountancy/journal&method=' . $nature . 'journal&mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=' . $objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);

+                                    $newmenu->add(BASE_URI.'?controller=accountancy/journal&method='.$nature.'journal&mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);

                                 }

                                 $i++;

                             }

@@ -1384,31 +1384,31 @@ 
 

 // General Ledger

 //$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_generalledger", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);

-                $newmenu->add(BASE_URI . "?controller=accountancy/bookkeeping&method=list&mainmenu=accountancy&leftmenu=accountancy_generalledger", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);

+                $newmenu->add(BASE_URI."?controller=accountancy/bookkeeping&method=list&mainmenu=accountancy&leftmenu=accountancy_generalledger", $langs->trans("Bookkeeping"), 1, $user->rights->accounting->mouvements->lire);

 

 // Balance

 //$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);

-                $newmenu->add(BASE_URI . "?controller=accountancy/bookkeeping&method=balance&mainmenu=accountancy&leftmenu=accountancy_balance", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);

+                $newmenu->add(BASE_URI."?controller=accountancy/bookkeeping&method=balance&mainmenu=accountancy&leftmenu=accountancy_balance", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);

 

 // Files

                 if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL > 2) {

 //$newmenu->add("/compta/compta-files.php?mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta&method=compta-files&mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);

+                    $newmenu->add(BASE_URI."?controller=compta&method=compta-files&mainmenu=accountancy&leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);

                 }

 

 // Reports

                 $langs->load("compta");

 

 //$newmenu->add("/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

-                $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&mainmenu=accountancy&leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

+                $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&mainmenu=accountancy&leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');

 

                 if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

 //$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=clientfourn&leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=result&leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=clientfourn&leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=result&leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);

                 }

 

                 $modecompta = 'CREANCES-DETTES';

@@ -1423,11 +1423,11 @@ 
                           $newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);

                           $newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);

                          */

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyprodserv&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=byratecountry&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyprodserv&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=byratecountry&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);

                     }

                 }

 

@@ -1438,9 +1438,9 @@ 
 //$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

-                        $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = " . $modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ReportTurnoverCollected"), 2, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);

+                        $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);

 //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta = ".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);

                     }

@@ -1453,19 +1453,19 @@ 
 

 // Bilan, resultats

 //$newmenu->add("/compta/resultat/index.php?leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

-                $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

+                $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=report&mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');

 

                 if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {

 //$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=index&leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/resultat&method=clientfourn&leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=index&leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/resultat&method=clientfourn&leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

                     /* On verra ca avec module compabilite expert

                       $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);

                       $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);

                      */

 //$newmenu->add("/compta/stats/index.php?leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/stats&method=index&leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/stats&method=index&leftmenu=report", $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);

 

                     /*

                       $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);

@@ -1478,16 +1478,16 @@ 
 //$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);

 //$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/stats&method=casoc&leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyuser&leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/stats&method=cabyprodserv&leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/stats&method=byratecountry&leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/stats&method=casoc&leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyuser&leftmenu=report", $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/stats&method=cabyprodserv&leftmenu=report", $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/stats&method=byratecountry&leftmenu=report", $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);

 

 // Journaux

 //$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);

 //$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);

-                    $newmenu->add(BASE_URI . "?controller=compta/journal&method=sellsjournal&leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);

-                    $newmenu->add(BASE_URI . "?controller=compta/journal&method=purchasesjournal&leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);

+                    $newmenu->add(BASE_URI."?controller=compta/journal&method=sellsjournal&leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);

+                    $newmenu->add(BASE_URI."?controller=compta/journal&method=purchasesjournal&leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);

                 }

 //if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journaux"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);

             }

@@ -1499,15 +1499,15 @@ 
 //$newmenu->add("/asset/card.php?action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);

 //$newmenu->add("/asset/list.php?leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);

 //$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');

-                $newmenu->add(BASE_URI . "?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');

-                $newmenu->add(BASE_URI . "?controller=asset&method=card&action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);

-                $newmenu->add(BASE_URI . "?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);

-                $newmenu->add(BASE_URI . "?controller=asset&method=type&leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');

+                $newmenu->add(BASE_URI."?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->asset->read, '', $mainmenu, 'asset');

+                $newmenu->add(BASE_URI."?controller=asset&method=card&action=create", $langs->trans("MenuNewAsset"), 1, $user->rights->asset->write);

+                $newmenu->add(BASE_URI."?controller=asset&method=list&leftmenu=asset&mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);

+                $newmenu->add(BASE_URI."?controller=asset&method=type&leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');

                 if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {

 //$newmenu->add("/asset/type.php?leftmenu=asset_type&action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->write);

 //$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);

-                    $newmenu->add(BASE_URI . "?controller=asset&method=type&leftmenu=asset_type&action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->write);

-                    $newmenu->add(BASE_URI . "?controller=asset&mtehod=type&leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);

+                    $newmenu->add(BASE_URI."?controller=asset&method=type&leftmenu=asset_type&action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->write);

+                    $newmenu->add(BASE_URI."?controller=asset&mtehod=type&leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);

                 }

             }

         }

@@ -1532,28 +1532,28 @@ 
 

                   $newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);

                  */

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->banque->lire, '', $mainmenu, 'bank');

 

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=card&action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->rights->banque->configurer);

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=bankentries_list", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=budget", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=card&action=create", $langs->trans("MenuNewFinancialAccount"), 1, $user->rights->banque->configurer);

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=list&leftmenu=bank&mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=bankentries_list", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=budget", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);

 

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=transfer", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=transfer", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);

             }

 

             if (!empty($conf->categorie->enabled)) {

                 $langs->load("categories");

 //$newmenu->add("/categories/index.php?type = 5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

 //$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

-                $newmenu->add(BASE_URI . "?controller=categories&method=index&type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

-                $newmenu->add(BASE_URI . "?controller=compta/bank&method=categ", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

+                $newmenu->add(BASE_URI."?controller=categories&method=index&type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

+                $newmenu->add(BASE_URI."?controller=compta/bank&method=categ", $langs->trans("RubriquesTransactions"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');

             }

 

 // Prelevements

             if (!empty($conf->prelevement->enabled)) {

 //$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&mainmenu=bank", $langs->trans("StandingOrders"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

-                $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=index&leftmenu=withdraw&mainmenu=bank", $langs->trans("StandingOrders"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

+                $newmenu->add(BASE_URI."?controller=compta/prelevement&method=index&leftmenu=withdraw&mainmenu=bank", $langs->trans("StandingOrders"), 0, $user->rights->prelevement->bons->lire, '', $mainmenu, 'withdraw');

 

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "withdraw") {

 //$newmenu->add("/compta/prelevement/demandes.php?status = 0&mainmenu=bank",$langs->trans("StandingOrderToProcess"),1,$user->rights->prelevement->bons->lire);

@@ -1566,12 +1566,12 @@ 
                       $newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);

                       $newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=create&mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=create&mainmenu=bank", $langs->trans("NewStandingOrder"), 1, $user->rights->prelevement->bons->creer);

 

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=bons&mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=list&mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=rejets&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);

-                    $newmenu->add(BASE_URI . "?controller=compta/prelevement&method=stats&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=bons&mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=list&mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=rejets&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);

+                    $newmenu->add(BASE_URI."?controller=compta/prelevement&method=stats&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);

 

 //$newmenu->add("/compta/prelevement/config.php",$langs->trans("Setup"),1,$user->rights->prelevement->bons->configurer);

                 }

@@ -1580,12 +1580,12 @@ 
 // Gestion cheques

             if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))) {

 //$newmenu->add("/compta/paiement/cheque/index.php?leftmenu=checks&mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');

-                $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=index&leftmenu=checks&mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');

+                $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=index&leftmenu=checks&mainmenu=bank", $langs->trans("MenuChequeDeposits"), 0, $user->rights->banque->cheque, '', $mainmenu, 'checks');

                 if (preg_match('/checks/', $leftmenu)) {

 //$newmenu->add("/compta/paiement/cheque/card.php?leftmenu=checks_bis&action=new&mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);

 //$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=card&leftmenu=checks_bis&action=new&mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);

-                    $newmenu->add(BASE_URI . "?controller=compta/paiement/cheque&method=list&leftmenu=checks_bis&mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);

+                    $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=card&leftmenu=checks_bis&action=new&mainmenu=bank", $langs->trans("NewChequeDeposit"), 1, $user->rights->banque->cheque);

+                    $newmenu->add(BASE_URI."?controller=compta/paiement/cheque&method=list&leftmenu=checks_bis&mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);

                 }

             }

 

@@ -1595,9 +1595,9 @@ 
 //$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

 //$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);

 //$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);

-                $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_list&action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

-                $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_card&action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);

-                $newmenu->add(BASE_URI . "?controller=compta/cashcontrol&method=cashcontrol_list&action=list", $langs->trans("List"), 1, $permtomakecashfence);

+                $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_list&action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol');

+                $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_card&action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);

+                $newmenu->add(BASE_URI."?controller=compta/cashcontrol&method=cashcontrol_list&action=list", $langs->trans("List"), 1, $permtomakecashfence);

             }

         }

 

@@ -1610,34 +1610,34 @@ 
 //$newmenu->add("/product/index.php?leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');

 //$newmenu->add("/product/card.php?leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);

 //$newmenu->add("/product/list.php?leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire);

-                $newmenu->add(BASE_URI . "?controller=product&method=index&leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');

-                $newmenu->add(BASE_URI . "?controller=product&method=card&leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);

-                $newmenu->add(BASE_URI . "?controller=product&method=list&leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire);

+                $newmenu->add(BASE_URI."?controller=product&method=index&leftmenu=product&type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product');

+                $newmenu->add(BASE_URI."?controller=product&method=card&leftmenu=product&action=create&type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);

+                $newmenu->add(BASE_URI."?controller=product&method=list&leftmenu=product&type=0", $langs->trans("List"), 1, $user->rights->produit->lire);

                 if (!empty($conf->stock->enabled)) {

 //$newmenu->add("/product/reassort.php?type = 0", $langs->trans("Stocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

-                    $newmenu->add(BASE_URI . "?controller=product&method=reassort&type=0", $langs->trans("Stocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+                    $newmenu->add(BASE_URI."?controller=product&method=reassort&type=0", $langs->trans("Stocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

                 }

                 if (!empty($conf->productbatch->enabled)) {

                     $langs->load("stocks");

 //$newmenu->add("/product/reassortlot.php?type = 0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

 //$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

-                    $newmenu->add(BASE_URI . "?controller=product&method=reassortlot&type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=productlot_list", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+                    $newmenu->add(BASE_URI."?controller=product&method=reassortlot&type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=productlot_list", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);

                 }

                 if (!empty($conf->variants->enabled)) {

 //$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);

-                    $newmenu->add(BASE_URI . "?controller=variants&method=list", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);

+                    $newmenu->add(BASE_URI."?controller=variants&method=list", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);

                 }

                 if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {

 // $newmenu->add("/product/stats/card.php?id = all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=product/stats&method=card&id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stats&method=card&id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);

                 }

 

 // Categories

                 if (!empty($conf->categorie->enabled)) {

                     $langs->load("categories");

 //$newmenu->add("/categories/index.php?leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                     //if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);

                 }

             }

@@ -1647,18 +1647,18 @@ 
                 //$newmenu->add("/product/index.php?leftmenu=service&type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');

                 //$newmenu->add("/product/card.php?leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);

                 //$newmenu->add("/product/list.php?leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire);

-                $newmenu->add(BASE_URI . "?controller=product&method=index&leftmenu=service&type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');

-                $newmenu->add(BASE_URI . "?controller=product&method=card&leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);

-                $newmenu->add(BASE_URI . "?controller=product&method=list&leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire);

+                $newmenu->add(BASE_URI."?controller=product&method=index&leftmenu=service&type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service');

+                $newmenu->add(BASE_URI."?controller=product&method=card&leftmenu=service&action=create&type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);

+                $newmenu->add(BASE_URI."?controller=product&method=list&leftmenu=service&type=1", $langs->trans("List"), 1, $user->rights->service->lire);

                 if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled)) {

                     //$newmenu->add("/product/stats/card.php?id = all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);

-                    $newmenu->add(BASE_URI . "?controller=product/stats&method=card&id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stats&method=card&id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire && $user->rights->propale->lire);

                 }

                 // Categories

                 if (!empty($conf->categorie->enabled)) {

                     $langs->load("categories");

                     //$newmenu->add("/categories/index.php?leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                     //if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);

                 }

             }

@@ -1674,15 +1674,15 @@ 
 

                   $newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);

                  */

-                $newmenu->add(BASE_URI . "?controller=product/stock&method=index&leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

-                $newmenu->add(BASE_URI . "?controller=product/stock&method=card&action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);

-                $newmenu->add(BASE_URI . "?controller=product/stock&method=list", $langs->trans("List"), 1, $user->rights->stock->lire);

-                $newmenu->add(BASE_URI . "?controller=product/stock&method=movement_list", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);

+                $newmenu->add(BASE_URI."?controller=product/stock&method=index&leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

+                $newmenu->add(BASE_URI."?controller=product/stock&method=card&action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);

+                $newmenu->add(BASE_URI."?controller=product/stock&method=list", $langs->trans("List"), 1, $user->rights->stock->lire);

+                $newmenu->add(BASE_URI."?controller=product/stock&method=movement_list", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);

 

-                $newmenu->add(BASE_URI . "?controller=product/stock&method=massstockmove", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);

+                $newmenu->add(BASE_URI."?controller=product/stock&method=massstockmove", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);

                 if ($conf->supplier_order->enabled) {

                     //$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);

-                    $newmenu->add(BASE_URI . "?controller=product/stock&method=replenish", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);

+                    $newmenu->add(BASE_URI."?controller=product/stock&method=replenish", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);

                 }

             }

 

@@ -1694,16 +1694,16 @@ 
                         //$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

                         //$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);

                         //$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=list&leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=card&action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=list", $langs->trans("List"), 1, $user->rights->stock->lire);

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=list&leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock');

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=card&action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=list", $langs->trans("List"), 1, $user->rights->stock->lire);

                     } else {

                         //$newmenu->add("/product/inventory/list.php?leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

                         //$newmenu->add("/product/inventory/card.php?action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);

                         //$newmenu->add("/product/inventory/list.php", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=list&leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=card&action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);

-                        $newmenu->add(BASE_URI . "?controller=product/inventory&method=list", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=list&leftmenu=stock", $langs->trans("Inventory"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock');

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=card&action=create", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);

+                        $newmenu->add(BASE_URI."?controller=product/inventory&method=list", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);

                     }

                 }

             }

@@ -1714,19 +1714,19 @@ 
                 //$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');

                 //$newmenu->add("/expedition/card.php?action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);

                 //$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);

-                $newmenu->add(BASE_URI . "?controller=expedition&method=index&leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');

-                $newmenu->add(BASE_URI . "?controller=expedition&method=card&action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);

-                $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);

+                $newmenu->add(BASE_URI."?controller=expedition&method=index&leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings');

+                $newmenu->add(BASE_URI."?controller=expedition&method=card&action=create2&leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);

+                $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {

                     //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);

                     //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);

                     //$newmenu->add("/expedition/list.php?leftmenu=sendings&viewstatut=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);

-                    $newmenu->add(BASE_URI . "?controller=expedition&method=list&leftmenu=sendings&viewstatut=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);

+                    $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);

+                    $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);

+                    $newmenu->add(BASE_URI."?controller=expedition&method=list&leftmenu=sendings&viewstatut=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);

                 }

                 //$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);

-                $newmenu->add(BASE_URI . "?controller=expedition/stats&method=index&leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);

+                $newmenu->add(BASE_URI."?controller=expedition/stats&method=index&leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);

             }

 

             // Receptions

@@ -1735,23 +1735,23 @@ 
                 //$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');

                 //$newmenu->add("/reception/card.php?action=create2&leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);

                 //$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);

-                $newmenu->add(BASE_URI . "?controller=reception&method=index&leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');

-                $newmenu->add(BASE_URI . "?controller=reception&method=card&action=create2&leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);

-                $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);

+                $newmenu->add(BASE_URI."?controller=reception&method=index&leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions');

+                $newmenu->add(BASE_URI."?controller=reception&method=card&action=create2&leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);

+                $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                     //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);

-                    $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);

+                    $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);

                 }

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                     //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);

-                    $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);

+                    $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);

                 }

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {

                     //$newmenu->add("/reception/list.php?leftmenu=receptions&viewstatut=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);

-                    $newmenu->add(BASE_URI . "?controller=reception&method=list&leftmenu=receptions&viewstatut=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);

+                    $newmenu->add(BASE_URI."?controller=reception&method=list&leftmenu=receptions&viewstatut=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);

                 }

                 //$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);

-                $newmenu->add(BASE_URI . "?controller=reception/stats&method=index&leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);

+                $newmenu->add(BASE_URI."?controller=reception/stats&method=index&leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);

             }

         }

 

@@ -1785,32 +1785,32 @@ 
                 // Project assigned to user

                 //$newmenu->add("/projet/index.php?leftmenu=projects" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');

                 //$newmenu->add("/projet/card.php?leftmenu=projects&action=create" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);

-                $newmenu->add(BASE_URI . "?controller=projet&method=index&leftmenu=projects" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');

-                $newmenu->add(BASE_URI . "?controller=projet&method=card&leftmenu=projects&action=create" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);

+                $newmenu->add(BASE_URI."?controller=projet&method=index&leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects');

+                $newmenu->add(BASE_URI."?controller=projet&method=card&leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);

 

                 if ($conf->global->PROJECT_USE_OPPORTUNITIES == 0) {

                     //$newmenu->add("/projet/list.php?leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : '') . '&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');

-                    $newmenu->add(BASE_URI . "?controller=projet&method=list&leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : '') . '&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');

+                    $newmenu->add(BASE_URI."?controller=projet&method=list&leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : '').'&search_status=99', $langs->trans("List"), 1, $showmode, '', 'project', 'list');

                 } elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 1) {

                     //$newmenu->add("/projet/list.php?leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');

                     //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);

                     //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);

-                    $newmenu->add(BASE_URI . "?controller=projet&method=list&leftmenu=projets" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');

-                    $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);

-                    $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);

+                    $newmenu->add(BASE_URI."?controller=projet&method=list&leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');

+                    $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);

+                    $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);

                 } elseif ($conf->global->PROJECT_USE_OPPORTUNITIES == 2) { // 2 = leads only

                     //$newmenu->add('/projet/list.php?mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', $langs->trans("List"), 2, $showmode);

-                    $newmenu->add(BASE_URI . '?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', $langs->trans("List"), 2, $showmode);

+                    $newmenu->add(BASE_URI.'?controller=projet&method=list&mainmenu=project&leftmenu=list&search_opp_status=openedopp&search_status=99', $langs->trans("List"), 2, $showmode);

                 }

 

                 //$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

-                $newmenu->add(BASE_URI . "?controller=projet/stats&method=index&leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

+                $newmenu->add(BASE_URI."?controller=projet/stats&method=index&leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

 

                 // Categories

                 if (!empty($conf->categorie->enabled)) {

                     $langs->load("categories");

                     //$newmenu->add("/categories/index.php?leftmenu=cat&type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=6", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                 }

 

                 if (empty($conf->global->PROJECT_HIDE_TASKS)) {

@@ -1823,12 +1823,12 @@ 
 

                       $newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

                      */

-                    $newmenu->add(BASE_URI . "?controller=projet/activity&method=index&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);

-                    $newmenu->add(BASE_URI . "?controller=projet&method=tasks&leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);

-                    $newmenu->add(BASE_URI . "?controller=projet/tasks&method=list&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);

-                    $newmenu->add(BASE_URI . "?controller=projet/tasks/stats&method=index&leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet/activity&method=index&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("Activities"), 0, $user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet&method=tasks&leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);

+                    $newmenu->add(BASE_URI."?controller=projet/tasks&method=list&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet/tasks/stats&method=index&leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);

 

-                    $newmenu->add(BASE_URI . "?controller=projet/activity&method=perweek&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet/activity&method=perweek&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

                 }

             }

         }

@@ -1844,9 +1844,9 @@ 
                 //$newmenu->add("/user/list.php?leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

                 //$newmenu->add("/user/card.php?action=create&employee = 1", $langs->trans("NewEmployee"), 1, $user->rights->hrm->employee->write);

                 //$newmenu->add("/user/list.php?leftmenu=hrm&mode=employee&contextpage = employeelist", $langs->trans("List"), 1, $user->rights->hrm->employee->read);

-                $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

-                $newmenu->add(BASE_URI . "?controller=user&method=card&action=create&employee = 1", $langs->trans("NewEmployee"), 1, $user->rights->hrm->employee->write);

-                $newmenu->add(BASE_URI . "?controller=user&method=list&leftmenu=hrm&mode=employee&contextpage = employeelist", $langs->trans("List"), 1, $user->rights->hrm->employee->read);

+                $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->hrm->employee->read, '', $mainmenu, 'hrm');

+                $newmenu->add(BASE_URI."?controller=user&method=card&action=create&employee = 1", $langs->trans("NewEmployee"), 1, $user->rights->hrm->employee->write);

+                $newmenu->add(BASE_URI."?controller=user&method=list&leftmenu=hrm&mode=employee&contextpage = employeelist", $langs->trans("List"), 1, $user->rights->hrm->employee->read);

             }

 

             // Leave/Holiday/Vacation module

@@ -1857,9 +1857,9 @@ 
                 //$newmenu->add("/holiday/list.php?leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');

                 //$newmenu->add("/holiday/card.php?action=request", $langs->trans("New"), 1, $user->rights->holiday->write);

                 //$newmenu->add("/holiday/list.php?leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);

-                $newmenu->add(BASE_URI . "?controller=holiday&method=list&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');

-                $newmenu->add(BASE_URI . "?controller=holiday&method=card&action=request", $langs->trans("New"), 1, $user->rights->holiday->write);

-                $newmenu->add(BASE_URI . "?controller=holiday&method=list&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);

+                $newmenu->add(BASE_URI."?controller=holiday&method=list&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm');

+                $newmenu->add(BASE_URI."?controller=holiday&method=card&action=request", $langs->trans("New"), 1, $user->rights->holiday->write);

+                $newmenu->add(BASE_URI."?controller=holiday&method=list&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {

                     /*

                       $newmenu->add("/holiday/list.php?search_statut = 1&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);

@@ -1868,18 +1868,18 @@ 
                       $newmenu->add("/holiday/list.php?search_statut = 4&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);

                       $newmenu->add("/holiday/list.php?search_statut = 5&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);

                      */

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=1&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=2&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=3&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=4&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);

-                    $newmenu->add(BASE_URI . "?controller=holiday&method=list&search_statut=5&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=1&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=2&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=3&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=4&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);

+                    $newmenu->add(BASE_URI."?controller=holiday&method=list&search_statut=5&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);

                 }

                 //$newmenu->add("/holiday/define_holiday.php?action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);

                 //$newmenu->add("/holiday/month_report.php", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);

                 //$newmenu->add("/holiday/view_log.php?action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);

-                $newmenu->add(BASE_URI . "?controller=holiday&method=define_holiday&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);

-                $newmenu->add(BASE_URI . "?controller=holiday&method=month_report", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);

-                $newmenu->add(BASE_URI . "?controller=holiday&method=view_log&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);

+                $newmenu->add(BASE_URI."?controller=holiday&method=define_holiday&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);

+                $newmenu->add(BASE_URI."?controller=holiday&method=month_report", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->read_all);

+                $newmenu->add(BASE_URI."?controller=holiday&method=view_log&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);

             }

 

             // Trips and expenses (old module)

@@ -1891,10 +1891,10 @@ 
                   $newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);

                   $newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);

                  */

-                $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');

-                $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=card&action=create&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);

-                $newmenu->add(BASE_URI . "?controller=compta/deplacement&method=list&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);

-                $newmenu->add(BASE_URI . "?controller=compta/deplacement/stats&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);

+                $newmenu->add(BASE_URI."?controller=compta/deplacement&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses');

+                $newmenu->add(BASE_URI."?controller=compta/deplacement&method=card&action=create&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);

+                $newmenu->add(BASE_URI."?controller=compta/deplacement&method=list&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);

+                $newmenu->add(BASE_URI."?controller=compta/deplacement/stats&method=index&leftmenu=tripsandexpenses&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);

             }

 

             // Expense report

@@ -1914,18 +1914,18 @@ 
                   }

                   $newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);

                  */

-                $newmenu->add(BASE_URI . "?controller=expensereport&method=index&leftmenu=expensereport&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport');

-                $newmenu->add(BASE_URI . "?controller=expensereport&method=card&action=create&leftmenu=expensereport&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);

-                $newmenu->add(BASE_URI . "?controller=expensereport&method=list&leftmenu=expensereport&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);

+                $newmenu->add(BASE_URI."?controller=expensereport&method=index&leftmenu=expensereport&mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport');

+                $newmenu->add(BASE_URI."?controller=expensereport&method=card&action=create&leftmenu=expensereport&mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);

+                $newmenu->add(BASE_URI."?controller=expensereport&method=list&leftmenu=expensereport&mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);

                 if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=0&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=2&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=5&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=6&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=4&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);

-                    $newmenu->add(BASE_URI . "?controller=expensereport&method=list&search_status=99&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);

-                }

-                $newmenu->add(BASE_URI . "?controller=expensereport/stats&method=index&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=0&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=2&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=5&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=6&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=4&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);

+                    $newmenu->add(BASE_URI."?controller=expensereport&method=list&search_status=99&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);

+                }

+                $newmenu->add(BASE_URI."?controller=expensereport/stats&method=index&leftmenu=expensereport&mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);

             }

 

             if (!empty($conf->projet->enabled)) {

@@ -1935,7 +1935,7 @@ 
                     $search_project_user = GETPOST('search_project_user', 'int');

 

                     //$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

-                    $newmenu->add(BASE_URI . "?controller=projet/activity&method=perweek&leftmenu=tasks" . ($search_project_user ? '&search_project_user=' . $search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

+                    $newmenu->add(BASE_URI."?controller=projet/activity&method=perweek&leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire);

                 }

             }

         }

@@ -1948,24 +1948,24 @@ 
             if (empty($user->socid)) { // limit to internal users

                 $langs->load("mails");

                 //$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

-                $newmenu->add(BASE_URI . "?controller=admin&method=mails_templates&leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

+                $newmenu->add(BASE_URI."?controller=admin&method=mails_templates&leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates');

             }

 

             if (!empty($conf->mailing->enabled)) {

                 //$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');

                 //$newmenu->add("/comm/mailing/card.php?leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);

                 //$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);

-                $newmenu->add(BASE_URI . "?controller=comm/mailing&method=index&leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');

-                $newmenu->add(BASE_URI . "?controller=comm/mailing&method=card&leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);

-                $newmenu->add(BASE_URI . "?controller=comm/mailing&method=list&leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);

+                $newmenu->add(BASE_URI."?controller=comm/mailing&method=index&leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->mailing->lire, '', $mainmenu, 'mailing');

+                $newmenu->add(BASE_URI."?controller=comm/mailing&method=card&leftmenu=mailing&action=create", $langs->trans("NewMailing"), 1, $user->rights->mailing->creer);

+                $newmenu->add(BASE_URI."?controller=comm/mailing&method=list&leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);

             }

 

             if (!empty($conf->export->enabled)) {

                 $langs->load("exports");

                 //$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');

                 //$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);

-                $newmenu->add(BASE_URI . "?controller=exports&methodindex&leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');

-                $newmenu->add(BASE_URI . "?controller=exports&method=export&leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);

+                $newmenu->add(BASE_URI."?controller=exports&methodindex&leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export');

+                $newmenu->add(BASE_URI."?controller=exports&method=export&leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);

                 //$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);

             }

 

@@ -1973,8 +1973,8 @@ 
                 $langs->load("exports");

                 //$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');

                 //$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);

-                $newmenu->add(BASE_URI . "?controller=imports&method=index&leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');

-                $newmenu->add(BASE_URI . "?controller=imports&method=import&leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);

+                $newmenu->add(BASE_URI."?controller=imports&method=index&leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import');

+                $newmenu->add(BASE_URI."?controller=imports&method=import&leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);

             }

         }

 

@@ -2017,30 +2017,30 @@ 
                   $newmenu->add("/adherents/type.php?leftmenu=setup&mainmenu=members&action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);

                   $newmenu->add("/adherents/type.php?leftmenu=setup&mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);

                  */

-                $newmenu->add(BASE_URI . "?controller=adherents&method=index&leftmenu=members&mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');

-                $newmenu->add(BASE_URI . "?controller=adherents&method=card&leftmenu=members&action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1&filter = uptodate", $langs->trans("MenuMembersUpToDate"), 2, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=1&filter = outofdate", $langs->trans("MenuMembersNotUpToDate"), 2, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=list&leftmenu=members&statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents/stats&method=index&leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents/cartes&method=carte&leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);

+                $newmenu->add(BASE_URI."?controller=adherents&method=index&leftmenu=members&mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members');

+                $newmenu->add(BASE_URI."?controller=adherents&method=card&leftmenu=members&action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1&filter = uptodate", $langs->trans("MenuMembersUpToDate"), 2, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=1&filter = outofdate", $langs->trans("MenuMembersNotUpToDate"), 2, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=list&leftmenu=members&statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents/stats&method=index&leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents/cartes&method=carte&leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->adherent->export);

                 if (!empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && ($usemenuhider || empty($leftmenu) || $leftmenu == 'none' || $leftmenu == "members" || $leftmenu == "export")) {

-                    $newmenu->add(BASE_URI . "?controller=adherents&method=htpasswd&leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);

+                    $newmenu->add(BASE_URI."?controller=adherents&method=htpasswd&leftmenu=export", $langs->trans("Filehtpasswd"), 1, $user->rights->adherent->export);

                 }

                 if (!empty($conf->categorie->enabled)) {

                     $langs->load("categories");

-                    $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

-                }

-                $newmenu->add(BASE_URI . "?controller=adherents&method=index&leftmenu=members&mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&methodlist&leftmenu=members&statut=-1,1&mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);

-                $newmenu->add(BASE_URI . "?controller=adherents/subscription&method=list&leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents/stats&method=index&leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup');

-                $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members&action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);

-                $newmenu->add(BASE_URI . "?controller=adherents&method=type&leftmenu=setup&mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);

+                    $newmenu->add(BASE_URI."?controller=categories&method=index&leftmenu=cat&type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                }

+                $newmenu->add(BASE_URI."?controller=adherents&method=index&leftmenu=members&mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&methodlist&leftmenu=members&statut=-1,1&mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);

+                $newmenu->add(BASE_URI."?controller=adherents/subscription&method=list&leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);

+                $newmenu->add(BASE_URI."?controller=adherents/stats&method=index&leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);

+                $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup');

+                $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members&action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);

+                $newmenu->add(BASE_URI."?controller=adherents&method=type&leftmenu=setup&mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);

             }

         }

 

@@ -2051,11 +2051,11 @@ 
         //var_dump($newmenu->liste);    //

         // We update newmenu for special dynamic menus

         if (!empty($user->rights->banque->lire) && $mainmenu == 'bank') { // Entry for each bank account

-            require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

 

             $sql = "SELECT rowid, label, courant, rappro";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";

-            $sql .= " WHERE entity = " . $conf->entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";

+            $sql .= " WHERE entity = ".$conf->entity;

             $sql .= " AND clos = 0";

             $sql .= " ORDER BY label";

 

@@ -2066,16 +2066,16 @@ 
 

                 if ($numr > 0) {

                     //$newmenu->add('/compta/bank/list.php', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);

-                    $newmenu->add(BASE_URI . '?controller=compta/bank?method=list', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);

+                    $newmenu->add(BASE_URI.'?controller=compta/bank?method=list', $langs->trans("BankAccounts"), 0, $user->rights->banque->lire);

                 }

 

                 while ($i < $numr) {

                     $objp = $db->fetch_object($resql);

                     //$newmenu->add('/compta/bank/card.php?id=' . $objp->rowid, $objp->label, 1, $user->rights->banque->lire);

-                    $newmenu->add(BASE_URI . '?controller=compta/bank&method=card&id=' . $objp->rowid, $objp->label, 1, $user->rights->banque->lire);

+                    $newmenu->add(BASE_URI.'?controller=compta/bank&method=card&id='.$objp->rowid, $objp->label, 1, $user->rights->banque->lire);

                     if ($objp->rappro && $objp->courant != Account::TYPE_CASH && empty($objp->clos)) {  // If not cash account and not closed and can be reconciliate

                         //$newmenu->add('/compta/bank/bankentries_list.php?action=reconcile&contextpage=banktransactionlist-' . $objp->rowid . '&account=' . $objp->rowid . '&id=' . $objp->rowid . '&search_conciliated=0', $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);

-                        $newmenu->add(BASE_URI . '?controller=compta/bank&method=bankentries_list&action=reconcile&contextpage=banktransactionlist-' . $objp->rowid . '&account=' . $objp->rowid . '&id=' . $objp->rowid . '&search_conciliated=0', $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);

+                        $newmenu->add(BASE_URI.'?controller=compta/bank&method=bankentries_list&action=reconcile&contextpage=banktransactionlist-'.$objp->rowid.'&account='.$objp->rowid.'&id='.$objp->rowid.'&search_conciliated=0', $langs->trans("Conciliate"), 2, $user->rights->banque->consolidate);

                     }

                     $i++;

                 }

@@ -2088,11 +2088,11 @@ 
             $MAXFTP = 20;

             $i = 1;

             while ($i <= $MAXFTP) {

-                $paramkey = 'FTP_NAME_' . $i;

+                $paramkey = 'FTP_NAME_'.$i;

                 //print $paramkey;

                 if (!empty($conf->global->$paramkey)) {

                     //$link = "/ftp/index.php?idmenu = " . $_SESSION["idmenu"] . "&numero_ftp = " . $i;

-                    $link = BASE_URI . "?controller=ftp&method=index&idmenu=" . $_SESSION["idmenu"] . "&numero_ftp=" . $i;

+                    $link = BASE_URI."?controller=ftp&method=index&idmenu=".$_SESSION["idmenu"]."&numero_ftp=".$i;

 

                     $newmenu->add($link, dol_trunc($conf->global->$paramkey, 24));

                 }

@@ -2148,9 +2148,9 @@ 
                         $lastopened = false;

                 }

                 if ($altok % 2 == 0) {

-                    print '<div class="blockvmenu blockvmenuimpair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

+                    print '<div class="blockvmenu blockvmenuimpair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";

                 } else {

-                    print '<div class="blockvmenu blockvmenupair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

+                    print '<div class="blockvmenu blockvmenupair'.$invert.($lastopened ? ' blockvmenulast' : '').($altok == 1 ? ' blockvmenufirst' : '').'">'."\n";

                 }

             }

 

@@ -2172,47 +2172,47 @@ 
             if (!preg_match("/^(http:\/\/|https:\/\/)/i", $menu_array[$i]['url'])) {

                 $tmp = explode('?', $menu_array[$i]['url'], 2);

                 $url = $shorturl = $tmp[0];

-                $param = (isset($tmp[1]) ? $tmp[1] : '');    // params in url of the menu link

+                $param = (isset($tmp[1]) ? $tmp[1] : ''); // params in url of the menu link

                 // Complete param to force leftmenu to '' to close open menu when we click on a link with no leftmenu defined.

                 if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && !empty($menu_array[$i]['mainmenu'])) {

-                    $param .= ($param ? '&' : '') . 'mainmenu=' . $menu_array[$i]['mainmenu'] . '&leftmenu=';

+                    $param .= ($param ? '&' : '').'mainmenu='.$menu_array[$i]['mainmenu'].'&leftmenu=';

                 }

                 if ((!preg_match('/mainmenu/i', $param)) && (!preg_match('/leftmenu/i', $param)) && empty($menu_array[$i]['mainmenu'])) {

-                    $param .= ($param ? '&' : '') . 'leftmenu=';

+                    $param .= ($param ? '&' : '').'leftmenu=';

                 }

                 //$url.="idmenu = ".$menu_array[$i]['rowid'];    // Already done by menuLoad

-                $url = dol_buildpath($url, 1) . ($param ? '?' . $param : '');

+                $url = dol_buildpath($url, 1).($param ? '?'.$param : '');

                 $shorturlwithoutparam = $shorturl;

-                $shorturl = $shorturl . ($param ? '?' . $param : '');

+                $shorturl = $shorturl.($param ? '?'.$param : '');

             }

 

 

-            print '<!-- Process menu entry with mainmenu=' . $menu_array[$i]['mainmenu'] . ', leftmenu=' . $menu_array[$i]['leftmenu'] . ', level=' . $menu_array[$i]['level'] . ' enabled=' . $menu_array[$i]['enabled'] . ', position=' . $menu_array[$i]['position'] . ' -->' . "\n";

+            print '<!-- Process menu entry with mainmenu='.$menu_array[$i]['mainmenu'].', leftmenu='.$menu_array[$i]['leftmenu'].', level='.$menu_array[$i]['level'].' enabled='.$menu_array[$i]['enabled'].', position='.$menu_array[$i]['position'].' -->'."\n";

 

             // Menu level 0

             if ($menu_array[$i]['level'] == 0) {

                 if ($menu_array[$i]['enabled']) {     // Enabled so visible

-                    print '<div class="menu_titre">' . $tabstring;

+                    print '<div class="menu_titre">'.$tabstring;

                     if ($shorturlwithoutparam)

-                        print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

+                        print '<a class="vmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

                     else

                         print '<span class="vmenu">';

-                    print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '') . $menu_array[$i]['titre'];

+                    print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];

                     if ($shorturlwithoutparam)

                         print '</a>';

                     else

                         print '</span>';

-                    print '</div>' . "\n";

+                    print '</div>'."\n";

                     $lastlevel0 = 'enabled';

                 }

                 else if ($showmenu) {                 // Not enabled but visible (so greyed)

-                    print '<div class="menu_titre">' . $tabstring . '<font class="vmenudisabled">' . $menu_array[$i]['titre'] . '</font></div>' . "\n";

+                    print '<div class="menu_titre">'.$tabstring.'<font class="vmenudisabled">'.$menu_array[$i]['titre'].'</font></div>'."\n";

                     $lastlevel0 = 'greyed';

                 } else {

                     $lastlevel0 = 'hidden';

                 }

                 if ($showmenu) {

-                    print '<div class="menu_top"></div>' . "\n";

+                    print '<div class="menu_top"></div>'."\n";

                 }

             }

 

@@ -2220,12 +2220,12 @@ 
             if ($menu_array[$i]['level'] > 0) {

                 $cssmenu = '';

                 if ($menu_array[$i]['url'])

-                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+                    $cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

 

                 if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.

-                    print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring;

+                    print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;

                     if ($shorturlwithoutparam)

-                        print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

+                        print '<a class="vsmenu" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';

                     else

                         print '<span class="vsmenu">';

                     print $menu_array[$i]['titre'];

@@ -2236,26 +2236,26 @@ 
                     // If title is not pure text and contains a table, no carriage return added

                     if (!strstr($menu_array[$i]['titre'], '<table'))

                         print '<br>';

-                    print '</div>' . "\n";

+                    print '</div>'."\n";

                 }

                 else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

-                    print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $menu_array[$i]['titre'] . '</font><br></div>' . "\n";

+                    print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<font class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</font><br></div>'."\n";

                 }

             }

 

             // If next is a new block or if there is nothing after

             if (empty($menu_array[$i + 1]['level'])) {               // End menu block

                 if ($showmenu)

-                    print '<div class="menu_end"></div>' . "\n";

+                    print '<div class="menu_end"></div>'."\n";

                 if ($blockvmenuopened) {

-                    print '</div>' . "\n";

+                    print '</div>'."\n";

                     $blockvmenuopened = false;

                 }

             }

         }

 

         if ($altok)

-            print '<div class="blockvmenuend"></div>';    // End menu block

+            print '<div class="blockvmenuend"></div>'; // End menu block

     }

 

     return count($menu_array);

Braces +197 added lines, -139 removed lines

@@ -51,8 +51,9 @@ 
     $id = 'mainmenu';

     $listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);

 

-    if (empty($noout))

-        print_start_menu_array();

+    if (empty($noout)) {
+            print_start_menu_array();
+    }
 

     $usemenuhider = (GETPOST('testmenuhider', 'int') || !empty($conf->global->MAIN_TESTMENUHIDER));

 

@@ -71,14 +72,16 @@ 
     if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "home") {

         $classname = 'class="tmenusel"';

         $_SESSION['idmenu'] = '';

-    } else

-        $classname = 'class="tmenu"';

+    } else {
+            $classname = 'class="tmenu"';
+    }
     $idsel = 'home';

 

     $titlehome = $langs->trans("Home");

-    if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE))

-        $titlehome = '&nbsp; <span class="fa fa-home"></span> &nbsp;';

-//$menu->add('/index.php?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

+    if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+            $titlehome = '&nbsp; <span class="fa fa-home"></span> &nbsp;';
+    }
+    //$menu->add('/index.php?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

     $menu->add('?mainmenu=home&leftmenu=home', $titlehome, 0, $showmode, $atarget, "home", '', 10, $id, $idsel, $classname);

 

 // Members

@@ -93,8 +96,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "members") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'members';

 

 //$menu->add('/adherents/index.php?mainmenu=members&leftmenu=', $langs->trans("MenuMembers"), 0, $showmode, $atarget, "members", '', 18, $id, $idsel, $classname);

@@ -116,8 +120,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "companies") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'companies';

 

 //$menu->add('/societe/index.php?mainmenu=companies&leftmenu=', $langs->trans("ThirdParties"), 0, $showmode, $atarget, "companies", '', 20, $id, $idsel, $classname);

@@ -138,8 +143,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "products") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'products';

 

         $chaine = "";

@@ -169,8 +175,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'project';

 

         $title = $langs->trans("LeadsOrProjects"); // Leads and opportunities by default

@@ -192,18 +199,24 @@ 
 

 // Commercial

     $menuqualified = 0;

-    if (!empty($conf->propal->enabled))

-        $menuqualified++;

-    if (!empty($conf->commande->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_order->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_proposal->enabled))

-        $menuqualified++;

-    if (!empty($conf->contrat->enabled))

-        $menuqualified++;

-    if (!empty($conf->ficheinter->enabled))

-        $menuqualified++;

+    if (!empty($conf->propal->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->commande->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_order->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_proposal->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->contrat->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->ficheinter->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->societe->lire) || !empty($user->rights->societe->contact->lire)),

@@ -217,8 +230,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "commercial") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'commercial';

 

 //$menu->add('/comm/index.php?mainmenu=commercial&leftmenu=', $langs->trans("Commercial"), 0, $showmode, $atarget, "commercial", "", 40, $id, $idsel, $classname);

@@ -227,18 +241,24 @@ 
 

 // Billing - Financial

     $menuqualified = 0;

-    if (!empty($conf->facture->enabled))

-        $menuqualified++;

-    if (!empty($conf->don->enabled))

-        $menuqualified++;

-    if (!empty($conf->tax->enabled))

-        $menuqualified++;

-    if (!empty($conf->salaries->enabled))

-        $menuqualified++;

-    if (!empty($conf->supplier_invoice->enabled))

-        $menuqualified++;

-    if (!empty($conf->loan->enabled))

-        $menuqualified++;

+    if (!empty($conf->facture->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->don->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->tax->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->salaries->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->supplier_invoice->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->loan->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->facture->lire) || !empty($user->rights->don->lire) || !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read) || !empty($user->rights->fournisseur->facture->lire) || !empty($user->rights->loan->read)),

@@ -252,8 +272,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "billing") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'billing';

 

 //$menu->add('/compta/index.php?mainmenu=billing&leftmenu=', $langs->trans("MenuFinancial"), 0, $showmode, $atarget, "billing", '', 50, $id, $idsel, $classname);

@@ -275,8 +296,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'bank';

 

 //$menu->add('/compta/bank/list.php?mainmenu=bank&leftmenu=', $langs->trans("MenuBankCash"), 0, $showmode, $atarget, "bank", '', 52, $id, $idsel, $classname);

@@ -285,12 +307,15 @@ 
 

 // Accounting

     $menuqualified = 0;

-    if (!empty($conf->comptabilite->enabled))

-        $menuqualified++;

-    if (!empty($conf->accounting->enabled))

-        $menuqualified++;

-    if (!empty($conf->asset->enabled))

-        $menuqualified++;

+    if (!empty($conf->comptabilite->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->accounting->enabled)) {
+            $menuqualified++;
+    }
+    if (!empty($conf->asset->enabled)) {
+            $menuqualified++;
+    }
     $tmpentry = array(

         'enabled' => $menuqualified,

         'perms' => (!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read)),

@@ -304,8 +329,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'accountancy';

 

 //$menu->add('/accountancy/index.php?mainmenu=accountancy&leftmenu=', $langs->trans("MenuAccountancy"), 0, $showmode, $atarget, "accountancy", '', 54, $id, $idsel, $classname);

@@ -326,8 +352,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'hrm';

 

 //$menu->add('/hrm/index.php?mainmenu=hrm&leftmenu=', $langs->trans("HRM"), 0, $showmode, $atarget, "hrm", '', 80, $id, $idsel, $classname);

@@ -348,8 +375,9 @@ 
         if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools") {

             $classname = 'class="tmenusel"';

             $_SESSION['idmenu'] = '';

-        } else

-            $classname = 'class="tmenu"';

+        } else {
+                    $classname = 'class="tmenu"';
+        }
         $idsel = 'tools';

 

 //$menu->add('/core/tools.php?mainmenu=tools&leftmenu=', $langs->trans("Tools"), 0, $showmode, $atarget, "tools", '', 90, $id, $idsel, $classname);

@@ -377,26 +405,29 @@ 
                 $url = $shorturl = $tmp[0];

                 $param = (isset($tmp[1]) ? $tmp[1] : '');

 

-                if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param))

-                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';

-//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

+                if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
+                                    $param .= ($param ? '&' : '') . 'mainmenu=' . $newTabMenu[$i]['mainmenu'] . '&leftmenu=';
+                }
+                //$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad

                 $url = dol_buildpath($url, 1) . ($param ? '?' . $param : '');

 //$shorturl = $shorturl.($param?'?'.$param:'');

                 $shorturl = $url;

-                if (DOL_URL_ROOT)

-                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);

+                if (DOL_URL_ROOT) {
+                                    $shorturl = preg_replace('/^' . preg_quote(DOL_URL_ROOT, '/') . '/', '', $shorturl);
+                }
             }

 

 // Define the class (top menu selected or not)

-            if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu'])

-                $classname = 'class="tmenusel"';

-            else if (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"])

-                $classname = 'class="tmenusel"';

-            else

-                $classname = 'class="tmenu"';

-        }

-        else if ($showmode == 2)

-            $classname = 'class="tmenu"';

+            if (!empty($_SESSION['idmenu']) && $newTabMenu[$i]['rowid'] == $_SESSION['idmenu']) {
+                            $classname = 'class="tmenusel"';
+            } else if (!empty($_SESSION["mainmenu"]) && $newTabMenu[$i]['mainmenu'] == $_SESSION["mainmenu"]) {
+                            $classname = 'class="tmenusel"';
+            } else {
+                            $classname = 'class="tmenu"';
+            }
+        } else if ($showmode == 2) {
+                    $classname = 'class="tmenu"';
+        }
 

         $menu->add($shorturl, $newTabMenu[$i]['titre'], 0, $showmode, ($newTabMenu[$i]['target'] ? $newTabMenu[$i]['target'] : $atarget), ($newTabMenu[$i]['mainmenu'] ? $newTabMenu[$i]['mainmenu'] : $newTabMenu[$i]['rowid']), ($newTabMenu[$i]['leftmenu'] ? $newTabMenu[$i]['leftmenu'] : ''), $newTabMenu[$i]['position'], $id, $idsel, $classname);

     }

@@ -693,9 +724,10 @@ 
                 $newmenu->add(BASE_URI . '?controller=admin/system&method=phpinfo&mainmenu=home&leftmenu=admintools', $langs->trans('InfoPHP'), 1);

 //if (function_exists('xdebug_is_enabled')) $newmenu->add('/admin/system/xdebug.php', $langs->trans('XDebug'),1);

                 $newmenu->add(BASE_URI . '?controller=admin/system&method=database&mainmenu=home&leftmenu=admintools', $langs->trans('InfoDatabase'), 1);

-                if (function_exists('eaccelerator_info'))

-                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);

-//$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);

+                if (function_exists('eaccelerator_info')) {
+                                    $newmenu->add(BASE_URI . "?controller=admin/tools&method=eaccelerator&mainmenu=home&leftmenu=admintools", $langs->trans("EAccelerator"), 1);
+                }
+                //$newmenu->add("/admin/system/perf.php?mainmenu=home&leftmenu=admintools", $langs->trans("InfoPerf"),1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_export&mainmenu=home&leftmenu=admintools", $langs->trans("Backup"), 1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=dolibarr_import&mainmenu=home&leftmenu=admintools", $langs->trans("Restore"), 1);

                 $newmenu->add(BASE_URI . "?controller=admin/tools&method=update&mainmenu=home&leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);

@@ -808,11 +840,13 @@ 
                 if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {

 // Categories prospects/customers

                     $menutoshow = $langs->trans("CustomersProspectsCategoriesShort");

-                    if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS))

-                        $menutoshow = $langs->trans("CustomersCategoriesShort");

-                    if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))

-                        $menutoshow = $langs->trans("ProspectsCategoriesShort");

-//$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

+                    if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+                                            $menutoshow = $langs->trans("CustomersCategoriesShort");
+                    }
+                    if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+                                            $menutoshow = $langs->trans("ProspectsCategoriesShort");
+                    }
+                    //$newmenu->add("/categories/index.php?leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                     $newmenu->add(BASE_URI . "?controller=categories&method=index&leftmenu=cat&type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');

                 }

 // Categories suppliers

@@ -1344,25 +1378,33 @@ 
                                 $nature = '';

 

 // Must match array $sourceList defined into journals_list.php

-                                if ($objp->nature == 2 && !empty($conf->facture->enabled))

-                                    $nature = "sells";

-                                if ($objp->nature == 3 && !empty($conf->fournisseur->enabled))

-                                    $nature = "purchases";

-                                if ($objp->nature == 4 && !empty($conf->banque->enabled))

-                                    $nature = "bank";

-                                if ($objp->nature == 5 && !empty($conf->expensereport->enabled))

-                                    $nature = "expensereports";

-                                if ($objp->nature == 1)

-                                    $nature = "various";

-                                if ($objp->nature == 8)

-                                    $nature = "inventory";

-                                if ($objp->nature == 9)

-                                    $nature = "hasnew";

+                                if ($objp->nature == 2 && !empty($conf->facture->enabled)) {
+                                                                    $nature = "sells";
+                                }
+                                if ($objp->nature == 3 && !empty($conf->fournisseur->enabled)) {
+                                                                    $nature = "purchases";
+                                }
+                                if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+                                                                    $nature = "bank";
+                                }
+                                if ($objp->nature == 5 && !empty($conf->expensereport->enabled)) {
+                                                                    $nature = "expensereports";
+                                }
+                                if ($objp->nature == 1) {
+                                                                    $nature = "various";
+                                }
+                                if ($objp->nature == 8) {
+                                                                    $nature = "inventory";
+                                }
+                                if ($objp->nature == 9) {
+                                                                    $nature = "hasnew";
+                                }
 

 // To enable when page exists

                                 if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {

-                                    if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory')

-                                        $nature = '';

+                                    if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+                                                                            $nature = '';
+                                    }
                                 }

 

                                 if ($nature) {

@@ -1377,8 +1419,9 @@ 
 // Should not happend. Entries are added

                             $newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);

                         }

-                    } else

-                        dol_print_error($db);

+                    } else {
+                                            dol_print_error($db);
+                    }
                     $db->free($resql);

                 }

 

@@ -1412,8 +1455,10 @@ 
                 }

 

                 $modecompta = 'CREANCES-DETTES';

-                if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy')

-                    $modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

+                if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+                                    $modecompta = 'BOOKKEEPING';
+                }
+                // Not yet implemented. Should be BOOKKEEPINGCOLLECTED

                 if ($modecompta) {

                     if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {

                         /*

@@ -2079,8 +2124,9 @@ 
                     }

                     $i++;

                 }

-            } else

-                dol_print_error($db);

+            } else {
+                            dol_print_error($db);
+            }
             $db->free($resql);

         }

 

@@ -2107,13 +2153,16 @@ 
     //var_dump($menu_array_before);exit;

     //var_dump($menu_array_after);exit;

     $menu_array = $newmenu->liste;

-    if (is_array($menu_array_before))

-        $menu_array = array_merge($menu_array_before, $menu_array);

-    if (is_array($menu_array_after))

-        $menu_array = array_merge($menu_array, $menu_array_after);

+    if (is_array($menu_array_before)) {
+            $menu_array = array_merge($menu_array_before, $menu_array);
+    }
+    if (is_array($menu_array_after)) {
+            $menu_array = array_merge($menu_array, $menu_array_after);
+    }
     //var_dump($menu_array);exit;

-    if (!is_array($menu_array))

-        return 0;

+    if (!is_array($menu_array)) {
+            return 0;
+    }
 

     // TODO Use the position property in menu_array to reorder the $menu_array

     //var_dump($menu_array);

@@ -2135,8 +2184,9 @@ 
         $num = count($menu_array);

         for ($i = 0; $i < $num; $i++) {     // Loop on each menu entry

             $showmenu = true;

-            if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled']))

-                $showmenu = false;

+            if (!empty($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) && empty($menu_array[$i]['enabled'])) {
+                            $showmenu = false;
+            }
 

             // Begin of new left menu block

             if (empty($menu_array[$i]['level']) && $showmenu) {

@@ -2144,8 +2194,9 @@ 
                 $blockvmenuopened = true;

                 $lastopened = true;

                 for ($j = ($i + 1); $j < $num; $j++) {

-                    if (empty($menu_array[$j]['level']))

-                        $lastopened = false;

+                    if (empty($menu_array[$j]['level'])) {
+                                            $lastopened = false;
+                    }
                 }

                 if ($altok % 2 == 0) {

                     print '<div class="blockvmenu blockvmenuimpair' . $invert . ($lastopened ? ' blockvmenulast' : '') . ($altok == 1 ? ' blockvmenufirst' : '') . '">' . "\n";

@@ -2193,19 +2244,20 @@ 
             if ($menu_array[$i]['level'] == 0) {

                 if ($menu_array[$i]['enabled']) {     // Enabled so visible

                     print '<div class="menu_titre">' . $tabstring;

-                    if ($shorturlwithoutparam)

-                        print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

-                    else

-                        print '<span class="vmenu">';

+                    if ($shorturlwithoutparam) {
+                                            print '<a class="vmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';
+                    } else {
+                                            print '<span class="vmenu">';
+                    }
                     print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '') . $menu_array[$i]['titre'];

-                    if ($shorturlwithoutparam)

-                        print '</a>';

-                    else

-                        print '</span>';

+                    if ($shorturlwithoutparam) {
+                                            print '</a>';
+                    } else {
+                                            print '</span>';
+                    }
                     print '</div>' . "\n";

                     $lastlevel0 = 'enabled';

-                }

-                else if ($showmenu) {                 // Not enabled but visible (so greyed)

+                } else if ($showmenu) {                 // Not enabled but visible (so greyed)

                     print '<div class="menu_titre">' . $tabstring . '<font class="vmenudisabled">' . $menu_array[$i]['titre'] . '</font></div>' . "\n";

                     $lastlevel0 = 'greyed';

                 } else {

@@ -2219,34 +2271,38 @@ 
             // Menu level > 0

             if ($menu_array[$i]['level'] > 0) {

                 $cssmenu = '';

-                if ($menu_array[$i]['url'])

-                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));

+                if ($menu_array[$i]['url']) {
+                                    $cssmenu = ' menu_contenu' . dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
+                }
 

                 if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.

                     print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring;

-                    if ($shorturlwithoutparam)

-                        print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';

-                    else

-                        print '<span class="vsmenu">';

+                    if ($shorturlwithoutparam) {
+                                            print '<a class="vsmenu" href="' . $url . '"' . ($menu_array[$i]['target'] ? ' target="' . $menu_array[$i]['target'] . '"' : '') . '>';
+                    } else {
+                                            print '<span class="vsmenu">';
+                    }
                     print $menu_array[$i]['titre'];

-                    if ($shorturlwithoutparam)

-                        print '</a>';

-                    else

-                        print '</span>';

+                    if ($shorturlwithoutparam) {
+                                            print '</a>';
+                    } else {
+                                            print '</span>';
+                    }
                     // If title is not pure text and contains a table, no carriage return added

-                    if (!strstr($menu_array[$i]['titre'], '<table'))

-                        print '<br>';

+                    if (!strstr($menu_array[$i]['titre'], '<table')) {
+                                            print '<br>';
+                    }
                     print '</div>' . "\n";

-                }

-                else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

+                } else if ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.

                     print '<div class="menu_contenu' . $cssmenu . '">' . $tabstring . '<font class="vsmenudisabled vsmenudisabledmargin">' . $menu_array[$i]['titre'] . '</font><br></div>' . "\n";

                 }

             }

 

             // If next is a new block or if there is nothing after

             if (empty($menu_array[$i + 1]['level'])) {               // End menu block

-                if ($showmenu)

-                    print '<div class="menu_end"></div>' . "\n";

+                if ($showmenu) {
+                                    print '<div class="menu_end"></div>' . "\n";
+                }
                 if ($blockvmenuopened) {

                     print '</div>' . "\n";

                     $blockvmenuopened = false;

@@ -2254,8 +2310,10 @@ 
             }

         }

 

-        if ($altok)

-            print '<div class="blockvmenuend"></div>';    // End menu block

+        if ($altok) {
+                    print '<div class="blockvmenuend"></div>';
+        }
+        // End menu block

     }

 

     return count($menu_array);

dolibarr/htdocs/core/class/html.form.class.php

Indentation +22 added lines, -22 removed lines

@@ -1995,28 +1995,28 @@
 

                     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

                     /**

-     * 	Return list of products for a customer

-     *

-     * 	@param      int		$selected           Preselected product

-     * 	@param      string	$htmlname           Name of select html

-     *  @param		string	$filtertype         Filter on product type (''=nofilter, 0=product, 1=service)

-     * 	@param      int		$limit              Limit on number of returned lines

-     * 	@param      int		$price_level        Level of price to show

-     * 	@param      string	$filterkey          Filter on product

-     * 	@param		int		$status             -1=Return all products, 0=Products not on sell, 1=Products on sell

-     *  @param      int		$finished           Filter on finished field: 2=No filter

-     *  @param      int		$outputmode         0=HTML select string, 1=Array

-     *  @param      int		$socid     		    Thirdparty Id (to get also price dedicated to this customer)

-     *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

-     * 	@param		int		$forcecombo		    Force to use combo box

-     *  @param      string  $morecss            Add more css on select

-     *  @param      int     $hidepriceinlabel   1=Hide prices in label

-     *  @param      string  $warehouseStatus    warehouse status filter, following comma separated filter options can be used

-     * 										    'warehouseopen' = select products from open warehouses,

-     * 										    'warehouseclosed' = select products from closed warehouses,

-     * 										    'warehouseinternal' = select products from warehouses for internal correct/transfer only

-     *  @return     array    				    Array of keys for json

-     */

+                     * 	Return list of products for a customer

+                     *

+                     * 	@param      int		$selected           Preselected product

+                     * 	@param      string	$htmlname           Name of select html

+                     *  @param		string	$filtertype         Filter on product type (''=nofilter, 0=product, 1=service)

+                     * 	@param      int		$limit              Limit on number of returned lines

+                     * 	@param      int		$price_level        Level of price to show

+                     * 	@param      string	$filterkey          Filter on product

+                     * 	@param		int		$status             -1=Return all products, 0=Products not on sell, 1=Products on sell

+                     *  @param      int		$finished           Filter on finished field: 2=No filter

+                     *  @param      int		$outputmode         0=HTML select string, 1=Array

+                     *  @param      int		$socid     		    Thirdparty Id (to get also price dedicated to this customer)

+                     *  @param		string	$showempty		    '' to not show empty line. Translation key to show an empty line. '1' show empty line with no text.

+                     * 	@param		int		$forcecombo		    Force to use combo box

+                     *  @param      string  $morecss            Add more css on select

+                     *  @param      int     $hidepriceinlabel   1=Hide prices in label

+                     *  @param      string  $warehouseStatus    warehouse status filter, following comma separated filter options can be used

+                     * 										    'warehouseopen' = select products from open warehouses,

+                     * 										    'warehouseclosed' = select products from closed warehouses,

+                     * 										    'warehouseinternal' = select products from warehouses for internal correct/transfer only

+                     *  @return     array    				    Array of keys for json

+                     */

     function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')

     {

         // phpcs:enable

Spacing +897 added lines, -897 removed lines

@@ -110,13 +110,13 @@ 
         if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;/', $typeofdata)) {

             if (!empty($perm)) {

                 $tmp = explode(':', $typeofdata);

-                $ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

+                $ret .= '<div class="editkey_'.$tmp[0].(!empty($tmp[1]) ? ' '.$tmp[1] : '').'" id="'.$htmlname.'">';

                 if ($fieldrequired)

                     $ret .= '<span class="fieldrequired">';

                 $ret .= $langs->trans($text);

                 if ($fieldrequired)

                     $ret .= '</span>';

-                $ret .= '</div>' . "\n";

+                $ret .= '</div>'."\n";

             }

             else {

                 if ($fieldrequired)

@@ -127,7 +127,7 @@ 
             }

         }

         else {

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

                 $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';

             if ($fieldrequired)

                 $ret .= '<span class="fieldrequired">';

@@ -136,19 +136,19 @@ 
                 $ret .= '</span>';

             if (!empty($notabletag))

                 $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

                 $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

                 $ret .= '<td align="right">';

-            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';

+            if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

+                $ret .= '<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&amp;'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';

             if (!empty($notabletag) && $notabletag == 1)

                 $ret .= ' : ';

             if (!empty($notabletag) && $notabletag == 3)

                 $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

                 $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm)

                 $ret .= '</tr></table>';

         }

 

@@ -187,41 +187,41 @@ 
         if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker

             $ret .= $this->editInPlace($object, $value, $htmlname, $perm, $typeofdata, $editvalue, $extObject, $custommsg);

         } else {

-            if (GETPOST('action', 'aZ09') == 'edit' . $htmlname) {

+            if (GETPOST('action', 'aZ09') == 'edit'.$htmlname) {

                 $ret .= "\n";

-                $ret .= '<form method="post" action="' . $_SERVER["PHP_SELF"] . ($moreparam ? '?' . $moreparam : '') . '">';

-                $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

-                $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-                $ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

+                $ret .= '<form method="post" action="'.$_SERVER["PHP_SELF"].($moreparam ? '?'.$moreparam : '').'">';

+                $ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

+                $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+                $ret .= '<input type="hidden" name="'.$paramid.'" value="'.$object->id.'">';

                 if (empty($notabletag))

                     $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

                 if (empty($notabletag))

                     $ret .= '<tr><td>';

                 if (preg_match('/^(string|email)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

-                    $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

+                    $ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

                 } else if (preg_match('/^(numeric|amount)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $valuetoshow = price2num($editvalue ? $editvalue : $value);

-                    $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($valuetoshow != '' ? price($valuetoshow) : '') . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

+                    $ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ? price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').'>';

                 } else if (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $cols = $tmp[2];

                     $morealt = '';

                     if (preg_match('/%/', $cols)) {

-                        $morealt = ' style="width: ' . $cols . '"';

+                        $morealt = ' style="width: '.$cols.'"';

                         $cols = '';

                     }

 

                     $valuetoshow = ($editvalue ? $editvalue : $value);

 

-                    $ret .= '<textarea id="' . $htmlname . '" name="' . $htmlname . '" wrap="soft" rows="' . ($tmp[1] ? $tmp[1] : '20') . '"' . ($cols ? ' cols="' . $cols . '"' : 'class="quatrevingtpercent"') . $morealt . '">';

+                    $ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'">';

                     $ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));

                     $ret .= '</textarea>';

                 } else if ($typeofdata == 'day' || $typeofdata == 'datepicker') {

-                    $ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form' . $htmlname, 1, 0);

+                    $ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);

                 } else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {

-                    $ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form' . $htmlname, 1, 0);

+                    $ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);

                 } else if (preg_match('/^select;/', $typeofdata)) {

                     $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));

                     foreach ($arraydata as $val) {

@@ -230,8 +230,8 @@ 
                     }

                     $ret .= $this->selectarray($htmlname, $arraylist, $value);

                 } else if (preg_match('/^ckeditor/', $typeofdata)) {

-                    $tmp = explode(':', $typeofdata);  // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols

-                    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+                    $tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols

+                    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

                     $doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), true, true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

                     $ret .= $doleditor->Create(1);

                 }

@@ -241,16 +241,16 @@ 
                 if (empty($notabletag))

                     $ret .= '<td align="left">';

                 //else $ret.='<div class="clearboth"></div>';

-                $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

+                $ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="modify" value="'.$langs->trans("Modify").'">';

                 if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag))

-                    $ret .= '<br>' . "\n";

-                $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

+                    $ret .= '<br>'."\n";

+                $ret .= '<input type="submit" class="button'.(empty($notabletag) ? '' : ' ').'" name="cancel" value="'.$langs->trans("Cancel").'">';

                 if (empty($notabletag))

                     $ret .= '</td>';

 

                 if (empty($notabletag))

-                    $ret .= '</tr></table>' . "\n";

-                $ret .= '</form>' . "\n";

+                    $ret .= '</tr></table>'."\n";

+                $ret .= '</form>'."\n";

             }

             else {

                 if (preg_match('/^(email)/', $typeofdata))

@@ -275,7 +275,7 @@ 
                     if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {

                         $firstline = preg_replace('/<br>.*/', '', $tmpcontent);

                         $firstline = preg_replace('/[\n\r].*/', '', $firstline);

-                        $tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

+                        $tmpcontent = $firstline.((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

                     }

                     $ret .= $tmpcontent;

                 } else

@@ -343,7 +343,7 @@ 
                     $inputOption = $tmp[1];

                 if (!empty($tmp[2]))

                     $savemethod = $tmp[2];

-                $out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

+                $out .= '<input id="width_'.$htmlname.'" value="'.$inputOption.'" type="hidden"/>'."\n";

             }

             else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

                 $tmp = explode(':', $inputType);

@@ -353,7 +353,7 @@ 
                 if (!empty($tmp[2]))

                     $savemethod = $tmp[2];

 

-                $out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

+                $out .= '<input id="timestamp" type="hidden"/>'."\n"; // Use for timestamp format

             }

             else if (preg_match('/^(select|autocomplete)/', $inputType)) {

                 $tmp = explode(':', $inputType);

@@ -381,35 +381,35 @@ 
                     $savemethod = $tmp[4];

 

                 if (!empty($conf->fckeditor->enabled)) {

-                    $out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

+                    $out .= '<input id="ckeditor_toolbar" value="'.$toolbar.'" type="hidden"/>'."\n";

                 } else {

                     $inputType = 'textarea';

                 }

             }

 

-            $out .= '<input id="element_' . $htmlname . '" value="' . $element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

-            $out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

+            $out .= '<input id="element_'.$htmlname.'" value="'.$element.'" type="hidden"/>'."\n";

+            $out .= '<input id="table_element_'.$htmlname.'" value="'.$table_element.'" type="hidden"/>'."\n";

+            $out .= '<input id="fk_element_'.$htmlname.'" value="'.$fk_element.'" type="hidden"/>'."\n";

+            $out .= '<input id="loadmethod_'.$htmlname.'" value="'.$loadmethod.'" type="hidden"/>'."\n";

             if (!empty($savemethod))

-                $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

+                $out .= '<input id="savemethod_'.$htmlname.'" value="'.$savemethod.'" type="hidden"/>'."\n";

             if (!empty($ext_element))

-                $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

+                $out .= '<input id="ext_element_'.$htmlname.'" value="'.$ext_element.'" type="hidden"/>'."\n";

             if (!empty($custommsg)) {

                 if (is_array($custommsg)) {

                     if (!empty($custommsg['success']))

-                        $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

+                        $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg['success'].'" type="hidden"/>'."\n";

                     if (!empty($custommsg['error']))

-                        $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

+                        $out .= '<input id="errormsg_'.$htmlname.'" value="'.$custommsg['error'].'" type="hidden"/>'."\n";

                 } else

-                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

+                    $out .= '<input id="successmsg_'.$htmlname.'" value="'.$custommsg.'" type="hidden"/>'."\n";

             }

             if ($inputType == 'textarea') {

-                $out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

-                $out .= '<input id="textarea_' . $htmlname . '_cols" value="' . $cols . '" type="hidden"/>' . "\n";

+                $out .= '<input id="textarea_'.$htmlname.'_rows" value="'.$rows.'" type="hidden"/>'."\n";

+                $out .= '<input id="textarea_'.$htmlname.'_cols" value="'.$cols.'" type="hidden"/>'."\n";

             }

-            $out .= '<span id="viewval_' . $htmlname . '" class="viewval_' . $inputType . ($button_only ? ' inactive' : ' active') . '">' . $value . '</span>' . "\n";

-            $out .= '<span id="editval_' . $htmlname . '" class="editval_' . $inputType . ($button_only ? ' inactive' : ' active') . ' hideobject">' . (!empty($editvalue) ? $editvalue : $value) . '</span>' . "\n";

+            $out .= '<span id="viewval_'.$htmlname.'" class="viewval_'.$inputType.($button_only ? ' inactive' : ' active').'">'.$value.'</span>'."\n";

+            $out .= '<span id="editval_'.$htmlname.'" class="editval_'.$inputType.($button_only ? ' inactive' : ' active').' hideobject">'.(!empty($editvalue) ? $editvalue : $value).'</span>'."\n";

         } else {

             $out = $value;

         }

@@ -441,7 +441,7 @@ 
         global $conf;

 

         if ($incbefore)

-            $text = $incbefore . $text;

+            $text = $incbefore.$text;

         if (!$htmltext)

             return $text;

 

@@ -457,11 +457,11 @@ 
 

         $extrastyle = '';

         if ($direction < 0) {

-            $extracss = ($extracss ? $extracss . ' ' : '') . 'inline-block';

+            $extracss = ($extracss ? $extracss.' ' : '').'inline-block';

             $extrastyle = 'padding: 0px; padding-left: 3px !important;';

         }

         if ($direction > 0) {

-            $extracss = ($extracss ? $extracss . ' ' : '') . 'inline-block';

+            $extracss = ($extracss ? $extracss.' ' : '').'inline-block';

             $extrastyle = 'padding: 0px; padding-right: 3px !important;';

         }

 

@@ -474,46 +474,46 @@ 
             $htmltext = str_replace('"', "&quot;", $htmltext);

         } else {

             $classfortooltip = 'classfortooltiponclick';

-            $textfordialog .= '<div style="display: none;" id="idfortooltiponclick_' . $tooltiptrigger . '" class="classfortooltiponclicktext">' . $htmltext . '</div>';

+            $textfordialog .= '<div style="display: none;" id="idfortooltiponclick_'.$tooltiptrigger.'" class="classfortooltiponclicktext">'.$htmltext.'</div>';

         }

         if ($tooltipon == 2 || $tooltipon == 3) {

-            $paramfortooltipimg = ' class="' . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';

+            $paramfortooltipimg = ' class="'.$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'"';

             if ($tooltiptrigger == '')

-                $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip

+                $paramfortooltipimg .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip

             else

-                $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';

+                $paramfortooltipimg .= ' dolid="'.$tooltiptrigger.'"';

         } else

-            $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            $paramfortooltipimg = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

         if ($tooltipon == 1 || $tooltipon == 3) {

-            $paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';

+            $paramfortooltiptd = ' class="'.($tooltipon == 3 ? 'cursorpointer ' : '').$classfortooltip.' inline-block'.($extracss ? ' '.$extracss : '').'" style="padding: 0px;'.($extrastyle ? ' '.$extrastyle : '').'" ';

             if ($tooltiptrigger == '')

-                $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip

+                $paramfortooltiptd .= ' title="'.($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on td tag to store tooltip

             else

-                $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';

+                $paramfortooltiptd .= ' dolid="'.$tooltiptrigger.'"';

         } else

-            $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            $paramfortooltiptd = ($extracss ? ' class="'.$extracss.'"' : '').($extrastyle ? ' style="'.$extrastyle.'"' : ''); // Attribut to put on td text tag

         if (empty($notabs))

             $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';

         elseif ($notabs == 2)

-            $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';

+            $s .= '<div class="inline-block'.($forcenowrap ? ' nowrap' : '').'">';

         // Define value if value is before

         if ($direction < 0) {

-            $s .= '<' . $tag . $paramfortooltipimg;

+            $s .= '<'.$tag.$paramfortooltipimg;

             if ($tag == 'td') {

                 $s .= ' valign="top" width="14"';

             }

-            $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

+            $s .= '>'.$textfordialog.$img.'</'.$tag.'>';

         }

         // Use another method to help avoid having a space in value in order to use this value with jquery

         // Define label

         if ((string) $text != '')

-            $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';

+            $s .= '<'.$tag.$paramfortooltiptd.'>'.$text.'</'.$tag.'>';

         // Define value if value is after

         if ($direction > 0) {

-            $s .= '<' . $tag . $paramfortooltipimg;

+            $s .= '<'.$tag.$paramfortooltipimg;

             if ($tag == 'td')

                 $s .= ' valign="middle" width="14"';

-            $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

+            $s .= '>'.$textfordialog.$img.'</'.$tag.'>';

         }

         if (empty($notabs))

             $s .= '</tr></table>';

@@ -605,15 +605,15 @@ 
 

         $disabled = 0;

         $ret = '<div class="centpercent center">';

-        $ret .= '<select class="flat' . (empty($conf->use_javascript_ajax) ? '' : ' hideobject') . ' massaction massactionselect" name="massaction"' . ($disabled ? ' disabled="disabled"' : '') . '>';

+        $ret .= '<select class="flat'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionselect" name="massaction"'.($disabled ? ' disabled="disabled"' : '').'>';

 

         // Complete list with data from external modules. THe module can use $_SERVER['PHP_SELF'] to know on which page we are, or use the $parameters['currentcontext'] completed by executeHooks.

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('addMoreMassActions', $parameters); // Note that $action and $object may have been modified by hook

         if (empty($reshook)) {

-            $ret .= '<option value="0"' . ($disabled ? ' disabled="disabled"' : '') . '>-- ' . $langs->trans("SelectAction") . ' --</option>';

+            $ret .= '<option value="0"'.($disabled ? ' disabled="disabled"' : '').'>-- '.$langs->trans("SelectAction").' --</option>';

             foreach ($arrayofaction as $code => $label) {

-                $ret .= '<option value="' . $code . '"' . ($disabled ? ' disabled="disabled"' : '') . '>' . $label . '</option>';

+                $ret .= '<option value="'.$code.'"'.($disabled ? ' disabled="disabled"' : '').'>'.$label.'</option>';

             }

         }

         $ret .= $hookmanager->resPrint;

@@ -621,7 +621,7 @@ 
         $ret .= '</select>';

         // Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button

         $ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.

-        $ret .= '<input type="submit" disabled name="confirmmassaction" class="button' . (empty($conf->use_javascript_ajax) ? '' : ' hideobject') . ' massaction massactionconfirmed" value="' . dol_escape_htmltag($langs->trans("Confirm")) . '">';

+        $ret .= '<input type="submit" disabled name="confirmmassaction" class="button'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' massaction massactionconfirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';

         $ret .= '</div>';

 

         if (!empty($conf->use_javascript_ajax)) {

@@ -635,11 +635,11 @@ 
     	  				if ($(this).is(\':checked\')) atleastoneselected++;

     	  			});

 					console.log("initCheckForSelect mode="+mode+" atleastoneselected="+atleastoneselected);

-    	  			if (atleastoneselected || ' . $alwaysvisible . ')

+    	  			if (atleastoneselected || ' . $alwaysvisible.')

     	  			{

     	  				jQuery(".massaction").show();

-        			    ' . ($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("' . $selected . '"); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '') . '

-        			    ' . ($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0"); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '') . '

+        			    ' . ($selected ? 'if (atleastoneselected) { jQuery(".massactionselect").val("'.$selected.'"); jQuery(".massactionconfirmed").prop(\'disabled\', false); }' : '').'

+        			    ' . ($selected ? 'if (! atleastoneselected) { jQuery(".massactionselect").val("0"); jQuery(".massactionconfirmed").prop(\'disabled\', true); } ' : '').'

     	  			}

     	  			else

     	  			{

@@ -708,14 +708,14 @@ 
         $atleastonefavorite = 0;

 

         $sql = "SELECT rowid, code as code_iso, code_iso as code_iso3, label, favorite";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_country";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_country";

         $sql .= " WHERE active > 0";

         //$sql.= " ORDER BY code ASC";

 

-        dol_syslog(get_class($this) . "::select_country", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_country", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            $out .= '<select id="select' . $htmlname . '" class="flat maxwidth200onsmartphone selectcountry' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" ' . $htmloption . '>';

+            $out .= '<select id="select'.$htmlname.'" class="flat maxwidth200onsmartphone selectcountry'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" '.$htmloption.'>';

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -726,7 +726,7 @@ 
                     $countryArray[$i]['rowid'] = $obj->rowid;

                     $countryArray[$i]['code_iso'] = $obj->code_iso;

                     $countryArray[$i]['code_iso3'] = $obj->code_iso3;

-                    $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country" . $obj->code_iso) != "Country" . $obj->code_iso ? $langs->transnoentitiesnoconv("Country" . $obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

+                    $countryArray[$i]['label'] = ($obj->code_iso && $langs->transnoentitiesnoconv("Country".$obj->code_iso) != "Country".$obj->code_iso ? $langs->transnoentitiesnoconv("Country".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));

                     $countryArray[$i]['favorite'] = $obj->favorite;

                     $favorite[$i] = $obj->favorite;

                     $label[$i] = dol_string_unaccent($countryArray[$i]['label']);

@@ -739,16 +739,16 @@ 
                     $countryArray = dol_sort_array($countryArray, 'label');

 

                 if ($showempty) {

-                    $out .= '<option value="">&nbsp;</option>' . "\n";

+                    $out .= '<option value="">&nbsp;</option>'."\n";

                 }

 

                 if ($addspecialentries) { // Add dedicated entries for groups of countries

                     //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

-                    $out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-                    $out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

+                    $out .= '<option value="special_allnotme"'.($selected == 'special_allnotme' ? ' selected' : '').'>'.$langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+                    $out .= '<option value="special_eec"'.($selected == 'special_eec' ? ' selected' : '').'>'.$langs->trans("CountriesInEEC").'</option>';

                     if ($mysoc->isInEEC())

-                        $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

-                    $out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

+                        $out .= '<option value="special_eecnotme"'.($selected == 'special_eecnotme' ? ' selected' : '').'>'.$langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country".$mysoc->country_code)).'</option>';

+                    $out .= '<option value="special_noteec"'.($selected == 'special_noteec' ? ' selected' : '').'>'.$langs->trans("CountriesNotInEEC").'</option>';

                     $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                 }

 

@@ -765,16 +765,16 @@ 
                     }

                     if ($selected && $selected != '-1' && ($selected == $row['rowid'] || $selected == $row['code_iso'] || $selected == $row['code_iso3'] || $selected == $row['label'])) {

                         $foundselected = true;

-                        $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '" selected>';

+                        $out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'" selected>';

                     } else {

-                        $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '">';

+                        $out .= '<option value="'.($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']).'">';

                     }

                     if ($row['label'])

                         $out .= dol_trunc($row['label'], $maxlength, 'middle');

                     else

                         $out .= '&nbsp;';

                     if ($row['code_iso'])

-                        $out .= ' (' . $row['code_iso'] . ')';

+                        $out .= ' ('.$row['code_iso'].')';

                     $out .= '</option>';

                 }

             }

@@ -785,8 +785,8 @@ 
         }

 

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

-        $out .= ajax_combobox('select' . $htmlname);

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

+        $out .= ajax_combobox('select'.$htmlname);

 

         return $out;

     }

@@ -815,25 +815,25 @@ 
         $incotermArray = array();

 

         $sql = "SELECT rowid, code";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_incoterms";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_incoterms";

         $sql .= " WHERE active > 0";

         $sql .= " ORDER BY code ASC";

 

-        dol_syslog(get_class($this) . "::select_incoterm", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_incoterm", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             if ($conf->use_javascript_ajax && !$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events);

             }

 

             if (!empty($page)) {

-                $out .= '<form method="post" action="' . $page . '">';

+                $out .= '<form method="post" action="'.$page.'">';

                 $out .= '<input type="hidden" name="action" value="set_incoterms">';

-                $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+                $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             }

 

-            $out .= '<select id="' . $htmlname . '" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="' . $htmlname . '" ' . $htmloption . '>';

+            $out .= '<select id="'.$htmlname.'" class="flat selectincoterm minwidth100imp noenlargeonsmartphone" name="'.$htmlname.'" '.$htmloption.'>';

             $out .= '<option value="0">&nbsp;</option>';

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -849,9 +849,9 @@ 
 

                 foreach ($incotermArray as $row) {

                     if ($selected && ($selected == $row['rowid'] || $selected == $row['code'])) {

-                        $out .= '<option value="' . $row['rowid'] . '" selected>';

+                        $out .= '<option value="'.$row['rowid'].'" selected>';

                     } else {

-                        $out .= '<option value="' . $row['rowid'] . '">';

+                        $out .= '<option value="'.$row['rowid'].'">';

                     }

 

                     if ($row['code'])

@@ -862,10 +862,10 @@ 
             }

             $out .= '</select>';

 

-            $out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="' . $location_incoterms . '">';

+            $out .= '<input id="location_incoterms" class="maxwidth100onsmartphone" name="location_incoterms" value="'.$location_incoterms.'">';

 

             if (!empty($page)) {

-                $out .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '"></form>';

+                $out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'"></form>';

             }

         } else {

             dol_print_error($this->db);

@@ -894,8 +894,8 @@ 
         // If product & services are enabled or both disabled.

         if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled)) || (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled))) {

             if (empty($hidetext))

-                print $langs->trans("Type") . ': ';

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+                print $langs->trans("Type").': ';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($showempty) {

                 print '<option value="-1"';

                 if ($selected == -1)

@@ -906,26 +906,26 @@ 
             print '<option value="0"';

             if (0 == $selected)

                 print ' selected';

-            print '>' . $langs->trans("Product");

+            print '>'.$langs->trans("Product");

 

             print '<option value="1"';

             if (1 == $selected)

                 print ' selected';

-            print '>' . $langs->trans("Service");

+            print '>'.$langs->trans("Service");

 

             print '</select>';

             //if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);

         }

         if ((empty($forceall) && empty($conf->product->enabled) && !empty($conf->service->enabled)) || $forceall == 3) {

             print $langs->trans("Service");

-            print '<input type="hidden" name="' . $htmlname . '" value="1">';

+            print '<input type="hidden" name="'.$htmlname.'" value="1">';

         }

         if ((empty($forceall) && !empty($conf->product->enabled) && empty($conf->service->enabled)) || $forceall == 2) {

             print $langs->trans("Product");

-            print '<input type="hidden" name="' . $htmlname . '" value="0">';

+            print '<input type="hidden" name="'.$htmlname.'" value="0">';

         }

         if ($forceall < 0) { // This should happened only for contracts when both predefined product and service are disabled.

-            print '<input type="hidden" name="' . $htmlname . '" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

+            print '<input type="hidden" name="'.$htmlname.'" value="1">'; // By default we set on service for contract. If CONTRACT_SUPPORT_PRODUCTS is set, forceall should be 1 not -1

         }

     }

 

@@ -942,14 +942,14 @@ 
 

         $num = count($this->cache_types_fees);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $langs->load("trips");

 

         $sql = "SELECT c.code, c.label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_type_fees as c";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -989,11 +989,11 @@ 
         // phpcs:enable

         global $user, $langs;

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

         $this->load_cache_types_fees();

 

-        print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

+        print '<select id="select_'.$htmlname.'" class="flat" name="'.$htmlname.'">';

         if ($showempty) {

             print '<option value="-1"';

             if ($selected == -1)

@@ -1002,7 +1002,7 @@ 
         }

 

         foreach ($this->cache_types_fees as $key => $value) {

-            print '<option value="' . $key . '"';

+            print '<option value="'.$key.'"';

             if ($key == $selected)

                 print ' selected';

             print '>';

@@ -1065,25 +1065,25 @@ 
             // No immediate load of all database

             $placeholder = '';

             if ($selected && empty($selected_input_value)) {

-                require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

                 $societetmp = new Societe($this->db);

                 $societetmp->fetch($selected);

                 $selected_input_value = $societetmp->name;

                 unset($societetmp);

             }

             // mode 1

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&filter=' . $filter . ($showtype ? '&showtype=' . $showtype : '');

-            $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&filter='.$filter.($showtype ? '&showtype='.$showtype : '');

+            $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

             if (empty($hidelabel))

-                print $langs->trans("RefOrLabel") . ' : ';

+                print $langs->trans("RefOrLabel").' : ';

             else if ($hidelabel > 1) {

-                $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

+                $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

                 if ($hidelabel == 2) {

                     $out .= img_picto($langs->trans("Search"), 'search');

                 }

             }

-            $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';

+            $out .= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->THIRDPARTY_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

             if ($hidelabel == 3) {

                 $out .= img_picto($langs->trans("Search"), 'search');

             }

@@ -1144,20 +1144,20 @@ 
             $sql .= " , dictp.code as country_code";

         }

 

-        $sql .= " FROM (" . MAIN_DB_PREFIX . "societe as s";

+        $sql .= " FROM (".MAIN_DB_PREFIX."societe as s";

         if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+            $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         $sql .= " )";

         if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

-            $sql .= " LEFT OUTER JOIN " . MAIN_DB_PREFIX . "c_country as dictp ON dictp.rowid=s.fk_pays";

+            $sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";

         }

-        $sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

+        $sql .= " WHERE s.entity IN (".getEntity('societe').")";

         if (!empty($user->socid))

-            $sql .= " AND s.rowid = " . $user->socid;

+            $sql .= " AND s.rowid = ".$user->socid;

         if ($filter)

-            $sql .= " AND (" . $filter . ")";

+            $sql .= " AND (".$filter.")";

         if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

         if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX))

             $sql .= " AND s.status <> 0";

         // Add criteria

@@ -1172,31 +1172,31 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

+                $sql .= "(s.nom LIKE '".$this->db->escape($prefix.$crit)."%')";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty($conf->barcode->enabled)) {

-                $sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             }

-            $sql .= " OR s.code_client LIKE '" . $this->db->escape($prefix . $filterkey) . "%' OR s.code_fournisseur LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+            $sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             $sql .= ")";

         }

         $sql .= $this->db->order("nom", "ASC");

         $sql .= $this->db->plimit($limit, 0);

 

         // Build output string

-        dol_syslog(get_class($this) . "::select_thirdparty_list", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_thirdparty_list", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events, $conf->global->COMPANY_USE_SEARCH_TO_SELECT);

             }

 

             // Construct $out and $outarray

-            $out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparam ? ' ' . $moreparam : '') . ' name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . '>' . "\n";

+            $out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparam ? ' '.$moreparam : '').' name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";

 

             $textifempty = '';

             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

@@ -1208,7 +1208,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+                $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -1218,18 +1218,18 @@ 
                     $label = '';

                     if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {

                         if (($obj->client) && (!empty($obj->code_client))) {

-                            $label = $obj->code_client . ' - ';

+                            $label = $obj->code_client.' - ';

                         }

                         if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {

-                            $label .= $obj->code_fournisseur . ' - ';

+                            $label .= $obj->code_fournisseur.' - ';

                         }

-                        $label .= ' ' . $obj->name;

+                        $label .= ' '.$obj->name;

                     } else {

                         $label = $obj->name;

                     }

 

                     if (!empty($obj->name_alias)) {

-                        $label .= ' (' . $obj->name_alias . ')';

+                        $label .= ' ('.$obj->name_alias.')';

                     }

 

                     if ($showtype) {

@@ -1238,25 +1238,25 @@ 
                         if ($obj->client == 1 || $obj->client == 3)

                             $label .= $langs->trans("Customer");

                         if ($obj->client == 2 || $obj->client == 3)

-                            $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

+                            $label .= ($obj->client == 3 ? ', ' : '').$langs->trans("Prospect");

                         if ($obj->fournisseur)

-                            $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

+                            $label .= ($obj->client ? ', ' : '').$langs->trans("Supplier");

                         if ($obj->client || $obj->fournisseur)

                             $label .= ')';

                     }

 

                     if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

-                        $label .= '-' . $obj->address . '-' . $obj->zip . ' ' . $obj->town;

+                        $label .= '-'.$obj->address.'-'.$obj->zip.' '.$obj->town;

                         if (!empty($obj->country_code)) {

-                            $label .= ' ' . $langs->trans('Country' . $obj->country_code);

+                            $label .= ' '.$langs->trans('Country'.$obj->country_code);

                         }

                     }

 

                     if (empty($outputmode)) {

                         if (in_array($obj->rowid, $selected)) {

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

                         } else {

-                            $out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

                         }

                     } else {

                         array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label));

@@ -1267,7 +1267,7 @@ 
                         $out .= "\n";

                 }

             }

-            $out .= '</select>' . "\n";

+            $out .= '</select>'."\n";

         }

         else {

             dol_print_error($this->db);

@@ -1299,17 +1299,17 @@ 
         // On recherche les remises

         $sql = "SELECT re.rowid, re.amount_ht, re.amount_tva, re.amount_ttc,";

         $sql .= " re.description, re.fk_facture_source";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";

-        $sql .= " WHERE re.fk_soc = " . (int) $socid;

-        $sql .= " AND re.entity = " . $conf->entity;

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as re";

+        $sql .= " WHERE re.fk_soc = ".(int) $socid;

+        $sql .= " AND re.entity = ".$conf->entity;

         if ($filter)

-            $sql .= " AND " . $filter;

+            $sql .= " AND ".$filter;

         $sql .= " ORDER BY re.description ASC";

 

-        dol_syslog(get_class($this) . "::select_remises", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_remises", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            print '<select id="select_' . $htmlname . '" class="flat maxwidthonsmartphone" name="' . $htmlname . '">';

+            print '<select id="select_'.$htmlname.'" class="flat maxwidthonsmartphone" name="'.$htmlname.'">';

             $num = $this->db->num_rows($resql);

 

             $qualifiedlines = $num;

@@ -1342,10 +1342,10 @@ 
                     if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {

                         $tmpfac = new Facture($this->db);

                         if ($tmpfac->fetch($obj->fk_facture_source) > 0)

-                            $desc = $desc . ' - ' . $tmpfac->ref;

+                            $desc = $desc.' - '.$tmpfac->ref;

                     }

 

-                    print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

+                    print '<option value="'.$obj->rowid.'"'.$selectstring.$disabled.'>'.$desc.' ('.price($obj->amount_ht).' '.$langs->trans("HT").' - '.price($obj->amount_ttc).' '.$langs->trans("TTC").')</option>';

                     $i++;

                 }

             }

@@ -1425,7 +1425,7 @@ 
         $out = '';

 

         if (!is_object($hookmanager)) {

-            include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';

             $hookmanager = new HookManager($this->db);

         }

 

@@ -1433,36 +1433,36 @@ 
         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

         if ($showsoc > 0)

             $sql .= " , s.nom as company";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp";

+        $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";

         if ($showsoc > 0)

-            $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";

-        $sql .= " WHERE sp.entity IN (" . getEntity('socpeople') . ")";

+            $sql .= " LEFT OUTER JOIN  ".MAIN_DB_PREFIX."societe as s ON s.rowid=sp.fk_soc";

+        $sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";

         if ($socid > 0 || $socid == -1)

-            $sql .= " AND sp.fk_soc=" . $socid;

+            $sql .= " AND sp.fk_soc=".$socid;

         if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX))

             $sql .= " AND sp.statut <> 0";

         $sql .= " ORDER BY sp.lastname ASC";

 

-        dol_syslog(get_class($this) . "::select_contacts", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $num = $this->db->num_rows($resql);

 

             if ($conf->use_javascript_ajax && !$forcecombo && !$options_only) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);

             }

 

             if ($htmlname != 'none' || $options_only)

-                $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

+                $out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';

             if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

+                $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>&nbsp;</option>';

             if ($showempty == 2)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';

+                $out .= '<option value="0"'.(in_array(0, $selected) ? ' selected' : '').'>'.$langs->trans("Internal").'</option>';

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

-                include_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

                 $contactstatic = new Contact($this->db);

 

                 while ($i < $num) {

@@ -1479,27 +1479,27 @@ 
                             if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto))

                                 $disabled = 1;

                             if (!empty($selected) && in_array($obj->rowid, $selected)) {

-                                $out .= '<option value="' . $obj->rowid . '"';

+                                $out .= '<option value="'.$obj->rowid.'"';

                                 if ($disabled)

                                     $out .= ' disabled';

                                 $out .= ' selected>';

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                                 $out .= '</option>';

                             }

                             else {

-                                $out .= '<option value="' . $obj->rowid . '"';

+                                $out .= '<option value="'.$obj->rowid.'"';

                                 if ($disabled)

                                     $out .= ' disabled';

                                 $out .= '>';

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                                 $out .= '</option>';

                             }

                         }

@@ -1507,9 +1507,9 @@ 
                             if (in_array($obj->rowid, $selected)) {

                                 $out .= $contactstatic->getFullName($langs);

                                 if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

+                                    $out .= ' ('.$obj->poste.')';

                                 if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                    $out .= ' - ('.$obj->company.')';

                             }

                         }

                     }

@@ -1517,7 +1517,7 @@ 
                 }

             }

             else {

-                $out .= '<option value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled>';

+                $out .= '<option value="-1"'.(($showempty == 2 || $multiple) ? '' : ' selected').' disabled>';

                 $out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

                 $out .= '</option>';

             }

@@ -1531,7 +1531,7 @@ 
                 'showsoc' => $showsoc,

             );

 

-            $reshook = $hookmanager->executeHooks('afterSelectContactOptions', $parameters, $this, $action);    // Note that $action and $object may have been modified by some hooks

+            $reshook = $hookmanager->executeHooks('afterSelectContactOptions', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks

 

             if ($htmlname != 'none' || $options_only) {

                 $out .= '</select>';

@@ -1630,33 +1630,33 @@ 
         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= ", e.label";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

+        $sql .= " FROM ".MAIN_DB_PREFIX."user as u";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=u.entity";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=u.entity";

             if ($force_entity)

-                $sql .= " WHERE u.entity IN (0," . $force_entity . ")";

+                $sql .= " WHERE u.entity IN (0,".$force_entity.")";

             else

                 $sql .= " WHERE u.entity IS NOT NULL";

         }

         else {

             if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

-                $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ug";

+                $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ug";

                 $sql .= " ON ug.fk_user = u.rowid";

-                $sql .= " WHERE ug.entity = " . $conf->entity;

+                $sql .= " WHERE ug.entity = ".$conf->entity;

             } else {

-                $sql .= " WHERE u.entity IN (0," . $conf->entity . ")";

+                $sql .= " WHERE u.entity IN (0,".$conf->entity.")";

             }

         }

         if (!empty($user->societe_id))

-            $sql .= " AND u.fk_soc = " . $user->societe_id;

+            $sql .= " AND u.fk_soc = ".$user->societe_id;

         if (is_array($exclude) && $excludeUsers)

-            $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";

+            $sql .= " AND u.rowid NOT IN (".$excludeUsers.")";

         if ($includeUsers)

-            $sql .= " AND u.rowid IN (" . $includeUsers . ")";

+            $sql .= " AND u.rowid IN (".$includeUsers.")";

         if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive)

             $sql .= " AND u.statut <> 0";

         if (!empty($morefilter))

-            $sql .= " " . $morefilter;

+            $sql .= " ".$morefilter;

 

         if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

             $sql .= " ORDER BY u.firstname ASC";

@@ -1664,22 +1664,22 @@ 
             $sql .= " ORDER BY u.lastname ASC";

         }

 

-        dol_syslog(get_class($this) . "::select_dolusers", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_dolusers", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

                 // Enhance with select2

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname);

 

                 // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined

-                $out .= '<select class="flat' . ($morecss ? ' minwidth100 ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

+                $out .= '<select class="flat'.($morecss ? ' minwidth100 '.$morecss : ' minwidth200').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

                 if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                    $out .= '<option value="-1"'.((empty($selected) || in_array(-1, $selected)) ? ' selected' : '').'>&nbsp;</option>'."\n";

                 if ($show_every)

-                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

+                    $out .= '<option value="-2"'.((in_array(-2, $selected)) ? ' selected' : '').'>-- '.$langs->trans("Everybody").' --</option>'."\n";

 

                 $userstatic = new User($this->db);

 

@@ -1694,14 +1694,14 @@ 
                     if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

                         $disableline = ($enableonlytext ? $enableonlytext : '1');

 

-                    if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected) )) {

-                        $out .= '<option value="' . $obj->rowid . '"';

+                    if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected))) {

+                        $out .= '<option value="'.$obj->rowid.'"';

                         if ($disableline)

                             $out .= ' disabled';

                         $out .= ' selected>';

                     }

                     else {

-                        $out .= '<option value="' . $obj->rowid . '"';

+                        $out .= '<option value="'.$obj->rowid.'"';

                         if ($disableline)

                             $out .= ' disabled';

                         $out .= '>';

@@ -1717,31 +1717,31 @@ 
                     // Complete name with more info

                     $moreinfo = 0;

                     if (!empty($conf->global->MAIN_SHOW_LOGIN)) {

-                        $out .= ($moreinfo ? ' - ' : ' (') . $obj->login;

+                        $out .= ($moreinfo ? ' - ' : ' (').$obj->login;

                         $moreinfo++;

                     }

                     if ($showstatus >= 0) {

                         if ($obj->statut == 1 && $showstatus == 1) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Enabled');

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Enabled');

                             $moreinfo++;

                         }

                         if ($obj->statut == 0) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans('Disabled');

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans('Disabled');

                             $moreinfo++;

                         }

                     }

                     if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1 && $user->admin && !$user->entity) {

                         if (!$obj->entity) {

-                            $out .= ($moreinfo ? ' - ' : ' (') . $langs->trans("AllEntities");

+                            $out .= ($moreinfo ? ' - ' : ' (').$langs->trans("AllEntities");

                             $moreinfo++;

                         } else {

-                            $out .= ($moreinfo ? ' - ' : ' (') . ($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

+                            $out .= ($moreinfo ? ' - ' : ' (').($obj->label ? $obj->label : $langs->trans("EntityNameNotDefined"));

                             $moreinfo++;

                         }

                     }

                     $out .= ($moreinfo ? ')' : '');

                     if ($disableline && $disableline != '1') {

-                        $out .= ' - ' . $disableline; // This is text from $enableonlytext parameter

+                        $out .= ' - '.$disableline; // This is text from $enableonlytext parameter

                     }

                     $out .= '</option>';

                     $outarray[$userstatic->id] = $userstatic->getFullName($langs, $fullNameMode, -1, $maxlength);

@@ -1749,8 +1749,8 @@ 
                     $i++;

                 }

             } else {

-                $out .= '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '" disabled>';

-                $out .= '<option value="">' . $langs->trans("None") . '</option>';

+                $out .= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'" disabled>';

+                $out .= '<option value="">'.$langs->trans("None").'</option>';

             }

             $out .= '</select>';

         } else {

@@ -1801,7 +1801,7 @@ 
             $out .= '<input type="hidden" class="removedassignedhidden" name="removedassigned" value="">';

             $out .= '<script type="text/javascript" language="javascript">jQuery(document).ready(function () {    jQuery(".removedassigned").click(function() {        jQuery(".removedassignedhidden").val(jQuery(this).val());    });})</script>';

             $out .= $this->select_dolusers('', $htmlname, $show_empty, $exclude, $disabled, $include, $enableonly, $force_entity, $maxlength, $showstatus, $morefilter);

-            $out .= ' <input type="submit" class="button valignmiddle" name="' . $action . 'assignedtouser" value="' . dol_escape_htmltag($langs->trans("Add")) . '">';

+            $out .= ' <input type="submit" class="button valignmiddle" name="'.$action.'assignedtouser" value="'.dol_escape_htmltag($langs->trans("Add")).'">';

             $out .= '<br>';

         }

         $assignedtouser = array();

@@ -1825,16 +1825,16 @@ 
             $out .= $userstatic->getNomUrl(-1);

             if ($i == 0) {

                 $ownerid = $value['id'];

-                $out .= ' (' . $langs->trans("Owner") . ')';

+                $out .= ' ('.$langs->trans("Owner").')';

             }

             if ($nbassignetouser > 1 && $action != 'view') {

-                $out .= ' <input type="image" style="border: 0px;" src="' . img_picto($langs->trans("Remove"), 'delete', '', 0, 1) . '" value="' . $userstatic->id . '" class="removedassigned" id="removedassigned_' . $userstatic->id . '" name="removedassigned_' . $userstatic->id . '">';

+                $out .= ' <input type="image" style="border: 0px;" src="'.img_picto($langs->trans("Remove"), 'delete', '', 0, 1).'" value="'.$userstatic->id.'" class="removedassigned" id="removedassigned_'.$userstatic->id.'" name="removedassigned_'.$userstatic->id.'">';

             }

             // Show my availability

             if ($showproperties) {

                 if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {

                     $out .= '<div class="myavailability inline-block">';

-                    $out .= '&nbsp;-&nbsp;<span class="opacitymedium">' . $langs->trans("Availability") . ':</span>  <input id="transparency" class="marginleftonly marginrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofuserid[$ownerid]['transparency'] ? ' checked' : '') . '>' . $langs->trans("Busy");

+                    $out .= '&nbsp;-&nbsp;<span class="opacitymedium">'.$langs->trans("Availability").':</span>  <input id="transparency" class="marginleftonly marginrightonly" '.($action == 'view' ? 'disabled' : '').' type="checkbox" name="transparency"'.($listofuserid[$ownerid]['transparency'] ? ' checked' : '').'>'.$langs->trans("Busy");

                     $out .= '</div>';

                 }

             }

@@ -1888,19 +1888,19 @@ 
             $placeholder = '';

 

             if ($selected && empty($selected_input_value)) {

-                require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

                 $producttmpselect = new Product($this->db);

                 $producttmpselect->fetch($selected);

                 $selected_input_value = $producttmpselect->ref;

                 unset($producttmpselect);

             }

             // mode=1 means customers products

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=1&status=' . $status . '&finished=' . $finished . '&hidepriceinlabel=' . $hidepriceinlabel . '&warehousestatus=' . $warehouseStatus;

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;

             //Price by customer

             if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

-                $urloption .= '&socid=' . $socid;

+                $urloption .= '&socid='.$socid;

             }

-            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

 

             if (!empty($conf->variants->enabled)) {

 

@@ -1977,14 +1977,14 @@ 
                                 <?php

                             }

                             if (empty($hidelabel))

-                                print $langs->trans("RefOrLabel") . ' : ';

+                                print $langs->trans("RefOrLabel").' : ';

                             else if ($hidelabel > 1) {

-                                $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

+                                $placeholder = ' placeholder="'.$langs->trans("RefOrLabel").'"';

                                 if ($hidelabel == 2) {

                                     print img_picto($langs->trans("Search"), 'search');

                                 }

                             }

-                            print '<input type="text" class="minwidth100" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '"' . $placeholder . ' ' . (!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '') . ' />';

+                            print '<input type="text" class="minwidth100" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' '.(!empty($conf->global->PRODUCT_SEARCH_AUTOFOCUS) ? 'autofocus' : '').' />';

                             if ($hidelabel == 3) {

                                 print img_picto($langs->trans("Search"), 'search');

                             }

@@ -2027,7 +2027,7 @@ 
 

         $warehouseStatusArray = array();

         if (!empty($warehouseStatus)) {

-            require_once DOL_DOCUMENT_ROOT . '/product/stock/class/entrepot.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';

             if (preg_match('/warehouseclosed/', $warehouseStatus)) {

                 $warehouseStatusArray[] = Entrepot::STATUS_CLOSED;

             }

@@ -2043,13 +2043,13 @@ 
         (count($warehouseStatusArray)) ? $selectFieldsGrouped = ", sum(ps.reel) as stock" : $selectFieldsGrouped = ", p.stock";

 

         $sql = "SELECT ";

-        $sql .= $selectFields . $selectFieldsGrouped;

+        $sql .= $selectFields.$selectFieldsGrouped;

 

         if (!empty($conf->global->PRODUCT_SORT_BY_CATEGORY)) {

             //Product category

-            $sql .= ", (SELECT " . MAIN_DB_PREFIX . "categorie_product.fk_categorie

-						FROM " . MAIN_DB_PREFIX . "categorie_product

-						WHERE " . MAIN_DB_PREFIX . "categorie_product.fk_product=p.rowid

+            $sql .= ", (SELECT ".MAIN_DB_PREFIX."categorie_product.fk_categorie

+						FROM " . MAIN_DB_PREFIX."categorie_product

+						WHERE " . MAIN_DB_PREFIX."categorie_product.fk_product=p.rowid

 						LIMIT 1

 				) AS categorie_product_id ";

         }

@@ -2068,45 +2068,45 @@ 
         }

         // Price by quantity

         if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {

-            $sql .= ", (SELECT pp.rowid FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid";

+            $sql .= ", (SELECT pp.rowid FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid";

             if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+                $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_rowid";

-            $sql .= ", (SELECT pp.price_by_qty FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

+            $sql .= ", (SELECT pp.price_by_qty FROM ".MAIN_DB_PREFIX."product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

             if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+                $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_by_qty";

             $selectFields .= ", price_rowid, price_by_qty";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

         if (count($warehouseStatusArray)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_stock as ps on ps.fk_product = p.rowid";

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entrepot as e on ps.fk_entrepot = e.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_stock as ps on ps.fk_product = p.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entrepot as e on ps.fk_entrepot = e.rowid";

         }

 

         // include search in supplier ref

         if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

         }

 

         //Price by customer

         if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {

-            $sql .= " LEFT JOIN  " . MAIN_DB_PREFIX . "product_customer_price as pcp ON pcp.fk_soc=" . $socid . " AND pcp.fk_product=p.rowid";

+            $sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."product_customer_price as pcp ON pcp.fk_soc=".$socid." AND pcp.fk_product=p.rowid";

         }

         // Multilang : we add translation

         if (!empty($conf->global->MAIN_MULTILANGS)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='" . $langs->getDefaultLang() . "'";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_lang as pl ON pl.fk_product = p.rowid AND pl.lang='".$langs->getDefaultLang()."'";

         }

 

         if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination pac ON pac.fk_product_child = p.rowid";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac.fk_product_child = p.rowid";

         }

 

-        $sql .= ' WHERE p.entity IN (' . getEntity('product') . ')';

+        $sql .= ' WHERE p.entity IN ('.getEntity('product').')';

         if (count($warehouseStatusArray)) {

-            $sql .= ' AND (p.fk_product_type = 1 OR e.statut IN (' . $this->db->escape(implode(',', $warehouseStatusArray)) . '))';

+            $sql .= ' AND (p.fk_product_type = 1 OR e.statut IN ('.$this->db->escape(implode(',', $warehouseStatusArray)).'))';

         }

 

         if (!empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {

@@ -2114,17 +2114,17 @@ 
         }

 

         if ($finished == 0) {

-            $sql .= " AND p.finished = " . $finished;

+            $sql .= " AND p.finished = ".$finished;

         } elseif ($finished == 1) {

-            $sql .= " AND p.finished = " . $finished;

+            $sql .= " AND p.finished = ".$finished;

             if ($status >= 0)

-                $sql .= " AND p.tosell = " . $status;

+                $sql .= " AND p.tosell = ".$status;

         }

         elseif ($status >= 0) {

-            $sql .= " AND p.tosell = " . $status;

+            $sql .= " AND p.tosell = ".$status;

         }

         if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $filtertype;

+            $sql .= " AND p.fk_product_type=".$filtertype;

         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2137,27 +2137,27 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(p.ref LIKE '" . $db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                $sql .= "(p.ref LIKE '".$db->escape($prefix.$crit)."%' OR p.label LIKE '".$db->escape($prefix.$crit)."%'";

                 if (!empty($conf->global->MAIN_MULTILANGS))

-                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR pl.label LIKE '".$db->escape($prefix.$crit)."%'";

                 if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {

-                    $sql .= " OR p.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR p.description LIKE '".$db->escape($prefix.$crit)."%'";

                     if (!empty($conf->global->MAIN_MULTILANGS))

-                        $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                        $sql .= " OR pl.description LIKE '".$db->escape($prefix.$crit)."%'";

                 }

                 if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))

-                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    $sql .= " OR pfp.ref_fourn LIKE '".$db->escape($prefix.$crit)."%'";

                 $sql .= ")";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR p.barcode LIKE '".$db->escape($prefix.$filterkey)."%'";

             $sql .= ')';

         }

         if (count($warehouseStatusArray)) {

-            $sql .= ' GROUP BY' . $selectFields;

+            $sql .= ' GROUP BY'.$selectFields;

         }

 

         //Sort by category

@@ -2172,21 +2172,21 @@ 
         $sql .= $db->plimit($limit, 0);

 

         // Build output string

-        dol_syslog(get_class($this) . "::select_produits_list search product", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_produits_list search product", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

-            require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

-            require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

             $num = $this->db->num_rows($result);

 

             $events = null;

 

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, $events, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT);

             }

 

-            $out .= '<select class="flat' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '" id="' . $htmlname . '">';

+            $out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';

 

             $textifempty = '';

             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

@@ -2198,7 +2198,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="0" selected>' . $textifempty . '</option>';

+                $out .= '<option value="0" selected>'.$textifempty.'</option>';

 

             $i = 0;

             while ($num && $i < $num) {

@@ -2208,11 +2208,11 @@ 
 

                 if ((!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) && !empty($objp->price_by_qty) && $objp->price_by_qty == 1) { // Price by quantity will return many prices for the same product

                     $sql = "SELECT rowid, quantity, price, unitprice, remise_percent, remise, price_base_type";

-                    $sql .= " FROM " . MAIN_DB_PREFIX . "product_price_by_qty";

-                    $sql .= " WHERE fk_product_price=" . $objp->price_rowid;

+                    $sql .= " FROM ".MAIN_DB_PREFIX."product_price_by_qty";

+                    $sql .= " WHERE fk_product_price=".$objp->price_rowid;

                     $sql .= " ORDER BY quantity ASC";

 

-                    dol_syslog(get_class($this) . "::select_produits_list search price by qty", LOG_DEBUG);

+                    dol_syslog(get_class($this)."::select_produits_list search price by qty", LOG_DEBUG);

                     $result2 = $this->db->query($sql);

                     if ($result2) {

                         $nb_prices = $this->db->num_rows($result2);

@@ -2316,7 +2316,7 @@ 
         if (!empty($objp->label_translated))

             $label = $objp->label_translated;

         if (!empty($filterkey) && $filterkey != '')

-            $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+            $label = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $label, 1);

 

         $outkey = $objp->rowid;

         $outref = $objp->ref;

@@ -2328,10 +2328,10 @@ 
         $outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

         $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

-        $opt = '<option value="' . $objp->rowid . '"';

+        $opt = '<option value="'.$objp->rowid.'"';

         $opt .= ($objp->rowid == $selected) ? ' selected' : '';

         if (!empty($objp->price_by_qty_rowid) && $objp->price_by_qty_rowid > 0) {

-            $opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

+            $opt .= ' pbq="'.$objp->price_by_qty_rowid.'" data-pbq="'.$objp->price_by_qty_rowid.'" data-pbqqty="'.$objp->price_by_qty_quantity.'" data-pbqpercent="'.$objp->price_by_qty_remise_percent.'"';

         }

         if (!empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) {

             if ($objp->stock > 0)

@@ -2342,16 +2342,16 @@ 
         $opt .= '>';

         $opt .= $objp->ref;

         if ($outbarcode)

-            $opt .= ' (' . $outbarcode . ')';

-        $opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

+            $opt .= ' ('.$outbarcode.')';

+        $opt .= ' - '.dol_trunc($label, $maxlengtharticle);

 

         $objRef = $objp->ref;

         if (!empty($filterkey) && $filterkey != '')

-            $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+            $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);

         $outval .= $objRef;

         if ($outbarcode)

-            $outval .= ' (' . $outbarcode . ')';

-        $outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

+            $outval .= ' ('.$outbarcode.')';

+        $outval .= ' - '.dol_trunc($label, $maxlengtharticle);

 

         $found = 0;

 

@@ -2359,25 +2359,25 @@ 
         // If we need a particular price level (from 1 to 6)

         if (empty($hidepriceinlabel) && $price_level >= 1 && (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))) {

             $sql = "SELECT price, price_ttc, price_base_type, tva_tx";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "product_price";

-            $sql .= " WHERE fk_product='" . $objp->rowid . "'";

-            $sql .= " AND entity IN (" . getEntity('productprice') . ")";

-            $sql .= " AND price_level=" . $price_level;

+            $sql .= " FROM ".MAIN_DB_PREFIX."product_price";

+            $sql .= " WHERE fk_product='".$objp->rowid."'";

+            $sql .= " AND entity IN (".getEntity('productprice').")";

+            $sql .= " AND price_level=".$price_level;

             $sql .= " ORDER BY date_price DESC, rowid DESC"; // Warning DESC must be both on date_price and rowid.

             $sql .= " LIMIT 1";

 

-            dol_syslog(get_class($this) . '::constructProductListOption search price for level ' . $price_level . '', LOG_DEBUG);

+            dol_syslog(get_class($this).'::constructProductListOption search price for level '.$price_level.'', LOG_DEBUG);

             $result2 = $this->db->query($sql);

             if ($result2) {

                 $objp2 = $this->db->fetch_object($result2);

                 if ($objp2) {

                     $found = 1;

                     if ($objp2->price_base_type == 'HT') {

-                        $opt .= ' - ' . price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-                        $outval .= ' - ' . price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

+                        $opt .= ' - '.price($objp2->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+                        $outval .= ' - '.price($objp2->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

                     } else {

-                        $opt .= ' - ' . price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-                        $outval .= ' - ' . price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+                        $opt .= ' - '.price($objp2->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+                        $outval .= ' - '.price($objp2->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

                     }

                     $outprice_ht = price($objp2->price);

                     $outprice_ttc = price($objp2->price_ttc);

@@ -2395,13 +2395,13 @@ 
             $outqty = $objp->quantity;

             $outdiscount = $objp->remise_percent;

             if ($objp->quantity == 1) {

-                $opt .= ' - ' . price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/";

-                $outval .= ' - ' . price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency) . "/";

+                $opt .= ' - '.price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/";

+                $outval .= ' - '.price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/";

                 $opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding

                 $outval .= $langs->transnoentities("Unit");

             } else {

-                $opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-                $outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

+                $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+                $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

                 $opt .= $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

                 $outval .= $langs->transnoentities("Units");

             }

@@ -2412,12 +2412,12 @@ 
             $outtva_tx = $objp->tva_tx;

         }

         if (empty($hidepriceinlabel) && !empty($objp->quantity) && $objp->quantity >= 1) {

-            $opt .= " (" . price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-            $outval .= " (" . price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

+            $opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+            $outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

         }

         if (empty($hidepriceinlabel) && !empty($objp->remise_percent) && $objp->remise_percent >= 1) {

-            $opt .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-            $outval .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

+            $opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+            $outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

         }

 

         // Price by customer

@@ -2426,11 +2426,11 @@ 
                 $found = 1;

 

                 if ($objp->custprice_base_type == 'HT') {

-                    $opt .= ' - ' . price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-                    $outval .= ' - ' . price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

+                    $opt .= ' - '.price($objp->custprice, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+                    $outval .= ' - '.price($objp->custprice, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

                 } else {

-                    $opt .= ' - ' . price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-                    $outval .= ' - ' . price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+                    $opt .= ' - '.price($objp->custprice_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+                    $outval .= ' - '.price($objp->custprice_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

                 }

 

                 $outprice_ht = price($objp->custprice);

@@ -2443,11 +2443,11 @@ 
         // If level no defined or multiprice not found, we used the default price

         if (empty($hidepriceinlabel) && !$found) {

             if ($objp->price_base_type == 'HT') {

-                $opt .= ' - ' . price($objp->price, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("HT");

-                $outval .= ' - ' . price($objp->price, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("HT");

+                $opt .= ' - '.price($objp->price, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("HT");

+                $outval .= ' - '.price($objp->price, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("HT");

             } else {

-                $opt .= ' - ' . price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->trans("TTC");

-                $outval .= ' - ' . price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency) . ' ' . $langs->transnoentities("TTC");

+                $opt .= ' - '.price($objp->price_ttc, 1, $langs, 0, 0, -1, $conf->currency).' '.$langs->trans("TTC");

+                $outval .= ' - '.price($objp->price_ttc, 0, $langs, 0, 0, -1, $conf->currency).' '.$langs->transnoentities("TTC");

             }

             $outprice_ht = price($objp->price);

             $outprice_ttc = price($objp->price_ttc);

@@ -2456,21 +2456,21 @@ 
         }

 

         if (!empty($conf->stock->enabled) && isset($objp->stock) && $objp->fk_product_type == 0) {

-            $opt .= ' - ' . $langs->trans("Stock") . ':' . $objp->stock;

+            $opt .= ' - '.$langs->trans("Stock").':'.$objp->stock;

 

             if ($objp->stock > 0) {

-                $outval .= ' - <span class="product_line_stock_ok">' . $langs->transnoentities("Stock") . ':' . $objp->stock . '</span>';

+                $outval .= ' - <span class="product_line_stock_ok">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';

             } elseif ($objp->stock <= 0) {

-                $outval .= ' - <span class="product_line_stock_too_low">' . $langs->transnoentities("Stock") . ':' . $objp->stock . '</span>';

+                $outval .= ' - <span class="product_line_stock_too_low">'.$langs->transnoentities("Stock").':'.$objp->stock.'</span>';

             }

         }

 

         if ($outdurationvalue && $outdurationunit) {

             $da = array("h" => $langs->trans("Hour"), "d" => $langs->trans("Day"), "w" => $langs->trans("Week"), "m" => $langs->trans("Month"), "y" => $langs->trans("Year"));

             if (isset($da[$outdurationunit])) {

-                $key = $da[$outdurationunit] . ($outdurationvalue > 1 ? 's' : '');

-                $opt .= ' - ' . $outdurationvalue . ' ' . $langs->trans($key);

-                $outval .= ' - ' . $outdurationvalue . ' ' . $langs->transnoentities($key);

+                $key = $da[$outdurationunit].($outdurationvalue > 1 ? 's' : '');

+                $opt .= ' - '.$outdurationvalue.' '.$langs->trans($key);

+                $outval .= ' - '.$outdurationvalue.' '.$langs->transnoentities($key);

             }

         }

 

@@ -2501,7 +2501,7 @@ 
         $selected_input_value = '';

         if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {

             if ($selected > 0) {

-                require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';

                 $producttmpselect = new Product($this->db);

                 $producttmpselect->fetch($selected);

                 $selected_input_value = $producttmpselect->ref;

@@ -2509,9 +2509,9 @@ 
             }

 

             // mode=2 means suppliers products

-            $urloption = ($socid > 0 ? 'socid=' . $socid . '&' : '') . 'htmlname=' . $htmlname . '&outjson=1&price_level=' . $price_level . '&type=' . $filtertype . '&mode=2&status=' . $status . '&finished=' . $finished . '&alsoproductwithnosupplierprice=' . $alsoproductwithnosupplierprice;

-            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

-            print ($hidelabel ? '' : $langs->trans("RefOrLabel") . ' : ') . '<input type="text" size="20" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $selected_input_value . '">';

+            $urloption = ($socid > 0 ? 'socid='.$socid.'&' : '').'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=2&status='.$status.'&finished='.$finished.'&alsoproductwithnosupplierprice='.$alsoproductwithnosupplierprice;

+            print ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/product/ajax/products.php', $urloption, $conf->global->PRODUIT_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

+            print ($hidelabel ? '' : $langs->trans("RefOrLabel").' : ').'<input type="text" size="20" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'">';

         } else {

             print $this->select_produits_fournisseurs_list($socid, $selected, $htmlname, $filtertype, $filtre, '', -1, 0, 0, $alsoproductwithnosupplierprice);

         }

@@ -2547,17 +2547,17 @@ 
         $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";

         $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, pfp.fk_soc, s.nom as name,";

         $sql .= " pfp.supplier_reputation";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

         if ($socid)

-            $sql .= " AND pfp.fk_soc = " . $socid;

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

-        $sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

+            $sql .= " AND pfp.fk_soc = ".$socid;

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+        $sql .= " WHERE p.entity IN (".getEntity('product').")";

         $sql .= " AND p.tobuy = 1";

         if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);

+            $sql .= " AND p.fk_product_type=".$this->db->escape($filtertype);

         if (!empty($filtre))

-            $sql .= " " . $filtre;

+            $sql .= " ".$filtre;

         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2570,13 +2570,13 @@ 
             foreach ($scrit as $crit) {

                 if ($i > 0)

                     $sql .= " AND ";

-                $sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%')";

+                $sql .= "(pfp.ref_fourn LIKE '".$this->db->escape($prefix.$crit)."%' OR p.ref LIKE '".$this->db->escape($prefix.$crit)."%' OR p.label LIKE '".$this->db->escape($prefix.$crit)."%')";

                 $i++;

             }

             if (count($scrit) > 1)

                 $sql .= ")";

             if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+                $sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";

             $sql .= ')';

         }

         $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

@@ -2584,15 +2584,15 @@ 
 

         // Build output string

 

-        dol_syslog(get_class($this) . "::select_produits_fournisseurs_list", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_produits_fournisseurs_list", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

-            require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+            require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

 

             $num = $this->db->num_rows($result);

 

             //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax

-            $out .= '<select class="flat maxwidthonsmartphone" id="' . $htmlname . '" name="' . $htmlname . '">';

+            $out .= '<select class="flat maxwidthonsmartphone" id="'.$htmlname.'" name="'.$htmlname.'">';

             if (!$selected)

                 $out .= '<option value="0" selected>&nbsp;</option>';

             else

@@ -2602,9 +2602,9 @@ 
             while ($i < $num) {

                 $objp = $this->db->fetch_object($result);

 

-                $outkey = $objp->idprodfournprice;                                                    // id in table of price

+                $outkey = $objp->idprodfournprice; // id in table of price

                 if (!$outkey && $alsoproductwithnosupplierprice)

-                    $outkey = 'idprod_' . $objp->rowid;   // id of product

+                    $outkey = 'idprod_'.$objp->rowid; // id of product

 

                 $outref = $objp->ref;

                 $outval = '';

@@ -2614,36 +2614,36 @@ 
                 $outdurationvalue = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, 0, dol_strlen($objp->duration) - 1) : '';

                 $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

-                $opt = '<option value="' . $outkey . '"';

+                $opt = '<option value="'.$outkey.'"';

                 if ($selected && $selected == $objp->idprodfournprice)

                     $opt .= ' selected';

                 if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice))

                     $opt .= ' disabled';

                 if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

-                    $opt .= ' pbq="' . $objp->idprodfournprice . '" data-pbq="' . $objp->idprodfournprice . '" data-pbqqty="' . $objp->quantity . '" data-pbqpercent="' . $objp->remise_percent . '"';

+                    $opt .= ' pbq="'.$objp->idprodfournprice.'" data-pbq="'.$objp->idprodfournprice.'" data-pbqqty="'.$objp->quantity.'" data-pbqpercent="'.$objp->remise_percent.'"';

                 }

                 $opt .= '>';

 

                 $objRef = $objp->ref;

                 if ($filterkey && $filterkey != '')

-                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+                    $objRef = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRef, 1);

                 $objRefFourn = $objp->ref_fourn;

                 if ($filterkey && $filterkey != '')

-                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

+                    $objRefFourn = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $objRefFourn, 1);

                 $label = $objp->label;

                 if ($filterkey && $filterkey != '')

-                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+                    $label = preg_replace('/('.preg_quote($filterkey).')/i', '<strong>$1</strong>', $label, 1);

 

                 $opt .= $objp->ref;

                 if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $opt .= ' (' . $objp->ref_fourn . ')';

+                    $opt .= ' ('.$objp->ref_fourn.')';

                 $opt .= ' - ';

                 $outval .= $objRef;

                 if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $outval .= ' (' . $objRefFourn . ')';

+                    $outval .= ' ('.$objRefFourn.')';

                 $outval .= ' - ';

-                $opt .= dol_trunc($label, 72) . ' - ';

-                $outval .= dol_trunc($label, 72) . ' - ';

+                $opt .= dol_trunc($label, 72).' - ';

+                $outval .= dol_trunc($label, 72).' - ';

 

                 if (!empty($objp->idprodfournprice)) {

                     $outqty = $objp->quantity;

@@ -2665,39 +2665,39 @@ 
                         }

                     }

                     if ($objp->quantity == 1) {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency) . "/";

-                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, $conf->currency) . "/";

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency)."/";

+                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, $conf->currency)."/";

                         $opt .= $langs->trans("Unit"); // Do not use strtolower because it breaks utf8 encoding

                         $outval .= $langs->transnoentities("Unit");

                     } else {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $objp->quantity;

-                        $opt .= ' ' . $langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

-                        $outval .= ' ' . $langs->transnoentities("Units");

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+                        $outval .= price($objp->fprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$objp->quantity;

+                        $opt .= ' '.$langs->trans("Units"); // Do not use strtolower because it breaks utf8 encoding

+                        $outval .= ' '.$langs->transnoentities("Units");

                     }

 

                     if ($objp->quantity >= 1) {

-                        $opt .= " (" . price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

-                        $outval .= " (" . price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->transnoentities("Unit") . ")"; // Do not use strtolower because it breaks utf8 encoding

+                        $opt .= " (".price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

+                        $outval .= " (".price($objp->unitprice, 0, $langs, 0, 0, -1, $conf->currency)."/".$langs->transnoentities("Unit").")"; // Do not use strtolower because it breaks utf8 encoding

                     }

                     if ($objp->remise_percent >= 1) {

-                        $opt .= " - " . $langs->trans("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

-                        $outval .= " - " . $langs->transnoentities("Discount") . " : " . vatrate($objp->remise_percent) . ' %';

+                        $opt .= " - ".$langs->trans("Discount")." : ".vatrate($objp->remise_percent).' %';

+                        $outval .= " - ".$langs->transnoentities("Discount")." : ".vatrate($objp->remise_percent).' %';

                     }

                     if ($objp->duration) {

-                        $opt .= " - " . $objp->duration;

-                        $outval .= " - " . $objp->duration;

+                        $opt .= " - ".$objp->duration;

+                        $outval .= " - ".$objp->duration;

                     }

                     if (!$socid) {

-                        $opt .= " - " . dol_trunc($objp->name, 8);

-                        $outval .= " - " . dol_trunc($objp->name, 8);

+                        $opt .= " - ".dol_trunc($objp->name, 8);

+                        $outval .= " - ".dol_trunc($objp->name, 8);

                     }

                     if ($objp->supplier_reputation) {

                         //TODO dictionary

                         $reputations = array('' => $langs->trans('Standard'), 'FAVORITE' => $langs->trans('Favorite'), 'NOTTHGOOD' => $langs->trans('NotTheGoodQualitySupplier'), 'DONOTORDER' => $langs->trans('DoNotOrderThisProductToThisSupplier'));

 

-                        $opt .= " - " . $reputations[$objp->supplier_reputation];

-                        $outval .= " - " . $reputations[$objp->supplier_reputation];

+                        $opt .= " - ".$reputations[$objp->supplier_reputation];

+                        $outval .= " - ".$reputations[$objp->supplier_reputation];

                     }

                 } else {

                     if (empty($alsoproductwithnosupplierprice)) {     // No supplier price defined for couple product/supplier

@@ -2731,7 +2731,7 @@ 
 

             $this->db->free($result);

 

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

             if (empty($outputmode))

@@ -2762,39 +2762,39 @@ 
         $sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration, pfp.fk_soc,";

         $sql .= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";

         $sql .= " pfp.fk_supplier_price_expression, pfp.fk_product, pfp.tva_tx, s.nom as name";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-        $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

-        $sql .= " WHERE pfp.entity IN (" . getEntity('productsupplierprice') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."product as p";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";

+        $sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";

         $sql .= " AND p.tobuy = 1";

         $sql .= " AND s.fournisseur = 1";

-        $sql .= " AND p.rowid = " . $productid;

+        $sql .= " AND p.rowid = ".$productid;

         $sql .= " ORDER BY s.nom, pfp.ref_fourn DESC";

 

-        dol_syslog(get_class($this) . "::select_product_fourn_price", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_product_fourn_price", LOG_DEBUG);

         $result = $this->db->query($sql);

 

         if ($result) {

             $num = $this->db->num_rows($result);

 

-            $form = '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            $form = '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

 

             if (!$num) {

-                $form .= '<option value="0">-- ' . $langs->trans("NoSupplierPriceDefinedForThisProduct") . ' --</option>';

+                $form .= '<option value="0">-- '.$langs->trans("NoSupplierPriceDefinedForThisProduct").' --</option>';

             } else {

-                require_once DOL_DOCUMENT_ROOT . '/product/dynamic_price/class/price_parser.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';

                 $form .= '<option value="0">&nbsp;</option>';

 

                 $i = 0;

                 while ($i < $num) {

                     $objp = $this->db->fetch_object($result);

 

-                    $opt = '<option value="' . $objp->idprodfournprice . '"';

+                    $opt = '<option value="'.$objp->idprodfournprice.'"';

                     //if there is only one supplier, preselect it

                     if ($num == 1 || ($selected_supplier > 0 && $objp->fk_soc == $selected_supplier)) {

                         $opt .= ' selected';

                     }

-                    $opt .= '>' . $objp->name . ' - ' . $objp->ref_fourn . ' - ';

+                    $opt .= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';

 

                     if (!empty($conf->dynamicprices->enabled) && !empty($objp->fk_supplier_price_expression)) {

                         $prod_supplier = new ProductFournisseur($this->db);

@@ -2813,10 +2813,10 @@ 
                         }

                     }

                     if ($objp->quantity == 1) {

-                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency) . "/";

+                        $opt .= price($objp->fprice, 1, $langs, 0, 0, -1, $conf->currency)."/";

                     }

 

-                    $opt .= $objp->quantity . ' ';

+                    $opt .= $objp->quantity.' ';

 

                     if ($objp->quantity == 1) {

                         $opt .= $langs->trans("Unit");

@@ -2825,10 +2825,10 @@ 
                     }

                     if ($objp->quantity > 1) {

                         $opt .= " - ";

-                        $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");

+                        $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency)."/".$langs->trans("Unit");

                     }

                     if ($objp->duration)

-                        $opt .= " - " . $objp->duration;

+                        $opt .= " - ".$objp->duration;

                     $opt .= "</option>\n";

 

                     $form .= $opt;

@@ -2860,14 +2860,14 @@ 
         // phpcs:enable

         // looking for users

         $sql = "SELECT a.rowid, a.label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "societe_address as a";

-        $sql .= " WHERE a.fk_soc = " . $socid;

+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_address as a";

+        $sql .= " WHERE a.fk_soc = ".$socid;

         $sql .= " ORDER BY a.label ASC";

 

-        dol_syslog(get_class($this) . "::select_address", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_address", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($showempty)

                 print '<option value="0">&nbsp;</option>';

             $num = $this->db->num_rows($resql);

@@ -2877,9 +2877,9 @@ 
                     $obj = $this->db->fetch_object($resql);

 

                     if ($selected && $selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>' . $obj->label . '</option>';

+                        print '<option value="'.$obj->rowid.'" selected>'.$obj->label.'</option>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">' . $obj->label . '</option>';

+                        print '<option value="'.$obj->rowid.'">'.$obj->label.'</option>';

                     }

                     $i++;

                 }

@@ -2904,13 +2904,13 @@ 
 

         $num = count($this->cache_conditions_paiements);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $sql = "SELECT rowid, code, libelle as label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_payment_term';

-        $sql .= " WHERE entity IN (" . getEntity('c_payment_term') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_payment_term';

+        $sql .= " WHERE entity IN (".getEntity('c_payment_term').")";

         $sql .= " AND active > 0";

         $sql .= " ORDER BY sortorder";

 

@@ -2922,7 +2922,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->trans("PaymentConditionShort" . $obj->code) != ("PaymentConditionShort" . $obj->code) ? $langs->trans("PaymentConditionShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->trans("PaymentConditionShort".$obj->code) != ("PaymentConditionShort".$obj->code) ? $langs->trans("PaymentConditionShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_conditions_paiements[$obj->rowid]['code'] = $obj->code;

                 $this->cache_conditions_paiements[$obj->rowid]['label'] = $label;

                 $i++;

@@ -2950,14 +2950,14 @@ 
 

         $num = count($this->cache_availability);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $langs->load('propal');

 

         $sql = "SELECT rowid, code, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_availability';

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_availability';

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -2968,7 +2968,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->trans("AvailabilityType" . $obj->code) != ("AvailabilityType" . $obj->code) ? $langs->trans("AvailabilityType" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->trans("AvailabilityType".$obj->code) != ("AvailabilityType".$obj->code) ? $langs->trans("AvailabilityType".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_availability[$obj->rowid]['code'] = $obj->code;

                 $this->cache_availability[$obj->rowid]['label'] = $label;

                 $i++;

@@ -2998,16 +2998,16 @@ 
 

         $this->load_cache_availability();

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

-        print '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';

+        print '<select id="'.$htmlname.'" class="flat" name="'.$htmlname.'">';

         if ($addempty)

             print '<option value="0">&nbsp;</option>';

         foreach ($this->cache_availability as $id => $arrayavailability) {

             if ($selected == $id) {

-                print '<option value="' . $id . '" selected>';

+                print '<option value="'.$id.'" selected>';

             } else {

-                print '<option value="' . $id . '">';

+                print '<option value="'.$id.'">';

             }

             print $arrayavailability['label'];

             print '</option>';

@@ -3028,10 +3028,10 @@ 
 

         $num = count($this->cache_demand_reason);

         if ($num > 0)

-            return 0;    // Cache already loaded

+            return 0; // Cache already loaded

 

         $sql = "SELECT rowid, code, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . 'c_input_reason';

+        $sql .= " FROM ".MAIN_DB_PREFIX.'c_input_reason';

         $sql .= " WHERE active > 0";

 

         $resql = $this->db->query($sql);

@@ -3044,10 +3044,10 @@ 
 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

                 $label = ($obj->label != '-' ? $obj->label : '');

-                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code))

-                    $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

+                if ($langs->trans("DemandReasonType".$obj->code) != ("DemandReasonType".$obj->code))

+                    $label = $langs->trans("DemandReasonType".$obj->code); // So translation key DemandReasonTypeSRC_XXX will work

                 if ($langs->trans($obj->code) != $obj->code)

-                    $label = $langs->trans($obj->code);                // So translation key SRC_XXX will work

+                    $label = $langs->trans($obj->code); // So translation key SRC_XXX will work

 

                 $tmparray[$obj->rowid]['id'] = $obj->rowid;

                 $tmparray[$obj->rowid]['code'] = $obj->code;

@@ -3082,17 +3082,17 @@ 
 

         $this->loadCacheInputReason();

 

-        print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+        print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

         if ($addempty)

-            print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

+            print '<option value="0"'.(empty($selected) ? ' selected' : '').'>&nbsp;</option>';

         foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

             if ($arraydemandreason['code'] == $exclude)

                 continue;

 

             if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

-                print '<option value="' . $arraydemandreason['id'] . '" selected>';

+                print '<option value="'.$arraydemandreason['id'].'" selected>';

             } else {

-                print '<option value="' . $arraydemandreason['id'] . '">';

+                print '<option value="'.$arraydemandreason['id'].'">';

             }

             $label = $arraydemandreason['label']; // Translation of label was already done into the ->loadCacheInputReason

             print $langs->trans($label);

@@ -3116,15 +3116,15 @@ 
 

         $num = count($this->cache_types_paiements);

         if ($num > 0)

-            return $num;    // Cache already loaded

+            return $num; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $this->cache_types_paiements = array();

 

         $sql = "SELECT id, code, libelle as label, type, active";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_paiement";

-        $sql .= " WHERE entity IN (" . getEntity('c_paiement') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_paiement";

+        $sql .= " WHERE entity IN (".getEntity('c_paiement').")";

         //if ($active >= 0) $sql.= " AND active = ".$active;

 

         $resql = $this->db->query($sql);

@@ -3135,7 +3135,7 @@ 
                 $obj = $this->db->fetch_object($resql);

 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

-                $label = ($langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) != ("PaymentTypeShort" . $obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort" . $obj->code) : ($obj->label != '-' ? $obj->label : ''));

+                $label = ($langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) != ("PaymentTypeShort".$obj->code) ? $langs->transnoentitiesnoconv("PaymentTypeShort".$obj->code) : ($obj->label != '-' ? $obj->label : ''));

                 $this->cache_types_paiements[$obj->id]['id'] = $obj->id;

                 $this->cache_types_paiements[$obj->id]['code'] = $obj->code;

                 $this->cache_types_paiements[$obj->id]['label'] = $label;

@@ -3172,7 +3172,7 @@ 
         // phpcs:enable

         global $langs, $user, $conf;

 

-        dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

+        dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);

 

         $this->load_cache_conditions_paiements();

 

@@ -3180,14 +3180,14 @@ 
         if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID))

             $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

 

-        print '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

+        print '<select id="'.$htmlname.'" class="flat selectpaymentterms'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

         if ($addempty)

             print '<option value="0">&nbsp;</option>';

         foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

             if ($selected == $id) {

-                print '<option value="' . $id . '" selected>';

+                print '<option value="'.$id.'" selected>';

             } else {

-                print '<option value="' . $id . '">';

+                print '<option value="'.$id.'">';

             }

             print $arrayconditions['label'];

             print '</option>';

@@ -3217,7 +3217,7 @@ 
         // phpcs:enable

         global $langs, $user;

 

-        dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

+        dol_syslog(__METHOD__." ".$selected.", ".$htmlname.", ".$filtertype.", ".$format, LOG_DEBUG);

 

         $filterarray = array();

         if ($filtertype == 'CRDT')

@@ -3229,7 +3229,7 @@ 
 

         $this->load_cache_types_paiements();

 

-        print '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

+        print '<select id="select'.$htmlname.'" class="flat selectpaymenttypes'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'">';

         if ($empty)

             print '<option value="">&nbsp;</option>';

         foreach ($this->cache_types_paiements as $id => $arraytypes) {

@@ -3246,13 +3246,13 @@ 
                 continue;

 

             if ($format == 0)

-                print '<option value="' . $id . '"';

+                print '<option value="'.$id.'"';

             elseif ($format == 1)

-                print '<option value="' . $arraytypes['code'] . '"';

+                print '<option value="'.$arraytypes['code'].'"';

             elseif ($format == 2)

-                print '<option value="' . $arraytypes['code'] . '"';

+                print '<option value="'.$arraytypes['code'].'"';

             elseif ($format == 3)

-                print '<option value="' . $id . '"';

+                print '<option value="'.$id.'"';

             // Si selected est text, on compare avec code, sinon avec id

             if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code'])

                 print ' selected';

@@ -3288,16 +3288,16 @@ 
 

         $return = '';

 

-        $return .= '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+        $return .= '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

         $options = array(

             'HT' => $langs->trans("HT"),

             'TTC' => $langs->trans("TTC")

         );

         foreach ($options as $id => $value) {

             if ($selected == $id) {

-                $return .= '<option value="' . $id . '" selected>' . $value;

+                $return .= '<option value="'.$id.'" selected>'.$value;

             } else {

-                $return .= '<option value="' . $id . '">' . $value;

+                $return .= '<option value="'.$id.'">'.$value;

             }

             $return .= '</option>';

         }

@@ -3324,30 +3324,30 @@ 
         $langs->load("deliveries");

 

         $sql = "SELECT rowid, code, libelle as label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_shipment_mode";

         $sql .= " WHERE active > 0";

         if ($filtre)

-            $sql .= " AND " . $filtre;

+            $sql .= " AND ".$filtre;

         $sql .= " ORDER BY libelle ASC";

 

-        dol_syslog(get_class($this) . "::selectShippingMode", LOG_DEBUG);

+        dol_syslog(get_class($this)."::selectShippingMode", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             $num = $this->db->num_rows($result);

             $i = 0;

             if ($num) {

-                print '<select id="select' . $htmlname . '" class="flat selectshippingmethod" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

+                print '<select id="select'.$htmlname.'" class="flat selectshippingmethod" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

                     print '<option value="-1">&nbsp;</option>';

                 }

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($result);

                     if ($selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>';

+                        print '<option value="'.$obj->rowid.'" selected>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">';

+                        print '<option value="'.$obj->rowid.'">';

                     }

-                    print ($langs->trans("SendingMethod" . strtoupper($obj->code)) != "SendingMethod" . strtoupper($obj->code)) ? $langs->trans("SendingMethod" . strtoupper($obj->code)) : $obj->label;

+                    print ($langs->trans("SendingMethod".strtoupper($obj->code)) != "SendingMethod".strtoupper($obj->code)) ? $langs->trans("SendingMethod".strtoupper($obj->code)) : $obj->label;

                     print '</option>';

                     $i++;

                 }

@@ -3378,16 +3378,16 @@ 
         $langs->load("deliveries");

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setshippingmethod">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectShippingMethod($selected, $htmlname, '', $addempty);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

                 $code = $langs->getLabelFromKey($db, $selected, 'c_shipment_mode', 'rowid', 'code');

-                print $langs->trans("SendingMethod" . strtoupper($code));

+                print $langs->trans("SendingMethod".strtoupper($code));

             } else {

                 print "&nbsp;";

             }

@@ -3409,7 +3409,7 @@ 
         $langs->load('bills');

 

         $opt = '<option value ="" selected></option>';

-        $sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM ' . MAIN_DB_PREFIX . 'facture WHERE situation_counter>=1';

+        $sql = 'SELECT rowid, ref, situation_cycle_ref, situation_counter, situation_final, fk_soc FROM '.MAIN_DB_PREFIX.'facture WHERE situation_counter>=1';

         $sql .= ' ORDER by situation_cycle_ref, situation_counter desc';

         $resql = $this->db->query($sql);

         if ($resql && $this->db->num_rows($resql) > 0) {

@@ -3427,9 +3427,9 @@ 
                             //Not prov?

                             if (substr($obj->ref, 1, 4) != 'PROV') {

                                 if ($selected == $obj->rowid) {

-                                    $opt .= '<option value="' . $obj->rowid . '" selected>' . $obj->ref . '</option>';

+                                    $opt .= '<option value="'.$obj->rowid.'" selected>'.$obj->ref.'</option>';

                                 } else {

-                                    $opt .= '<option value="' . $obj->rowid . '">' . $obj->ref . '</option>';

+                                    $opt .= '<option value="'.$obj->rowid.'">'.$obj->ref.'</option>';

                                 }

                             }

                         }

@@ -3437,10 +3437,10 @@ 
                 }

             }

         } else {

-            dol_syslog("Error sql=" . $sql . ", error=" . $this->error, LOG_ERR);

+            dol_syslog("Error sql=".$sql.", error=".$this->error, LOG_ERR);

         }

         if ($opt == '<option value ="" selected></option>') {

-            $opt = '<option value ="0" selected>' . $langs->trans('NoSituations') . '</option>';

+            $opt = '<option value ="0" selected>'.$langs->trans('NoSituations').'</option>';

         }

         return $opt;

     }

@@ -3459,9 +3459,9 @@ 
 

         $langs->load('products');

 

-        $return = '<select class="flat" id="' . $htmlname . '" name="' . $htmlname . '">';

+        $return = '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'">';

 

-        $sql = 'SELECT rowid, label, code from ' . MAIN_DB_PREFIX . 'c_units';

+        $sql = 'SELECT rowid, label, code from '.MAIN_DB_PREFIX.'c_units';

         $sql .= ' WHERE active > 0';

 

         $resql = $this->db->query($sql);

@@ -3471,14 +3471,14 @@ 
 

             while ($res = $this->db->fetch_object($resql)) {

                 $unitLabel = $res->label;

-                if (!empty($langs->tab_translate['unit' . $res->code])) { // check if Translation is available before

-                    $unitLabel = $langs->trans('unit' . $res->code) != $res->label ? $langs->trans('unit' . $res->code) : $res->label;

+                if (!empty($langs->tab_translate['unit'.$res->code])) { // check if Translation is available before

+                    $unitLabel = $langs->trans('unit'.$res->code) != $res->label ? $langs->trans('unit'.$res->code) : $res->label;

                 }

 

                 if ($selected == $res->rowid) {

-                    $return .= '<option value="' . $res->rowid . '" selected>' . $unitLabel . '</option>';

+                    $return .= '<option value="'.$res->rowid.'" selected>'.$unitLabel.'</option>';

                 } else {

-                    $return .= '<option value="' . $res->rowid . '">' . $unitLabel . '</option>';

+                    $return .= '<option value="'.$res->rowid.'">'.$unitLabel.'</option>';

                 }

             }

             $return .= '</select>';

@@ -3508,21 +3508,21 @@ 
         $num = 0;

 

         $sql = "SELECT rowid, label, bank, clos as status, currency_code";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";

-        $sql .= " WHERE entity IN (" . getEntity('bank_account') . ")";

+        $sql .= " FROM ".MAIN_DB_PREFIX."bank_account";

+        $sql .= " WHERE entity IN (".getEntity('bank_account').")";

         if ($statut != 2)

-            $sql .= " AND clos = '" . $statut . "'";

+            $sql .= " AND clos = '".$statut."'";

         if ($filtre)

-            $sql .= " AND " . $filtre;

+            $sql .= " AND ".$filtre;

         $sql .= " ORDER BY label";

 

-        dol_syslog(get_class($this) . "::select_comptes", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_comptes", LOG_DEBUG);

         $result = $this->db->query($sql);

         if ($result) {

             $num = $this->db->num_rows($result);

             $i = 0;

             if ($num) {

-                print '<select id="select' . $htmlname . '" class="flat selectbankaccount" name="' . $htmlname . '"' . ($moreattrib ? ' ' . $moreattrib : '') . '>';

+                print '<select id="select'.$htmlname.'" class="flat selectbankaccount" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';

                 if ($useempty == 1 || ($useempty == 2 && $num > 1)) {

                     print '<option value="-1">&nbsp;</option>';

                 }

@@ -3530,15 +3530,15 @@ 
                 while ($i < $num) {

                     $obj = $this->db->fetch_object($result);

                     if ($selected == $obj->rowid) {

-                        print '<option value="' . $obj->rowid . '" selected>';

+                        print '<option value="'.$obj->rowid.'" selected>';

                     } else {

-                        print '<option value="' . $obj->rowid . '">';

+                        print '<option value="'.$obj->rowid.'">';

                     }

                     print trim($obj->label);

                     if ($showcurrency)

-                        print ' (' . $obj->currency_code . ')';

+                        print ' ('.$obj->currency_code.')';

                     if ($statut == 2 && $obj->status == 1)

-                        print ' (' . $langs->trans("Closed") . ')';

+                        print ' ('.$langs->trans("Closed").')';

                     print '</option>';

                     $i++;

                 }

@@ -3546,9 +3546,9 @@ 
             }

             else {

                 if ($statut == 0)

-                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';

+                    print '<span class="opacitymedium">'.$langs->trans("NoActiveBankAccountDefined").'</span>';

                 else

-                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';

+                    print '<span class="opacitymedium">'.$langs->trans("NoBankAccountFound").'</span>';

             }

         }

         else {

@@ -3571,19 +3571,19 @@ 
     {

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setbankaccount">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);

             if ($nbaccountfound > 0)

-                print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+                print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

 

             $langs->load('banks');

 

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';

                 $bankstatic = new Account($this->db);

                 $result = $bankstatic->fetch($selected);

                 if ($result)

@@ -3613,19 +3613,19 @@ 
         global $conf, $langs;

         $langs->load("categories");

 

-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 

         // For backward compatibility

         if (is_numeric($type)) {

-            dol_syslog(__METHOD__ . ': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

+            dol_syslog(__METHOD__.': using numeric value for parameter type is deprecated. Use string code instead.', LOG_WARNING);

         }

 

         if ($type === Categorie::TYPE_BANK_LINE) {

             // TODO Move this into common category feature

             $categids = array();

             $sql = "SELECT c.label, c.rowid";

-            $sql .= " FROM " . MAIN_DB_PREFIX . "bank_categ as c";

-            $sql .= " WHERE entity = " . $conf->entity;

+            $sql .= " FROM ".MAIN_DB_PREFIX."bank_categ as c";

+            $sql .= " WHERE entity = ".$conf->entity;

             $sql .= " ORDER BY c.label";

             $result = $this->db->query($sql);

             if ($result) {

@@ -3646,11 +3646,11 @@ 
             $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);

         }

 

-        $output = '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $output = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

         $outarray = array();

         if (is_array($cate_arbo)) {

             if (!count($cate_arbo))

-                $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

+                $output .= '<option value="-1" disabled>'.$langs->trans("NoCategoriesDefined").'</option>';

             else {

                 $output .= '<option value="-1">&nbsp;</option>';

                 foreach ($cate_arbo as $key => $value) {

@@ -3659,7 +3659,7 @@ 
                     } else {

                         $add = '';

                     }

-                    $output .= '<option ' . $add . 'value="' . $cate_arbo[$key]['id'] . '">' . dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle') . '</option>';

+                    $output .= '<option '.$add.'value="'.$cate_arbo[$key]['id'].'">'.dol_trunc($cate_arbo[$key]['fulllabel'], $maxlength, 'middle').'</option>';

 

                     $outarray[$cate_arbo[$key]['id']] = $cate_arbo[$key]['fulllabel'];

                 }

@@ -3693,7 +3693,7 @@ 
     function form_confirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = "", $useajax = 0, $height = 170, $width = 500)

     {

         // phpcs:enable

-        dol_syslog(__METHOD__ . ': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

+        dol_syslog(__METHOD__.': using form_confirm is deprecated. Use formconfim instead.', LOG_WARNING);

         print $this->formconfirm($page, $title, $question, $action, $formquestion, $selectedchoice, $useajax, $height, $width);

     }

 

@@ -3741,36 +3741,36 @@ 
             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

                     if ($input['type'] == 'hidden') {

-                        $more .= '<input type="hidden" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . dol_escape_htmltag($input['value']) . '">' . "\n";

+                        $more .= '<input type="hidden" id="'.$input['name'].'" name="'.$input['name'].'" value="'.dol_escape_htmltag($input['value']).'">'."\n";

                     }

                 }

             }

 

             // Now add questions

-            $more .= '<table class="paddingtopbottomonly" width="100%">' . "\n";

+            $more .= '<table class="paddingtopbottomonly" width="100%">'."\n";

             if (!empty($formquestion['text']))

-                $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+                $more .= '<tr><td colspan="2">'.$formquestion['text'].'</td></tr>'."\n";

             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

-                    $size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');

-                    $moreattr = (!empty($input['moreattr']) ? ' ' . $input['moreattr'] : '');

-                    $morecss = (!empty($input['morecss']) ? ' ' . $input['morecss'] : '');

+                    $size = (!empty($input['size']) ? ' size="'.$input['size'].'"' : '');

+                    $moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');

+                    $morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');

 

                     if ($input['type'] == 'text') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="text" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="text" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";

                     } elseif ($input['type'] == 'password') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="password" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td><td align="left"><input type="password" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$size.' value="'.$input['value'].'"'.$moreattr.' /></td></tr>'."\n";

                     } elseif ($input['type'] == 'select') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>';

                         if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td class="tdtop" align="left">';

+                            $more .= $input['label'].'</td><td class="tdtop" align="left">';

                         $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

                     elseif ($input['type'] == 'checkbox') {

                         $more .= '<tr>';

-                        $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . ' </td><td align="left">';

-                        $more .= '<input type="checkbox" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $moreattr;

+                        $more .= '<td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].' </td><td align="left">';

+                        $more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'"'.$moreattr;

                         if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0')

                             $more .= ' checked';

                         if (is_bool($input['value']) && $input['value'])

@@ -3778,51 +3778,51 @@ 
                         if (isset($input['disabled']))

                             $more .= ' disabled';

                         $more .= ' /></td>';

-                        $more .= '</tr>' . "\n";

+                        $more .= '</tr>'."\n";

                     }

                     elseif ($input['type'] == 'radio') {

                         $i = 0;

                         foreach ($input['values'] as $selkey => $selval) {

                             $more .= '<tr>';

                             if ($i == 0)

-                                $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

+                                $more .= '<td'.(empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop '.$input['tdclass'].'"')).'>'.$input['label'].'</td>';

                             else

-                                $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';

-                            $more .= '<td><input type="radio" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . $selkey . '"' . $moreattr;

+                                $more .= '<td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>&nbsp;</td>';

+                            $more .= '<td><input type="radio" class="flat'.$morecss.'" id="'.$input['name'].'" name="'.$input['name'].'" value="'.$selkey.'"'.$moreattr;

                             if ($input['disabled'])

                                 $more .= ' disabled';

                             $more .= ' /> ';

                             $more .= $selval;

-                            $more .= '</td></tr>' . "\n";

+                            $more .= '</td></tr>'."\n";

                             $i++;

                         }

                     }

                     elseif ($input['type'] == 'date') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>'.$input['label'].'</td>';

                         $more .= '<td align="left">';

                         $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

-                        $more .= '</td></tr>' . "\n";

-                        $formquestion[] = array('name' => $input['name'] . 'day');

-                        $formquestion[] = array('name' => $input['name'] . 'month');

-                        $formquestion[] = array('name' => $input['name'] . 'year');

-                        $formquestion[] = array('name' => $input['name'] . 'hour');

-                        $formquestion[] = array('name' => $input['name'] . 'min');

+                        $more .= '</td></tr>'."\n";

+                        $formquestion[] = array('name' => $input['name'].'day');

+                        $formquestion[] = array('name' => $input['name'].'month');

+                        $formquestion[] = array('name' => $input['name'].'year');

+                        $formquestion[] = array('name' => $input['name'].'hour');

+                        $formquestion[] = array('name' => $input['name'].'min');

                     } elseif ($input['type'] == 'other') {

-                        $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

+                        $more .= '<tr><td'.(empty($input['tdclass']) ? '' : (' class="'.$input['tdclass'].'"')).'>';

                         if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td align="left">';

+                            $more .= $input['label'].'</td><td align="left">';

                         $more .= $input['value'];

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

 

                     elseif ($input['type'] == 'onecolumn') {

                         $more .= '<tr><td colspan="2" align="left">';

                         $more .= $input['value'];

-                        $more .= '</td></tr>' . "\n";

+                        $more .= '</td></tr>'."\n";

                     }

                 }

             }

-            $more .= '</table>' . "\n";

+            $more .= '</table>'."\n";

         }

 

         // JQUI method dialog is broken with jmobile, we use standard HTML.

@@ -3841,10 +3841,10 @@ 
                 $button = $useajax;

                 $useajax = 1;

                 $autoOpen = false;

-                $dialogconfirm .= '-' . $button;

+                $dialogconfirm .= '-'.$button;

             }

-            $pageyes = $page . (preg_match('/\?/', $page) ? '&' : '?') . 'action=' . $action . '&confirm=yes';

-            $pageno = ($useajax == 2 ? $page . (preg_match('/\?/', $page) ? '&' : '?') . 'confirm=no' : '');

+            $pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';

+            $pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');

             // Add input fields into list of fields to read during submit (inputok and inputko)

             if (is_array($formquestion)) {

                 foreach ($formquestion as $key => $input) {

@@ -3856,20 +3856,20 @@ 
                 }

             }

             // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template

-            $formconfirm .= '<div id="' . $dialogconfirm . '" title="' . dol_escape_htmltag($title) . '" style="display: none;">';

+            $formconfirm .= '<div id="'.$dialogconfirm.'" title="'.dol_escape_htmltag($title).'" style="display: none;">';

             if (!empty($more)) {

-                $formconfirm .= '<div class="confirmquestions">' . $more . '</div>';

+                $formconfirm .= '<div class="confirmquestions">'.$more.'</div>';

             }

-            $formconfirm .= ($question ? '<div class="confirmmessage">' . img_help('', '') . ' ' . $question . '</div>' : '');

-            $formconfirm .= '</div>' . "\n";

+            $formconfirm .= ($question ? '<div class="confirmmessage">'.img_help('', '').' '.$question.'</div>' : '');

+            $formconfirm .= '</div>'."\n";

 

-            $formconfirm .= "\n<!-- begin ajax formconfirm page=" . $page . " -->\n";

-            $formconfirm .= '<script type="text/javascript">' . "\n";

+            $formconfirm .= "\n<!-- begin ajax formconfirm page=".$page." -->\n";

+            $formconfirm .= '<script type="text/javascript">'."\n";

             $formconfirm .= 'jQuery(document).ready(function() {

             $(function() {

-            	$( "#' . $dialogconfirm . '" ).dialog(

+            	$( "#' . $dialogconfirm.'" ).dialog(

             	{

-                    autoOpen: ' . ($autoOpen ? "true" : "false") . ',';

+                    autoOpen: ' . ($autoOpen ? "true" : "false").',';

             if ($newselectedchoice == 'no') {

                 $formconfirm .= '

 						open: function() {

@@ -3878,15 +3878,15 @@ 
             }

             $formconfirm .= '

                     resizable: false,

-                    height: "' . $height . '",

-                    width: "' . $width . '",

+                    height: "' . $height.'",

+                    width: "' . $width.'",

                     modal: true,

                     closeOnEscape: false,

                     buttons: {

-                        "' . dol_escape_js($langs->transnoentities("Yes")) . '": function() {

+                        "' . dol_escape_js($langs->transnoentities("Yes")).'": function() {

                         	var options="";

-                        	var inputok = ' . json_encode($inputok) . ';

-                         	var pageyes = "' . dol_escape_js(!empty($pageyes) ? $pageyes : '') . '";

+                        	var inputok = ' . json_encode($inputok).';

+                         	var pageyes = "' . dol_escape_js(!empty($pageyes) ? $pageyes : '').'";

                          	if (inputok.length>0) {

                          		$.each(inputok, function(i, inputname) {

                          			var more = "";

@@ -3902,10 +3902,10 @@ 
             				if (pageyes.length > 0) { location.href = urljump; }

                             $(this).dialog("close");

                         },

-                        "' . dol_escape_js($langs->transnoentities("No")) . '": function() {

+                        "' . dol_escape_js($langs->transnoentities("No")).'": function() {

                         	var options = "";

-                         	var inputko = ' . json_encode($inputko) . ';

-                         	var pageno="' . dol_escape_js(!empty($pageno) ? $pageno : '') . '";

+                         	var inputko = ' . json_encode($inputko).';

+                         	var pageno="' . dol_escape_js(!empty($pageno) ? $pageno : '').'";

                          	if (inputko.length>0) {

                          		$.each(inputko, function(i, inputname) {

                          			var more = "";

@@ -3924,10 +3924,10 @@ 
                 }

                 );

 

-            	var button = "' . $button . '";

+            	var button = "' . $button.'";

             	if (button.length > 0) {

                 	$( "#" + button ).click(function() {

-                		$("#' . $dialogconfirm . '").dialog("open");

+                		$("#' . $dialogconfirm.'").dialog("open");

         			});

                 }

             });

@@ -3935,37 +3935,37 @@ 
             </script>';

             $formconfirm .= "<!-- end ajax formconfirm -->\n";

         } else {

-            $formconfirm .= "\n<!-- begin formconfirm page=" . $page . " -->\n";

+            $formconfirm .= "\n<!-- begin formconfirm page=".$page." -->\n";

 

             if (empty($disableformtag))

-                $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

+                $formconfirm .= '<form method="POST" action="'.$page.'" class="notoptoleftroright">'."\n";

 

-            $formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

+            $formconfirm .= '<input type="hidden" name="action" value="'.$action.'">'."\n";

             if (empty($disableformtag))

-                $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";

+                $formconfirm .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'."\n";

 

-            $formconfirm .= '<table width="100%" class="valid">' . "\n";

+            $formconfirm .= '<table width="100%" class="valid">'."\n";

 

             // Line title

-            $formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">' . img_picto('', 'recent') . ' ' . $title . '</td></tr>' . "\n";

+            $formconfirm .= '<tr class="validtitre"><td class="validtitre" colspan="3">'.img_picto('', 'recent').' '.$title.'</td></tr>'."\n";

 

             // Line form fields

             if ($more) {

-                $formconfirm .= '<tr class="valid"><td class="valid" colspan="3">' . "\n";

+                $formconfirm .= '<tr class="valid"><td class="valid" colspan="3">'."\n";

                 $formconfirm .= $more;

-                $formconfirm .= '</td></tr>' . "\n";

+                $formconfirm .= '</td></tr>'."\n";

             }

 

             // Line with question

             $formconfirm .= '<tr class="valid">';

-            $formconfirm .= '<td class="valid">' . $question . '</td>';

+            $formconfirm .= '<td class="valid">'.$question.'</td>';

             $formconfirm .= '<td class="valid">';

             $formconfirm .= $this->selectyesno("confirm", $newselectedchoice);

             $formconfirm .= '</td>';

-            $formconfirm .= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="' . $langs->trans("Validate") . '"></td>';

-            $formconfirm .= '</tr>' . "\n";

+            $formconfirm .= '<td class="valid" align="center"><input class="button valignmiddle" type="submit" value="'.$langs->trans("Validate").'"></td>';

+            $formconfirm .= '</tr>'."\n";

 

-            $formconfirm .= '</table>' . "\n";

+            $formconfirm .= '</table>'."\n";

 

             if (empty($disableformtag))

                 $formconfirm .= "</form>\n";

@@ -3996,8 +3996,8 @@ 
         // phpcs:enable

         global $langs;

 

-        require_once DOL_DOCUMENT_ROOT . '/core/lib/project.lib.php';

-        require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';

 

         $out = '';

 

@@ -4006,11 +4006,11 @@ 
         $langs->load("project");

         if ($htmlname != "none") {

             $out .= "\n";

-            $out .= '<form method="post" action="' . $page . '">';

+            $out .= '<form method="post" action="'.$page.'">';

             $out .= '<input type="hidden" name="action" value="classin">';

-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $out .= $formproject->select_projects($socid, $selected, $htmlname, $maxlength, 0, 1, $discard_closed, $forcefocus, 0, 0, '', 1);

-            $out .= '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            $out .= '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             $out .= '</form>';

         } else {

             if ($selected) {

@@ -4045,11 +4045,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setconditions">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->select_conditions_paiements($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4076,11 +4076,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setavailability">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectAvailabilityDelay($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4106,11 +4106,11 @@ 
     {

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setdemandreason">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->selectInputReason($selected, $htmlname, -1, $addempty);

-            print '<input type="submit" class="button" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4148,14 +4148,14 @@ 
         $ret = '';

 

         if ($htmlname != "none") {

-            $ret .= '<form method="post" action="' . $page . '" name="form' . $htmlname . '">';

-            $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

-            $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $ret .= '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';

+            $ret .= '<input type="hidden" name="action" value="set'.$htmlname.'">';

+            $ret .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $ret .= '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

             $ret .= '<tr><td>';

-            $ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form' . $htmlname, 1, 0);

+            $ret .= $this->selectDate($selected, $htmlname, $displayhour, $displaymin, 1, 'form'.$htmlname, 1, 0);

             $ret .= '</td>';

-            $ret .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

+            $ret .= '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

             $ret .= '</tr></table></form>';

         } else {

             if ($displayhour)

@@ -4186,15 +4186,15 @@ 
         global $langs;

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '" name="form' . $htmlname . '">';

-            print '<input type="hidden" name="action" value="set' . $htmlname . '">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<form method="POST" action="'.$page.'" name="form'.$htmlname.'">';

+            print '<input type="hidden" name="action" value="set'.$htmlname.'">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print $this->select_dolusers($selected, $htmlname, 1, $exclude, 0, $include);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';

                 $theuser = new User($this->db);

                 $theuser->fetch($selected);

                 print $theuser->getNomUrl(1);

@@ -4220,11 +4220,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmode">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $this->select_types_paiements($selected, $htmlname, $filtertype, 0, 0, 0, 0, $active);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if ($selected) {

@@ -4250,11 +4250,11 @@ 
         // phpcs:enable

         global $langs;

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmulticurrencycode">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print $this->selectMultiCurrency($selected, $htmlname, 0);

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             dol_include_once('/core/lib/company.lib.php');

@@ -4278,21 +4278,21 @@ 
         global $langs, $mysoc, $conf;

 

         if ($htmlname != "none") {

-            print '<form method="POST" action="' . $page . '">';

+            print '<form method="POST" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setmulticurrencyrate">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-            print '<input type="text" name="' . $htmlname . '" value="' . (!empty($rate) ? price($rate) : 1) . '" size="10" /> ';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+            print '<input type="text" name="'.$htmlname.'" value="'.(!empty($rate) ? price($rate) : 1).'" size="10" /> ';

             print '<select name="calculation_mode">';

-            print '<option value="1">' . $currency . ' > ' . $conf->currency . '</option>';

-            print '<option value="2">' . $conf->currency . ' > ' . $currency . '</option>';

+            print '<option value="1">'.$currency.' > '.$conf->currency.'</option>';

+            print '<option value="2">'.$conf->currency.' > '.$currency.'</option>';

             print '</select> ';

-            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             print '</form>';

         } else {

             if (!empty($rate)) {

                 print price($rate, 1, $langs, 1, 0);

                 if ($currency && $rate != 1)

-                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';

+                    print ' &nbsp; ('.price($rate, 1, $langs, 1, 0).' '.$currency.' = 1 '.$conf->currency.')';

             }

             else {

                 print 1;

@@ -4321,14 +4321,14 @@ 
         // phpcs:enable

         global $conf, $langs;

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="setabsolutediscount">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print '<div class="inline-block">';

             if (!empty($discount_type)) {

                 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

                     if (!$filter || $filter == "fk_invoice_supplier_source IS NULL")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice

+                        $translationKey = 'HasAbsoluteDiscountFromSupplier'; // If we want deposit to be substracted to payments only and not to total of final invoice

                     else

                         $translationKey = 'HasCreditNoteFromSupplier';

                 }

@@ -4341,7 +4341,7 @@ 
             } else {

                 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

                     if (!$filter || $filter == "fk_facture_source IS NULL")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice

+                        $translationKey = 'CompanyHasAbsoluteDiscount'; // If we want deposit to be substracted to payments only and not to total of final invoice

                     else

                         $translationKey = 'CompanyHasCreditNote';

                 }

@@ -4358,21 +4358,21 @@ 
             print '</div>';

             if (empty($hidelist)) {

                 print '<div class="inline-block" style="padding-right: 10px">';

-                $newfilter = 'discount_type=' . intval($discount_type);

+                $newfilter = 'discount_type='.intval($discount_type);

                 if (!empty($discount_type)) {

                     $newfilter .= ' AND fk_invoice_supplier IS NULL AND fk_invoice_supplier_line IS NULL'; // Supplier discounts available

                 } else {

                     $newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available

                 }

                 if ($filter)

-                    $newfilter .= ' AND (' . $filter . ')';

+                    $newfilter .= ' AND ('.$filter.')';

                 $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);

                 if ($nbqualifiedlines > 0) {

-                    print ' &nbsp; <input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans("UseLine")) . '"';

+                    print ' &nbsp; <input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';

                     if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

                     if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                        print ' title="'.$langs->trans("UseCreditNoteInInvoicePayment").'"';

 

                     print '>';

                 }

@@ -4409,22 +4409,22 @@ 
         global $langs, $conf;

 

         if ($htmlname != "none") {

-            print '<form method="post" action="' . $page . '">';

+            print '<form method="post" action="'.$page.'">';

             print '<input type="hidden" name="action" value="set_contact">';

-            print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';

             print '<tr><td>';

             $num = $this->select_contacts($societe->id, $selected, $htmlname);

             if ($num == 0) {

                 $addcontact = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));

-                print '<a href="' . DOL_URL_ROOT . '/contact/card.php?socid=' . $societe->id . '&amp;action=create&amp;backtoreferer=1">' . $addcontact . '</a>';

+                print '<a href="'.DOL_URL_ROOT.'/contact/card.php?socid='.$societe->id.'&amp;action=create&amp;backtoreferer=1">'.$addcontact.'</a>';

             }

             print '</td>';

-            print '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

+            print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';

             print '</tr></table></form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';

                 $contact = new Contact($this->db);

                 $contact->fetch($selected);

                 print $contact->getFullName($langs);

@@ -4456,15 +4456,15 @@ 
 

         $out = '';

         if ($htmlname != "none") {

-            $out .= '<form method="post" action="' . $page . '">';

+            $out .= '<form method="post" action="'.$page.'">';

             $out .= '<input type="hidden" name="action" value="set_thirdparty">';

-            $out .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+            $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

             $out .= $this->select_company($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events);

-            $out .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            $out .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';

             $out .= '</form>';

         } else {

             if ($selected) {

-                require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';

+                require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';

                 $soc = new Societe($this->db);

                 $soc->fetch($selected);

                 $out .= $soc->getNomUrl($langs);

@@ -4510,17 +4510,17 @@ 
         $out = '';

 

         if ($selected == 'euro' || $selected == 'euros')

-            $selected = 'EUR';   // Pour compatibilite

+            $selected = 'EUR'; // Pour compatibilite

 

-        $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';

         foreach ($langs->cache_currencies as $code_iso => $currency) {

             if ($selected && $selected == $code_iso) {

-                $out .= '<option value="' . $code_iso . '" selected>';

+                $out .= '<option value="'.$code_iso.'" selected>';

             } else {

-                $out .= '<option value="' . $code_iso . '">';

+                $out .= '<option value="'.$code_iso.'">';

             }

             $out .= $currency['label'];

-            $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

+            $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

             $out .= '</option>';

         }

         $out .= '</select>';

@@ -4528,7 +4528,7 @@ 
             $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

 

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

         $out .= ajax_combobox($htmlname);

 

         return $out;

@@ -4546,12 +4546,12 @@ 
     {

         global $db, $conf, $langs, $user;

 

-        $langs->loadCacheCurrencies('');        // Load ->cache_currencies

+        $langs->loadCacheCurrencies(''); // Load ->cache_currencies

 

         $TCurrency = array();

 

-        $sql = 'SELECT code FROM ' . MAIN_DB_PREFIX . 'multicurrency';

-        $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

+        $sql = 'SELECT code FROM '.MAIN_DB_PREFIX.'multicurrency';

+        $sql .= " WHERE entity IN ('".getEntity('mutlicurrency')."')";

         $resql = $db->query($sql);

         if ($resql) {

             while ($obj = $db->fetch_object($resql))

@@ -4559,7 +4559,7 @@ 
         }

 

         $out = '';

-        $out .= '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

+        $out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';

         if ($useempty)

             $out .= '<option value=""></option>';

         // If company current currency not in table, we add it into list. Should always be available.

@@ -4570,12 +4570,12 @@ 
             foreach ($langs->cache_currencies as $code_iso => $currency) {

                 if (isset($TCurrency[$code_iso])) {

                     if (!empty($selected) && $selected == $code_iso)

-                        $out .= '<option value="' . $code_iso . '" selected="selected">';

+                        $out .= '<option value="'.$code_iso.'" selected="selected">';

                     else

-                        $out .= '<option value="' . $code_iso . '">';

+                        $out .= '<option value="'.$code_iso.'">';

 

                     $out .= $currency['label'];

-                    $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

+                    $out .= ' ('.$langs->getCurrencySymbol($code_iso).')';

                     $out .= '</option>';

                 }

             }

@@ -4583,7 +4583,7 @@ 
 

         $out .= '</select>';

         // Make select dynamic

-        include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+        include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

         $out .= ajax_combobox($htmlname);

 

         return $out;

@@ -4603,15 +4603,15 @@ 
 

         $num = count($this->cache_vatrates);

         if ($num > 0)

-            return $num;    // Cache already loaded

+            return $num; // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

         $sql = "SELECT DISTINCT t.rowid, t.code, t.taux, t.localtax1, t.localtax1_type, t.localtax2, t.localtax2_type, t.recuperableonly";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "c_tva as t, " . MAIN_DB_PREFIX . "c_country as c";

+        $sql .= " FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c";

         $sql .= " WHERE t.fk_pays = c.rowid";

         $sql .= " AND t.active > 0";

-        $sql .= " AND c.code IN (" . $country_code . ")";

+        $sql .= " AND c.code IN (".$country_code.")";

         $sql .= " ORDER BY t.code ASC, t.taux ASC, t.recuperableonly ASC";

 

         $resql = $this->db->query($sql);

@@ -4629,28 +4629,28 @@ 
                     $this->cache_vatrates[$i]['localtax2'] = $obj->localtax2;

                     $this->cache_vatrates[$i]['localtax2_type'] = $obj->localtax1_type;

 

-                    $this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : '');   // Label must contains only 0-9 , . % or *

-                    $this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+                    $this->cache_vatrates[$i]['label'] = $obj->taux.'%'.($obj->code ? ' ('.$obj->code.')' : ''); // Label must contains only 0-9 , . % or *

+                    $this->cache_vatrates[$i]['labelallrates'] = $obj->taux.'/'.($obj->localtax1 ? $obj->localtax1 : '0').'/'.($obj->localtax2 ? $obj->localtax2 : '0').($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

                     $positiverates = '';

                     if ($obj->taux)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->taux;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->taux;

                     if ($obj->localtax1)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->localtax1;

                     if ($obj->localtax2)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

+                        $positiverates .= ($positiverates ? '/' : '').$obj->localtax2;

                     if (empty($positiverates))

                         $positiverates = '0';

-                    $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

+                    $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates.($obj->code ? ' ('.$obj->code.')' : ''); // Must never be used as key, only label

                 }

 

                 return $num;

             }

             else {

-                $this->error = '<font class="error">' . $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code) . '</font>';

+                $this->error = '<font class="error">'.$langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code).'</font>';

                 return -1;

             }

         } else {

-            $this->error = '<font class="error">' . $this->db->error() . '</font>';

+            $this->error = '<font class="error">'.$this->db->error().'</font>';

             return -2;

         }

     }

@@ -4699,9 +4699,9 @@ 
         // Check parameters

         if (is_object($societe_vendeuse) && !$societe_vendeuse->country_code) {

             if ($societe_vendeuse->id == $mysoc->id) {

-                $return .= '<font class="error">' . $langs->trans("ErrorYourCountryIsNotDefined") . '</div>';

+                $return .= '<font class="error">'.$langs->trans("ErrorYourCountryIsNotDefined").'</div>';

             } else {

-                $return .= '<font class="error">' . $langs->trans("ErrorSupplierCountryIsNotDefined") . '</div>';

+                $return .= '<font class="error">'.$langs->trans("ErrorSupplierCountryIsNotDefined").'</div>';

             }

             return $return;

         }

@@ -4712,32 +4712,32 @@ 
         // Define list of countries to use to search VAT rates to show

         // First we defined code_country to use to find list

         if (is_object($societe_vendeuse)) {

-            $code_country = "'" . $societe_vendeuse->country_code . "'";

+            $code_country = "'".$societe_vendeuse->country_code."'";

         } else {

-            $code_country = "'" . $mysoc->country_code . "'";   // Pour compatibilite ascendente

+            $code_country = "'".$mysoc->country_code."'"; // Pour compatibilite ascendente

         }

         if (!empty($conf->global->SERVICE_ARE_ECOMMERCE_200238EC)) {    // If option to have vat for end customer for services is on

-            require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';

             if (!isInEEC($societe_vendeuse) && (!is_object($societe_acheteuse) || (isInEEC($societe_acheteuse) && !$societe_acheteuse->isACompany()))) {

                 // We also add the buyer

                 if (is_numeric($type)) {

                     if ($type == 1) { // We know product is a service

-                        $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                        $code_country .= ",'".$societe_acheteuse->country_code."'";

                     }

                 } else if (!$idprod) {  // We don't know type of product

-                    $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                    $code_country .= ",'".$societe_acheteuse->country_code."'";

                 } else {

                     $prodstatic = new Product($this->db);

                     $prodstatic->fetch($idprod);

                     if ($prodstatic->type == Product::TYPE_SERVICE) {   // We know product is a service

-                        $code_country .= ",'" . $societe_acheteuse->country_code . "'";

+                        $code_country .= ",'".$societe_acheteuse->country_code."'";

                     }

                 }

             }

         }

 

         // Now we get list

-        $num = $this->load_cache_vatrates($code_country);   // If no vat defined, return -1 with message into this->error

+        $num = $this->load_cache_vatrates($code_country); // If no vat defined, return -1 with message into this->error

 

         if ($num > 0) {

             // Definition du taux a pre-selectionner (si defaulttx non force et donc vaut -1 ou '')

@@ -4768,13 +4768,13 @@ 
             if (is_object($societe_vendeuse) && $societe_vendeuse->id == $mysoc->id && $societe_vendeuse->tva_assuj == "0") {

                 // Override/enable VAT for expense report regardless of global setting - needed if expense report used for business expenses

                 if (empty($conf->global->OVERRIDE_VAT_FOR_EXPENSE_REPORT)) {

-                    $title = ' title="' . $langs->trans('VATIsNotUsed') . '"';

+                    $title = ' title="'.$langs->trans('VATIsNotUsed').'"';

                     $disabled = true;

                 }

             }

 

             if (!$options_only)

-                $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';

+                $return .= '<select class="flat minwidth75imp" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled ? ' disabled' : '').$title.'>';

 

             $selectedfound = false;

             foreach ($this->cache_vatrates as $rate) {

@@ -4786,11 +4786,11 @@ 
                 $key = $rate['txtva'];

                 $key .= $rate['nprtva'] ? '*' : '';

                 if ($mode > 0 && $rate['code'])

-                    $key .= ' (' . $rate['code'] . ')';

+                    $key .= ' ('.$rate['code'].')';

                 if ($mode < 0)

                     $key = $rate['rowid'];

 

-                $return .= '<option value="' . $key . '"';

+                $return .= '<option value="'.$key.'"';

                 if (!$selectedfound) {

                     if ($defaultcode) { // If defaultcode is defined, we used it in priority to select combo option instead of using rate+npr flag

                         if ($defaultcode == $rate['code']) {

@@ -4810,7 +4810,7 @@ 
                     $return .= vatrate($rate['label']);

                 }

                 //$return.=($rate['code']?' '.$rate['code']:'');

-                $return .= (empty($rate['code']) && $rate['nprtva']) ? ' *' : '';         // We show the *  (old behaviour only if new vat code is not used)

+                $return .= (empty($rate['code']) && $rate['nprtva']) ? ' *' : ''; // We show the *  (old behaviour only if new vat code is not used)

 

                 $return .= '</option>';

             }

@@ -4909,7 +4909,7 @@ 
         $orig_set_time = $set_time;

 

         if ($set_time === '' && $emptydate == 0) {

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

             $set_time = dol_now('tzuser') - (getServerTimeZoneInt('now') * 3600); // set_time must be relative to PHP server timezone

         }

 

@@ -4962,36 +4962,36 @@ 
                 //print "e".$set_time." t ".$conf->format_date_short;

                 if (strval($set_time) != '' && $set_time != -1) {

                     //$formated_date=dol_print_date($set_time,$conf->format_date_short);

-                    $formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput"));  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $formated_date = dol_print_date($set_time, $langs->trans("FormatDateShortInput")); // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

                 }

 

                 // Calendrier popup version eldy

                 if ($usecalendar == "eldy") {

                     // Zone de saisie manuelle de la date

-                    $retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidth75" maxlength="11" value="' . $formated_date . '"';

+                    $retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

                     $retstring .= ($disabled ? ' disabled' : '');

-                    $retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

                     $retstring .= '>';

 

                     // Icone calendrier

                     if (!$disabled) {

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons"';

-                        $base = DOL_URL_ROOT . '/core/';

-                        $retstring .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

-                        $retstring .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';

+                        $base = DOL_URL_ROOT.'/core/';

+                        $retstring .= ' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');"';

+                        $retstring .= '>'.img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"').'</button>';

                     } else

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

 

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

                 }

                 elseif ($usecalendar == 'jquery') {

                     if (!$disabled) {

                         // Output javascript for datepicker

                         $retstring .= "<script type='text/javascript'>";

-                        $retstring .= "$(function(){ $('#" . $prefix . "').datepicker({

-							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput") . "',

+                        $retstring .= "$(function(){ $('#".$prefix."').datepicker({

+							dateFormat: '" . $langs->trans("FormatDateShortJQueryInput")."',

 							autoclose: true,

 							todayHighlight: true,";

                         if (!empty($conf->dol_use_jmobile)) {

@@ -5014,7 +5014,7 @@ 
                              */

                             $retstring .= "

 								showOn: 'button',

-								buttonImage: '" . DOL_BASE_URI . "/theme/" . $conf->theme . "/img/object_calendarday.png',

+								buttonImage: '" . DOL_BASE_URI."/theme/".$conf->theme."/img/object_calendarday.png',

 								buttonImageOnly: true";

                         }

                         $retstring .= "

@@ -5024,9 +5024,9 @@ 
 

                     // Zone de saisie manuelle de la date

                     $retstring .= '<div class="nowrap inline-block">';

-                    $retstring .= '<input id="' . $prefix . '" name="' . $prefix . '" type="text" class="maxwidth75" maxlength="11" value="' . $formated_date . '"';

+                    $retstring .= '<input id="'.$prefix.'" name="'.$prefix.'" type="text" class="maxwidth75" maxlength="11" value="'.$formated_date.'"';

                     $retstring .= ($disabled ? ' disabled' : '');

-                    $retstring .= ' onChange="dpChangeDay(\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

+                    $retstring .= ' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "'; // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript

                     $retstring .= '>';

 

                     // Icone calendrier

@@ -5041,13 +5041,13 @@ 
                           $retstring.='});';

                           $retstring.="</script>"; */

                     } else {

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                        $retstring .= '<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"').'</button>';

                     }

 

                     $retstring .= '</div>';

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

-                    $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'day"   name="'.$prefix.'day"   value="'.$sday.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'month" name="'.$prefix.'month" value="'.$smonth.'">'."\n";

+                    $retstring .= '<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";

                 } else {

                     $retstring .= "Bad value of MAIN_POPUP_CALENDAR";

                 }

@@ -5056,26 +5056,26 @@ 
             else {

                 //$retstring.='<div class="inline-block">';

                 // Day

-                $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50imp" id="' . $prefix . 'day" name="' . $prefix . 'day">';

+                $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50imp" id="'.$prefix.'day" name="'.$prefix.'day">';

 

                 if ($emptydate || $set_time == -1) {

                     $retstring .= '<option value="0" selected>&nbsp;</option>';

                 }

 

                 for ($day = 1; $day <= 31; $day++) {

-                    $retstring .= '<option value="' . $day . '"' . ($day == $sday ? ' selected' : '') . '>' . $day . '</option>';

+                    $retstring .= '<option value="'.$day.'"'.($day == $sday ? ' selected' : '').'>'.$day.'</option>';

                 }

 

                 $retstring .= "</select>";

 

-                $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'month" name="' . $prefix . 'month">';

+                $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'month" name="'.$prefix.'month">';

                 if ($emptydate || $set_time == -1) {

                     $retstring .= '<option value="0" selected>&nbsp;</option>';

                 }

 

                 // Month

                 for ($month = 1; $month <= 12; $month++) {

-                    $retstring .= '<option value="' . $month . '"' . ($month == $smonth ? ' selected' : '') . '>';

+                    $retstring .= '<option value="'.$month.'"'.($month == $smonth ? ' selected' : '').'>';

                     $retstring .= dol_print_date(mktime(12, 0, 0, $month, 1, 2000), "%b");

                     $retstring .= "</option>";

                 }

@@ -5083,12 +5083,12 @@ 
 

                 // Year

                 if ($emptydate || $set_time == -1) {

-                    $retstring .= '<input' . ($disabled ? ' disabled' : '') . ' placeholder="' . dol_escape_htmltag($langs->trans("Year")) . '" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="' . $prefix . 'year" name="' . $prefix . 'year" value="' . $syear . '">';

+                    $retstring .= '<input'.($disabled ? ' disabled' : '').' placeholder="'.dol_escape_htmltag($langs->trans("Year")).'" class="flat maxwidth50imp valignmiddle" type="number" min="0" max="3000" maxlength="4" id="'.$prefix.'year" name="'.$prefix.'year" value="'.$syear.'">';

                 } else {

-                    $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth75imp" id="' . $prefix . 'year" name="' . $prefix . 'year">';

+                    $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth75imp" id="'.$prefix.'year" name="'.$prefix.'year">';

 

                     for ($year = $syear - 10; $year < $syear + 10; $year++) {

-                        $retstring .= '<option value="' . $year . '"' . ($year == $syear ? ' selected' : '') . '>' . $year . '</option>';

+                        $retstring .= '<option value="'.$year.'"'.($year == $syear ? ' selected' : '').'>'.$year.'</option>';

                     }

                     $retstring .= "</select>\n";

                 }

@@ -5101,13 +5101,13 @@ 
 

         if ($h) {

             // Show hour

-            $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

+            $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'hour' : '').'" id="'.$prefix.'hour" name="'.$prefix.'hour">';

             if ($emptyhours)

                 $retstring .= '<option value="-1">&nbsp;</option>';

             for ($hour = 0; $hour < 24; $hour++) {

                 if (strlen($hour) < 2)

-                    $hour = "0" . $hour;

-                $retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour . (empty($conf->dol_optimize_smallscreen) ? '' : 'H') . '</option>';

+                    $hour = "0".$hour;

+                $retstring .= '<option value="'.$hour.'"'.(($hour == $shour) ? ' selected' : '').'>'.$hour.(empty($conf->dol_optimize_smallscreen) ? '' : 'H').'</option>';

             }

             $retstring .= '</select>';

             if ($m && empty($conf->dol_optimize_smallscreen))

@@ -5116,17 +5116,17 @@ 
 

         if ($m) {

             // Show minutes

-            $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

+            $retstring .= '<select'.($disabled ? ' disabled' : '').' class="flat valignmiddle maxwidth50 '.($fullday ? $fullday.'min' : '').'" id="'.$prefix.'min" name="'.$prefix.'min">';

             if ($emptyhours)

                 $retstring .= '<option value="-1">&nbsp;</option>';

             for ($min = 0; $min < 60; $min++) {

                 if (strlen($min) < 2)

-                    $min = "0" . $min;

-                $retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty($conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

+                    $min = "0".$min;

+                $retstring .= '<option value="'.$min.'"'.(($min == $smin) ? ' selected' : '').'>'.$min.(empty($conf->dol_optimize_smallscreen) ? '' : '').'</option>';

             }

             $retstring .= '</select>';

 

-            $retstring .= '<input type="hidden" name="' . $prefix . 'sec" value="' . $ssec . '">';

+            $retstring .= '<input type="hidden" name="'.$prefix.'sec" value="'.$ssec.'">';

         }

 

         // Add a "Now" link

@@ -5135,10 +5135,10 @@ 
             $reset_scripts = "";

 

             // Generate the date part, depending on the use or not of the javascript calendar

-            $reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . dol_print_date(dol_now(), 'day') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . dol_print_date(dol_now(), '%d') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . dol_print_date(dol_now(), '%m') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date(dol_now(), '%Y') . '\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y').'\');';

             /* if ($usecalendar == "eldy")

               {

               $base=DOL_URL_ROOT.'/core/';

@@ -5155,7 +5155,7 @@ 
                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

@@ -5164,13 +5164,13 @@ 
                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

-                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonNow" type="button" name="_useless" value="now" onClick="' . $reset_scripts . '">';

+                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonNow" type="button" name="_useless" value="now" onClick="'.$reset_scripts.'">';

                 $retstring .= $langs->trans("Now");

                 $retstring .= '</button> ';

             }

@@ -5182,15 +5182,15 @@ 
             $reset_scripts = "";

 

             // Generate the date part, depending on the use or not of the javascript calendar

-            $reset_scripts .= 'jQuery(\'#' . $prefix . '\').val(\'' . dol_print_date(dol_now(), 'day') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'day\').val(\'' . dol_print_date(dol_now(), '%d') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'month\').val(\'' . dol_print_date(dol_now(), '%m') . '\');';

-            $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date(dol_now(), '%Y') . '\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'\').val(\''.dol_print_date(dol_now(), 'day').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'day\').val(\''.dol_print_date(dol_now(), '%d').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'month\').val(\''.dol_print_date(dol_now(), '%m').'\');';

+            $reset_scripts .= 'jQuery(\'#'.$prefix.'year\').val(\''.dol_print_date(dol_now(), '%Y').'\');';

             // Update the hour part

             if ($h) {

                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'hour\').val(\''.dol_print_date(dol_now(), '%H').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

@@ -5198,13 +5198,13 @@ 
             if ($m) {

                 if ($fullday)

                     $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

-                $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

+                $reset_scripts .= 'jQuery(\'#'.$prefix.'min\').val(\''.dol_print_date(dol_now(), '%M').'\');';

                 if ($fullday)

                     $reset_scripts .= ' } ';

             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

-                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="' . $prefix . 'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="' . $reset_scripts . '">';

+                $retstring .= ' <button class="dpInvisibleButtons datenowlink" id="'.$prefix.'ButtonPlusOne" type="button" name="_useless2" value="plusone" onClick="'.$reset_scripts.'">';

                 $retstring .= $langs->trans("DateStartPlusOne");

                 $retstring .= '</button> ';

             }

@@ -5213,7 +5213,7 @@ 
         // Add a "Plus one hour" link

         if ($conf->use_javascript_ajax && $adddateof) {

             $tmparray = dol_getdate($adddateof);

-            $retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\'' . dol_print_date($adddateof, 'day') . '\');jQuery(\'#reday\').val(\'' . $tmparray['mday'] . '\');jQuery(\'#remonth\').val(\'' . $tmparray['mon'] . '\');jQuery(\'#reyear\').val(\'' . $tmparray['year'] . '\');">' . $langs->trans("DateInvoice") . '</a>';

+            $retstring .= ' - <button class="dpInvisibleButtons datenowlink" id="dateofinvoice" type="button" name="_dateofinvoice" value="now" onclick="jQuery(\'#re\').val(\''.dol_print_date($adddateof, 'day').'\');jQuery(\'#reday\').val(\''.$tmparray['mday'].'\');jQuery(\'#remonth\').val(\''.$tmparray['mon'].'\');jQuery(\'#reyear\').val(\''.$tmparray['year'].'\');">'.$langs->trans("DateInvoice").'</a>';

         }

 

         return $retstring;

@@ -5245,29 +5245,29 @@ 
 

         // Hours

         if ($iSecond != '') {

-            require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';

+            require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

 

             $hourSelected = convertSecondToTime($iSecond, 'allhour');

             $minSelected = convertSecondToTime($iSecond, 'min');

         }

 

         if ($typehour == 'select') {

-            $retstring .= '<select class="flat" id="select_' . $prefix . 'hour" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . '>';

+            $retstring .= '<select class="flat" id="select_'.$prefix.'hour" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').'>';

             for ($hour = 0; $hour < 25; $hour++) { // For a duration, we allow 24 hours

-                $retstring .= '<option value="' . $hour . '"';

+                $retstring .= '<option value="'.$hour.'"';

                 if ($hourSelected == $hour) {

                     $retstring .= " selected";

                 }

-                $retstring .= ">" . $hour . "</option>";

+                $retstring .= ">".$hour."</option>";

             }

             $retstring .= "</select>";

         } elseif ($typehour == 'text' || $typehour == 'textselect') {

-            $retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" size="1" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

+            $retstring .= '<input placeholder="'.$langs->trans('HourShort').'" type="number" min="0" size="1" name="'.$prefix.'hour"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputhour" value="'.(($hourSelected != '') ? ((int) $hourSelected) : '').'">';

         } else

             return 'BadValueForParameterTypeHour';

 

         if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('HourShort');

+            $retstring .= ' '.$langs->trans('HourShort');

         else

             $retstring .= '<span class="hideonsmartphone">:</span>';

 

@@ -5278,21 +5278,21 @@ 
             $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

 

         if ($typehour == 'select' || $typehour == 'textselect') {

-            $retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

+            $retstring .= '<select class="flat" id="select_'.$prefix.'min" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').'>';

             for ($min = 0; $min <= 55; $min = $min + 5) {

-                $retstring .= '<option value="' . $min . '"';

+                $retstring .= '<option value="'.$min.'"';

                 if ($minSelected == $min)

                     $retstring .= ' selected';

-                $retstring .= '>' . $min . '</option>';

+                $retstring .= '>'.$min.'</option>';

             }

             $retstring .= "</select>";

         }

         elseif ($typehour == 'text') {

-            $retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" size="1" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

+            $retstring .= '<input placeholder="'.$langs->trans('MinuteShort').'" type="number" min="0" size="1" name="'.$prefix.'min"'.($disabled ? ' disabled' : '').' class="flat maxwidth50 inputminute" value="'.(($minSelected != '') ? ((int) $minSelected) : '').'">';

         }

 

         if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('MinuteShort');

+            $retstring .= ' '.$langs->trans('MinuteShort');

 

         //$retstring.="&nbsp;";

 

@@ -5335,30 +5335,30 @@ 
             }

         }

         if (!is_object($objecttmp)) {

-            dol_syslog('Error bad setup of type for field ' . $InfoFieldList, LOG_WARNING);

-            return 'Error bad setup of type for field ' . join(',', $InfoFieldList);

+            dol_syslog('Error bad setup of type for field '.$InfoFieldList, LOG_WARNING);

+            return 'Error bad setup of type for field '.join(',', $InfoFieldList);

         }

 

         $prefixforautocompletemode = $objecttmp->element;

         if ($prefixforautocompletemode == 'societe')

             $prefixforautocompletemode = 'company';

-        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

-        dol_syslog(get_class($this) . "::selectForForms", LOG_DEBUG);

+        dol_syslog(get_class($this)."::selectForForms", LOG_DEBUG);

 

         $out = '';

         if (!empty($conf->use_javascript_ajax) && !empty($conf->global->$confkeyforautocompletemode) && !$forcecombo) {

-            $objectdesc = $classname . ':' . $classpath;

-            $urlforajaxcall = DOL_URL_ROOT . '/core/ajax/selectobject.php';

+            $objectdesc = $classname.':'.$classpath;

+            $urlforajaxcall = DOL_URL_ROOT.'/core/ajax/selectobject.php';

             //if ($objecttmp->element == 'societe') $urlforajaxcall = DOL_URL_ROOT.'/societe/ajax/company.php';

             // No immediate load of all database

-            $urloption = 'htmlname=' . $htmlname . '&outjson=1&objectdesc=' . $objectdesc . ($moreparams ? $moreparams : '');

+            $urloption = 'htmlname='.$htmlname.'&outjson=1&objectdesc='.$objectdesc.($moreparams ? $moreparams : '');

             // Activate the auto complete using ajax call.

             $out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

             if ($placeholder)

-                $placeholder = ' placeholder="' . $placeholder . '"';

-            $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $preselectedvalue . '"' . $placeholder . ' />';

+                $placeholder = ' placeholder="'.$placeholder.'"';

+            $out .= '<input type="text" class="'.$morecss.'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$preselectedvalue.'"'.$placeholder.' />';

         }

         else {

             // Immediate load of all database

@@ -5392,14 +5392,14 @@ 
         $prefixforautocompletemode = $objecttmp->element;

         if ($prefixforautocompletemode == 'societe')

             $prefixforautocompletemode = 'company';

-        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

+        $confkeyforautocompletemode = strtoupper($prefixforautocompletemode).'_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         $fieldstoshow = 't.ref';

         if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields ( like societe, contact, ...)

             $tmpfieldstoshow = '';

             foreach ($objecttmp->fields as $key => $val) {

                 if ($val['showoncombobox'])

-                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

+                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '').'t.'.$key;

             }

             if ($tmpfieldstoshow)

                 $fieldstoshow = $tmpfieldstoshow;

@@ -5411,36 +5411,36 @@ 
         $num = 0;

 

         // Search data

-        $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . MAIN_DB_PREFIX . $objecttmp->table_element . " as t";

+        $sql = "SELECT t.rowid, ".$fieldstoshow." FROM ".MAIN_DB_PREFIX.$objecttmp->table_element." as t";

         if ($objecttmp->ismultientitymanaged == 2)

             if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+                $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";

         $sql .= " WHERE 1=1";

         if (!empty($objecttmp->ismultientitymanaged))

-            $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

+            $sql .= " AND t.entity IN (".getEntity($objecttmp->table_element).")";

         if ($objecttmp->ismultientitymanaged == 1 && !empty($user->societe_id)) {

             if ($objecttmp->element == 'societe')

-                $sql .= " AND t.rowid = " . $user->societe_id;

+                $sql .= " AND t.rowid = ".$user->societe_id;

             else

-                $sql .= " AND t.fk_soc = " . $user->societe_id;

+                $sql .= " AND t.fk_soc = ".$user->societe_id;

         }

         if ($searchkey != '')

             $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

         if ($objecttmp->ismultientitymanaged == 2)

             if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;

         $sql .= $this->db->order($fieldstoshow, "ASC");

         //$sql.=$this->db->plimit($limit, 0);

         // Build output string

         $resql = $this->db->query($sql);

         if ($resql) {

             if (!$forcecombo) {

-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

                 $out .= ajax_combobox($htmlname, null, $conf->global->$confkeyforautocompletemode);

             }

 

             // Construct $out and $outarray

-            $out .= '<select id="' . $htmlname . '" class="flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($moreparams ? ' ' . $moreparams : '') . ' name="' . $htmlname . '">' . "\n";

+            $out .= '<select id="'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'"'.($moreparams ? ' '.$moreparams : '').' name="'.$htmlname.'">'."\n";

 

             // Warning: Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'. Seems it is no more true with selec2 v4

             $textifempty = '&nbsp;';

@@ -5453,7 +5453,7 @@ 
                     $textifempty .= $langs->trans("All");

             }

             if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+                $out .= '<option value="-1">'.$textifempty.'</option>'."\n";

 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -5464,13 +5464,13 @@ 
                     $tmparray = explode(',', $fieldstoshow);

                     foreach ($tmparray as $key => $val) {

                         $val = preg_replace('/t\./', '', $val);

-                        $label .= (($label && $obj->$val) ? ' - ' : '') . $obj->$val;

+                        $label .= (($label && $obj->$val) ? ' - ' : '').$obj->$val;

                     }

                     if (empty($outputmode)) {

                         if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {

-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';

                         } else {

-                            $out .= '<option value="' . $obj->rowid . '">' . $label . '</option>';

+                            $out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';

                         }

                     } else {

                         array_push($outarray, array('key' => $obj->rowid, 'value' => $label, 'label' => $label));

@@ -5482,7 +5482,7 @@ 
                 }

             }

 

-            $out .= '</select>' . "\n";

+            $out .= '</select>'."\n";

         }

         else {

             dol_print_error($this->db);

@@ -5538,12 +5538,12 @@ 
             $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? (constant('REQUIRE_JQUERY_MULTISELECT') ? constant('REQUIRE_JQUERY_MULTISELECT') : 'select2') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;

 

             // Enhance with select2

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

         }

 

-        $out .= '<select id="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($disabled ? 'disabled ' : '') . 'class="flat ' . (preg_replace('/^\./', '', $htmlname)) . ($morecss ? ' ' . $morecss : '') . '"';

-        $out .= ' name="' . preg_replace('/^\./', '', $htmlname) . '" ' . ($moreparam ? $moreparam : '');

+        $out .= '<select id="'.preg_replace('/^\./', '', $htmlname).'" '.($disabled ? 'disabled ' : '').'class="flat '.(preg_replace('/^\./', '', $htmlname)).($morecss ? ' '.$morecss : '').'"';

+        $out .= ' name="'.preg_replace('/^\./', '', $htmlname).'" '.($moreparam ? $moreparam : '');

         $out .= '>';

 

         if ($show_empty) {

@@ -5552,7 +5552,7 @@ 
                 $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

             if (!is_numeric($show_empty))

                 $textforempty = $show_empty;

-            $out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

+            $out .= '<option class="optiongrey" '.($moreparamonempty ? $moreparamonempty.' ' : '').'value="'.($show_empty < 0 ? $show_empty : -1).'"'.($id == $show_empty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";

         }

 

         if (is_array($array)) {

@@ -5582,9 +5582,9 @@ 
 

                 if ($key_in_label) {

                     if (empty($nohtmlescape))

-                        $selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

+                        $selectOptionValue = dol_escape_htmltag($key.' - '.($maxlen ? dol_trunc($value, $maxlen) : $value));

                     else

-                        $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

+                        $selectOptionValue = $key.' - '.($maxlen ? dol_trunc($value, $maxlen) : $value);

                 }

                 else {

                     if (empty($nohtmlescape))

@@ -5595,12 +5595,12 @@ 
                         $selectOptionValue = '&nbsp;';

                 }

 

-                $out .= '<option value="' . $key . '"';

-                $out .= $style . $disabled;

+                $out .= '<option value="'.$key.'"';

+                $out .= $style.$disabled;

                 if ($id != '' && $id == $key && !$disabled)

-                    $out .= ' selected';  // To preselect a value

+                    $out .= ' selected'; // To preselect a value

                 if ($nohtmlescape)

-                    $out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';

+                    $out .= ' data-html="'.dol_escape_htmltag($selectOptionValue).'"';

                 $out .= '>';

                 //var_dump($selectOptionValue);

                 $out .= $selectOptionValue;

@@ -5639,19 +5639,19 @@ 
         if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

             return '';

 

-        $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

+        $out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"></select>';

 

         $tmpplugin = 'select2';

-        $outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+        $outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 	    	<script type="text/javascript">

 	    	$(document).ready(function () {

 

-    	        ' . ($callurlonselect ? 'var saveRemoteData = [];' : '') . '

+    	        ' . ($callurlonselect ? 'var saveRemoteData = [];' : '').'

 

-                $(".' . $htmlname . '").select2({

+                $(".' . $htmlname.'").select2({

 			    	ajax: {

 				    	dir: "ltr",

-				    	url: "' . $url . '",

+				    	url: "' . $url.'",

 				    	dataType: \'json\',

 				    	delay: 250,

 				    	data: function (params) {

@@ -5678,9 +5678,9 @@ 
 			    	},

 	 				language: select2arrayoflanguage,

 					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-				    placeholder: "' . dol_escape_js($placeholder) . '",

+				    placeholder: "' . dol_escape_js($placeholder).'",

 			    	escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-			    	minimumInputLength: ' . $minimumInputLength . ',

+			    	minimumInputLength: ' . $minimumInputLength.',

 			        formatResult: function(result, container, query, escapeMarkup) {

                         return escapeMarkup(result.text);

                     },

@@ -5688,10 +5688,10 @@ 
 

                 ' . ($callurlonselect ? '

                 /* Code to execute a GET when we select a value */

-                $(".' . $htmlname . '").change(function() {

-			    	var selected = $(".' . $htmlname . '").val();

+                $(".' . $htmlname.'").change(function() {

+			    	var selected = $(".' . $htmlname.'").val();

                 	console.log("We select in selectArrayAjax the entry "+selected)

-			        $(".' . $htmlname . '").val("");  /* reset visible combo value */

+			        $(".' . $htmlname.'").val("");  /* reset visible combo value */

     			    $.each( saveRemoteData, function( key, value ) {

     				        if (key == selected)

     			            {

@@ -5699,7 +5699,7 @@ 
     			                 location.assign(value.url);

     			            }

                     });

-    			});' : '' ) . '

+    			});' : '').'

 

     	   });

 	       </script>';

@@ -5739,7 +5739,7 @@ 
         if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

             return '';

 

-        $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"><option></option></select>';

+        $out = '<select type="text" class="'.$htmlname.($morecss ? ' '.$morecss : '').'" '.($moreparam ? $moreparam.' ' : '').'name="'.$htmlname.'"><option></option></select>';

 

         $formattedarrayresult = array();

 

@@ -5752,20 +5752,20 @@ 
         }

 

         $tmpplugin = 'select2';

-        $outdelayed = "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+        $outdelayed = "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 			<script type="text/javascript">

 			$(document).ready(function () {

-				var data = ' . json_encode($formattedarrayresult) . ';

+				var data = ' . json_encode($formattedarrayresult).';

 

-				' . ($callurlonselect ? 'var saveRemoteData = ' . json_encode($array) . ';' : '') . '

+				' . ($callurlonselect ? 'var saveRemoteData = '.json_encode($array).';' : '').'

 

-				$(".' . $htmlname . '").select2({

+				$(".' . $htmlname.'").select2({

 					data: data,

 					language: select2arrayoflanguage,

 					containerCssClass: \':all:\',					/* Line to add class of origin SELECT propagated to the new <span class="select2-selection...> tag */

-					placeholder: "' . dol_escape_js($placeholder) . '",

+					placeholder: "' . dol_escape_js($placeholder).'",

 					escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work

-					minimumInputLength: ' . $minimumInputLength . ',

+					minimumInputLength: ' . $minimumInputLength.',

 					formatResult: function(result, container, query, escapeMarkup) {

 						return escapeMarkup(result.text);

 					},

@@ -5803,11 +5803,11 @@ 
 

 				' . ($callurlonselect ? '

 				/* Code to execute a GET when we select a value */

-				$(".' . $htmlname . '").change(function() {

-					var selected = $(".' . $htmlname . '").val();

+				$(".' . $htmlname.'").change(function() {

+					var selected = $(".' . $htmlname.'").val();

 					console.log("We select "+selected)

 

-					$(".' . $htmlname . '").val("");  /* reset visible combo value */

+					$(".' . $htmlname.'").val("");  /* reset visible combo value */

 					$.each( saveRemoteData, function( key, value ) {

 						if (key == selected)

 						{

@@ -5815,7 +5815,7 @@ 
 							location.assign(value.url);

 						}

 					});

-				});' : '' ) . '

+				});' : '').'

 

 			});

 			</script>';

@@ -5855,28 +5855,28 @@ 
 

         // Add code for jquery to use multiselect

         if (!empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) || defined('REQUIRE_JQUERY_MULTISELECT')) {

-            $out .= "\n" . '<!-- JS CODE TO ENABLE ' . $tmpplugin . ' for id ' . $htmlname . ' -->

+            $out .= "\n".'<!-- JS CODE TO ENABLE '.$tmpplugin.' for id '.$htmlname.' -->

 						<script type="text/javascript">' . "\n";

             if ($addjscombo == 1) {

                 $tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ? constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;

-                $out .= 'function formatResult(record) {' . "\n";

+                $out .= 'function formatResult(record) {'."\n";

                 if ($elemtype == 'category') {

-                    $out .= '	//return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> <a href="' . DOL_URL_ROOT . '/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

-									  	return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> \'+record.text+\'</span>\';';

+                    $out .= '	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

+									  	return \'<span><img src="' . DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';

                 } else {

                     $out .= 'return record.text;';

                 }

-                $out .= '};' . "\n";

-                $out .= 'function formatSelection(record) {' . "\n";

+                $out .= '};'."\n";

+                $out .= 'function formatSelection(record) {'."\n";

                 if ($elemtype == 'category') {

-                    $out .= '	//return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> <a href="' . DOL_URL_ROOT . '/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

-									  	return \'<span><img src="' . DOL_URL_ROOT . '/theme/eldy/img/object_category.png' . '"> \'+record.text+\'</span>\';';

+                    $out .= '	//return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> <a href="'.DOL_URL_ROOT.'/categories/viewcat.php?type=0&id=\'+record.id+\'">\'+record.text+\'</a></span>\';

+									  	return \'<span><img src="' . DOL_URL_ROOT.'/theme/eldy/img/object_category.png'.'"> \'+record.text+\'</span>\';';

                 } else {

                     $out .= 'return record.text;';

                 }

-                $out .= '};' . "\n";

+                $out .= '};'."\n";

                 $out .= '$(document).ready(function () {

-							$(\'#' . $htmlname . '\').' . $tmpplugin . '({

+							$(\'#' . $htmlname.'\').'.$tmpplugin.'({

 								dir: \'ltr\',

 								// Specify format function for dropdown item

 								formatResult: formatResult,

@@ -5890,13 +5890,13 @@ 
                 // Add other js lib

                 // ...

                 $out .= '$(document).ready(function () {

-							$(\'#' . $htmlname . '\').multiSelect({

+							$(\'#' . $htmlname.'\').multiSelect({

 								containerHTML: \'<div class="multi-select-container">\',

 								menuHTML: \'<div class="multi-select-menu">\',

-								buttonHTML: \'<span class="multi-select-button ' . $morecss . '">\',

+								buttonHTML: \'<span class="multi-select-button ' . $morecss.'">\',

 								menuItemHTML: \'<label class="multi-select-menuitem">\',

 								activeClass: \'multi-select-container--open\',

-								noneText: \'' . $placeholder . '\'

+								noneText: \'' . $placeholder.'\'

 							});

 						})';

             }

@@ -5905,27 +5905,27 @@ 
 

         // Try also magic suggest

 

-        $out .= '<select id="' . $htmlname . '" class="multiselect' . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

+        $out .= '<select id="'.$htmlname.'" class="multiselect'.($morecss ? ' '.$morecss : '').'" multiple name="'.$htmlname.'[]"'.($moreattrib ? ' '.$moreattrib : '').($width ? ' style="width: '.(preg_match('/%/', $width) ? $width : $width.'px').'"' : '').'>'."\n";

         if (is_array($array) && !empty($array)) {

             if ($value_as_key)

                 $array = array_combine($array, $array);

 

             if (!empty($array)) {

                 foreach ($array as $key => $value) {

-                    $out .= '<option value="' . $key . '"';

+                    $out .= '<option value="'.$key.'"';

                     if (is_array($selected) && !empty($selected) && in_array($key, $selected) && !empty($key)) {

                         $out .= ' selected';

                     }

                     $out .= '>';

 

                     $newval = ($translate ? $langs->trans($value) : $value);

-                    $newval = ($key_in_label ? $key . ' - ' . $newval : $newval);

+                    $newval = ($key_in_label ? $key.' - '.$newval : $newval);

                     $out .= dol_htmlentitiesbr($newval);

-                    $out .= '</option>' . "\n";

+                    $out .= '</option>'."\n";

                 }

             }

         }

-        $out .= '</select>' . "\n";

+        $out .= '</select>'."\n";

 

         return $out;

     }

@@ -5946,7 +5946,7 @@ 
         if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

             return '';

 

-        $tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage;

+        $tmpvar = "MAIN_SELECTEDFIELDS_".$varpage;

         if (!empty($user->conf->$tmpvar)) {

             $tmparray = explode(',', $user->conf->$tmpvar);

             foreach ($array as $key => $val) {

@@ -5968,28 +5968,28 @@ 
               var_dump(array_key_exists('enabled', $val));

               var_dump(!$val['enabled']); */

             if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {

-                unset($array[$key]);     // We don't want this field

+                unset($array[$key]); // We don't want this field

                 continue;

             }

             if ($val['label']) {

-                $lis .= '<li><input type="checkbox" id="checkbox' . $key . '" value="' . $key . '"' . (empty($val['checked']) ? '' : ' checked="checked"') . '/><label for="checkbox' . $key . '">' . dol_escape_htmltag($langs->trans($val['label'])) . '</label></li>';

-                $listcheckedstring .= (empty($val['checked']) ? '' : $key . ',');

+                $lis .= '<li><input type="checkbox" id="checkbox'.$key.'" value="'.$key.'"'.(empty($val['checked']) ? '' : ' checked="checked"').'/><label for="checkbox'.$key.'">'.dol_escape_htmltag($langs->trans($val['label'])).'</label></li>';

+                $listcheckedstring .= (empty($val['checked']) ? '' : $key.',');

             }

         }

 

-        $out = '<!-- Component multiSelectArrayWithCheckbox ' . $htmlname . ' -->

+        $out = '<!-- Component multiSelectArrayWithCheckbox '.$htmlname.' -->

 

         <dl class="dropdown">

             <dt>

             <a href="#">

-              ' . img_picto('', 'list') . '

+              ' . img_picto('', 'list').'

             </a>

-            <input type="hidden" class="' . $htmlname . '" name="' . $htmlname . '" value="' . $listcheckedstring . '">

+            <input type="hidden" class="' . $htmlname.'" name="'.$htmlname.'" value="'.$listcheckedstring.'">

             </dt>

             <dd class="dropdowndd">

-                <div class="multiselectcheckbox' . $htmlname . '">

-                    <ul class="ul' . $htmlname . '">

-                    ' . $lis . '

+                <div class="multiselectcheckbox' . $htmlname.'">

+                    <ul class="ul' . $htmlname.'">

+                    ' . $lis.'

                     </ul>

                 </div>

             </dd>

@@ -5997,15 +5997,15 @@ 
 

         <script type="text/javascript">

           jQuery(document).ready(function () {

-              $(\'.multiselectcheckbox' . $htmlname . ' input[type="checkbox"]\').on(\'click\', function () {

+              $(\'.multiselectcheckbox' . $htmlname.' input[type="checkbox"]\').on(\'click\', function () {

                   console.log("A new field was added/removed")

                   $("input:hidden[name=formfilteraction]").val(\'listafterchangingselectedfields\')

                   var title = $(this).val() + ",";

                   if ($(this).is(\':checked\')) {

-                      $(\'.' . $htmlname . '\').val(title + $(\'.' . $htmlname . '\').val());

+                      $(\'.' . $htmlname.'\').val(title + $(\'.'.$htmlname.'\').val());

                   }

                   else {

-                      $(\'.' . $htmlname . '\').val( $(\'.' . $htmlname . '\').val().replace(title, \'\') )

+                      $(\'.' . $htmlname.'\').val( $(\'.'.$htmlname.'\').val().replace(title, \'\') )

                   }

                   // Now, we submit page

                   $(this).parents(\'form:first\').submit();

@@ -6029,7 +6029,7 @@ 
     {

         global $db;

 

-        include_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';

+        include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';

 

         $cat = new Categorie($db);

         $categories = $cat->containing($id, $type);

@@ -6037,12 +6037,12 @@ 
         if ($rendermode == 1) {

             $toprint = array();

             foreach ($categories as $c) {

-                $ways = $c->print_all_ways();       // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

+                $ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formated text

                 foreach ($ways as $way) {

-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';

+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #aaa"').'>'.img_object('', 'category').' '.$way.'</li>';

                 }

             }

-            return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';

+            return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';

         }

 

         if ($rendermode == 0) {

@@ -6078,7 +6078,7 @@ 
             'morehtmlright' => $morehtmlright,

             'compatibleImportElementsList' => & $compatibleImportElementsList,

         );

-        $reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('showLinkedObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

 

         if (empty($reshook)) {

             $nbofdifferenttypes = count($object->linkedObjects);

@@ -6088,15 +6088,15 @@ 
 

 

             print '<div class="div-table-responsive-no-min">';

-            print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="' . $object->element . '"  data-elementid="' . $object->id . '"   >';

+            print '<table class="noborder allwidth" data-block="showLinkedObject" data-element="'.$object->element.'"  data-elementid="'.$object->id.'"   >';

 

             print '<tr class="liste_titre">';

-            print '<td>' . $langs->trans("Type") . '</td>';

-            print '<td>' . $langs->trans("Ref") . '</td>';

+            print '<td>'.$langs->trans("Type").'</td>';

+            print '<td>'.$langs->trans("Ref").'</td>';

             print '<td align="center"></td>';

-            print '<td align="center">' . $langs->trans("Date") . '</td>';

-            print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';

-            print '<td align="right">' . $langs->trans("Status") . '</td>';

+            print '<td align="center">'.$langs->trans("Date").'</td>';

+            print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';

+            print '<td align="right">'.$langs->trans("Status").'</td>';

             print '<td></td>';

             print '</tr>';

 

@@ -6114,13 +6114,13 @@ 
                 if ($objecttype != 'supplier_proposal' && preg_match('/^([^_]+)_([^_]+)/i', $objecttype, $regs)) {

                     $element = $regs[1];

                     $subelement = $regs[2];

-                    $tplpath = $element . '/' . $subelement;

+                    $tplpath = $element.'/'.$subelement;

                 }

                 $tplname = 'linkedobjectblock';

 

                 // To work with non standard path

                 if ($objecttype == 'facture') {

-                    $tplpath = 'compta/' . $element;

+                    $tplpath = 'compta/'.$element;

                     if (empty($conf->facture->enabled))

                         continue; // Do not show if module disabled

                 }

@@ -6131,7 +6131,7 @@ 
                         continue; // Do not show if module disabled

                 }

                 else if ($objecttype == 'propal') {

-                    $tplpath = 'comm/' . $element;

+                    $tplpath = 'comm/'.$element;

                     if (empty($conf->propal->enabled))

                         continue; // Do not show if module disabled

                 }

@@ -6169,14 +6169,14 @@ 
 

 

                 // Output template part (modules that overwrite templates must declare this into descriptor)

-                $dirtpls = array_merge($conf->modules_parts['tpl'], array('/' . $tplpath . '/tpl'));

+                $dirtpls = array_merge($conf->modules_parts['tpl'], array('/'.$tplpath.'/tpl'));

                 foreach ($dirtpls as $reldir) {

                     if ($nboftypesoutput == ($nbofdifferenttypes - 1)) {    // No more type to show after

                         global $noMoreLinkedObjectBlockAfter;

                         $noMoreLinkedObjectBlockAfter = 1;

                     }

 

-                    $res = @include dol_buildpath($reldir . '/' . $tplname . '.tpl.php');

+                    $res = @include dol_buildpath($reldir.'/'.$tplname.'.tpl.php');

                     if ($res) {

                         $nboftypesoutput++;

                         break;

@@ -6185,7 +6185,7 @@ 
             }

 

             if (!$nboftypesoutput) {

-                print '<tr><td class="impair opacitymedium" colspan="7">' . $langs->trans("None") . '</td></tr>';

+                print '<tr><td class="impair opacitymedium" colspan="7">'.$langs->trans("None").'</td></tr>';

             }

 

             print '</table>';

@@ -6225,26 +6225,26 @@ 
         if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

             $listofidcompanytoscan = $object->thirdparty->id;

             if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO))

-                $listofidcompanytoscan .= ',' . $object->thirdparty->parent;

+                $listofidcompanytoscan .= ','.$object->thirdparty->parent;

             if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {

-                include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

+                include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';

                 $tmpproject = new Project($this->db);

                 $tmpproject->fetch($object->fk_project);

                 if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id))

-                    $listofidcompanytoscan .= ',' . $tmpproject->socid;

+                    $listofidcompanytoscan .= ','.$tmpproject->socid;

                 unset($tmpproject);

             }

 

             $possiblelinks = array(

-                'propal' => array('enabled' => $conf->propal->enabled, 'perms' => 1, 'label' => 'LinkToProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('propal') . ')'),

-                'order' => array('enabled' => $conf->commande->enabled, 'perms' => 1, 'label' => 'LinkToOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('commande') . ')'),

-                'invoice' => array('enabled' => $conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-                'invoice_template' => array('enabled' => $conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToTemplateInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('invoice') . ')'),

-                'contrat' => array('enabled' => $conf->contrat->enabled, 'perms' => 1, 'label' => 'LinkToContract', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('contract') . ')'),

-                'fichinter' => array('enabled' => $conf->ficheinter->enabled, 'perms' => 1, 'label' => 'LinkToIntervention', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('intervention') . ')'),

-                'supplier_proposal' => array('enabled' => $conf->supplier_proposal->enabled, 'perms' => 1, 'label' => 'LinkToSupplierProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('supplier_proposal') . ')'),

-                'order_supplier' => array('enabled' => $conf->supplier_order->enabled, 'perms' => 1, 'label' => 'LinkToSupplierOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('commande_fournisseur') . ')'),

-                'invoice_supplier' => array('enabled' => $conf->supplier_invoice->enabled, 'perms' => 1, 'label' => 'LinkToSupplierInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM " . MAIN_DB_PREFIX . "societe as s, " . MAIN_DB_PREFIX . "facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (" . $listofidcompanytoscan . ') AND t.entity IN (' . getEntity('facture_fourn') . ')')

+                'propal' => array('enabled' => $conf->propal->enabled, 'perms' => 1, 'label' => 'LinkToProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('propal').')'),

+                'order' => array('enabled' => $conf->commande->enabled, 'perms' => 1, 'label' => 'LinkToOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande').')'),

+                'invoice' => array('enabled' => $conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+                'invoice_template' => array('enabled' => $conf->facture->enabled, 'perms' => 1, 'label' => 'LinkToTemplateInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('invoice').')'),

+                'contrat' => array('enabled' => $conf->contrat->enabled, 'perms' => 1, 'label' => 'LinkToContract', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, '' as total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('contract').')'),

+                'fichinter' => array('enabled' => $conf->ficheinter->enabled, 'perms' => 1, 'label' => 'LinkToIntervention', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('intervention').')'),

+                'supplier_proposal' => array('enabled' => $conf->supplier_proposal->enabled, 'perms' => 1, 'label' => 'LinkToSupplierProposal', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, '' as ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."supplier_proposal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('supplier_proposal').')'),

+                'order_supplier' => array('enabled' => $conf->supplier_order->enabled, 'perms' => 1, 'label' => 'LinkToSupplierOrder', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."commande_fournisseur as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('commande_fournisseur').')'),

+                'invoice_supplier' => array('enabled' => $conf->supplier_invoice->enabled, 'perms' => 1, 'label' => 'LinkToSupplierInvoice', 'sql' => "SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_supplier, t.total_ht FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$listofidcompanytoscan.') AND t.entity IN ('.getEntity('facture_fourn').')')

             );

         }

 

@@ -6253,7 +6253,7 @@ 
         // Can complete the possiblelink array

         $hookmanager->initHooks(array('commonobject'));

         $parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);

-        $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook

         if (empty($reshook)) {

             if (is_array($hookmanager->resArray) && count($hookmanager->resArray)) {

                 $possiblelinks = array_merge($possiblelinks, $hookmanager->resArray);

@@ -6271,7 +6271,7 @@ 
                 continue;

 

             if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

-                print '<div id="' . $key . 'list"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '') . '>';

+                print '<div id="'.$key.'list"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '').'>';

                 $sql = $possiblelink['sql'];

 

                 $resqllist = $this->db->query($sql);

@@ -6279,34 +6279,34 @@ 
                     $num = $this->db->num_rows($resqllist);

                     $i = 0;

 

-                    print '<br><form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="formlinked' . $key . '">';

-                    print '<input type="hidden" name="id" value="' . $object->id . '">';

+                    print '<br><form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formlinked'.$key.'">';

+                    print '<input type="hidden" name="id" value="'.$object->id.'">';

                     print '<input type="hidden" name="action" value="addlink">';

-                    print '<input type="hidden" name="addlink" value="' . $key . '">';

+                    print '<input type="hidden" name="addlink" value="'.$key.'">';

                     print '<table class="noborder">';

                     print '<tr class="liste_titre">';

                     print '<td class="nowrap"></td>';

-                    print '<td align="center">' . $langs->trans("Ref") . '</td>';

-                    print '<td align="left">' . $langs->trans("RefCustomer") . '</td>';

-                    print '<td align="right">' . $langs->trans("AmountHTShort") . '</td>';

-                    print '<td align="left">' . $langs->trans("Company") . '</td>';

+                    print '<td align="center">'.$langs->trans("Ref").'</td>';

+                    print '<td align="left">'.$langs->trans("RefCustomer").'</td>';

+                    print '<td align="right">'.$langs->trans("AmountHTShort").'</td>';

+                    print '<td align="left">'.$langs->trans("Company").'</td>';

                     print '</tr>';

                     while ($i < $num) {

                         $objp = $this->db->fetch_object($resqllist);

 

                         print '<tr class="oddeven">';

                         print '<td aling="left">';

-                        print '<input type="radio" name="idtolinkto" value=' . $objp->rowid . '>';

+                        print '<input type="radio" name="idtolinkto" value='.$objp->rowid.'>';

                         print '</td>';

-                        print '<td align="center">' . $objp->ref . '</td>';

-                        print '<td>' . $objp->ref_client . '</td>';

-                        print '<td align="right">' . price($objp->total_ht) . '</td>';

-                        print '<td>' . $objp->name . '</td>';

+                        print '<td align="center">'.$objp->ref.'</td>';

+                        print '<td>'.$objp->ref_client.'</td>';

+                        print '<td align="right">'.price($objp->total_ht).'</td>';

+                        print '<td>'.$objp->name.'</td>';

                         print '</tr>';

                         $i++;

                     }

                     print '</table>';

-                    print '<div class="center"><input type="submit" class="button valignmiddle" value="' . $langs->trans('ToLink') . '">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>';

+                    print '<div class="center"><input type="submit" class="button valignmiddle" value="'.$langs->trans('ToLink').'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></div>';

 

                     print '</form>';

                     $this->db->free($resqllist);

@@ -6320,20 +6320,20 @@ 
 

                 //$linktoelem.=($linktoelem?' &nbsp; ':'');

                 if ($num > 0)

-                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

+                    $linktoelemlist .= '<li><a href="#linkto'.$key.'" class="linkto dropdowncloseonclick" rel="'.$key.'">'.$langs->trans($possiblelink['label']).' ('.$num.')</a></li>';

                 //else $linktoelem.=$langs->trans($possiblelink['label']);

                 else

-                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

+                    $linktoelemlist .= '<li><span class="linktodisabled">'.$langs->trans($possiblelink['label']).' (0)</span></li>';

             }

         }

 

         if ($linktoelemlist) {

             $linktoelem = '

     		<dl class="dropdown" id="linktoobjectname">

-    		<dt><a href="#linktoobjectname">' . $langs->trans("LinkTo") . '...</a></dt>

+    		<dt><a href="#linktoobjectname">' . $langs->trans("LinkTo").'...</a></dt>

     		<dd>

     		<div class="multiselectlinkto">

-    		<ul class="ulselectedfields">' . $linktoelemlist . '

+    		<ul class="ulselectedfields">' . $linktoelemlist.'

     		</ul>

     		</div>

     		</dd>

@@ -6380,18 +6380,18 @@ 
 

         $disabled = ($disabled ? ' disabled' : '');

 

-        $resultyesno = '<select class="flat width75" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

+        $resultyesno = '<select class="flat width75" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";

         if ($useempty)

-            $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+            $resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";

         if (("$value" == 'yes') || ($value == 1)) {

-            $resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans("Yes") . '</option>' . "\n";

-            $resultyesno .= '<option value="' . $no . '">' . $langs->trans("No") . '</option>' . "\n";

+            $resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";

+            $resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";

         } else {

             $selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');

-            $resultyesno .= '<option value="' . $yes . '">' . $langs->trans("Yes") . '</option>' . "\n";

-            $resultyesno .= '<option value="' . $no . '"' . $selected . '>' . $langs->trans("No") . '</option>' . "\n";

+            $resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";

+            $resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";

         }

-        $resultyesno .= '</select>' . "\n";

+        $resultyesno .= '</select>'."\n";

         return $resultyesno;

     }

 

@@ -6409,12 +6409,12 @@ 
     {

         // phpcs:enable

         $sql = "SELECT rowid, label";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "export_model";

-        $sql .= " WHERE type = '" . $type . "'";

+        $sql .= " FROM ".MAIN_DB_PREFIX."export_model";

+        $sql .= " WHERE type = '".$type."'";

         $sql .= " ORDER BY rowid";

         $result = $this->db->query($sql);

         if ($result) {

-            print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

+            print '<select class="flat" id="select_'.$htmlname.'" name="'.$htmlname.'">';

             if ($useempty) {

                 print '<option value="-1">&nbsp;</option>';

             }

@@ -6424,9 +6424,9 @@ 
             while ($i < $num) {

                 $obj = $this->db->fetch_object($result);

                 if ($selected == $obj->rowid) {

-                    print '<option value="' . $obj->rowid . '" selected>';

+                    print '<option value="'.$obj->rowid.'" selected>';

                 } else {

-                    print '<option value="' . $obj->rowid . '">';

+                    print '<option value="'.$obj->rowid.'">';

                 }

                 print $obj->label;

                 print '</option>';

@@ -6469,7 +6469,7 @@ 
         // Add where from hooks

         if (is_object($hookmanager)) {

             $parameters = array();

-            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object);    // Note that $action and $object may have been modified by hook

+            $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook

             $object->next_prev_filter .= $hookmanager->resPrint;

         }

         $previous_ref = $next_ref = '';

@@ -6495,8 +6495,8 @@ 
                 $stringforfirstkey .= ' CTL +';

             }

 

-            $previous_ref = $object->ref_previous ? '<a accesskey="p" title="' . $stringforfirstkey . ' p" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_previous) . $moreparam . '"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

-            $next_ref = $object->ref_next ? '<a accesskey="n" title="' . $stringforfirstkey . ' n" class="classfortooltip" href="' . $navurl . '?' . $paramid . '=' . urlencode($object->ref_next) . $moreparam . '"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

+            $previous_ref = $object->ref_previous ? '<a accesskey="p" title="'.$stringforfirstkey.' p" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_previous).$moreparam.'"><i class="fa fa-chevron-left"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-left opacitymedium"></i></span>';

+            $next_ref = $object->ref_next ? '<a accesskey="n" title="'.$stringforfirstkey.' n" class="classfortooltip" href="'.$navurl.'?'.$paramid.'='.urlencode($object->ref_next).$moreparam.'"><i class="fa fa-chevron-right"></i></a>' : '<span class="inactive"><i class="fa fa-chevron-right opacitymedium"></i></span>';

         }

 

         //print "xx".$previous_ref."x".$next_ref;

@@ -6504,30 +6504,30 @@ 
 

         // Right part of banner

         if ($morehtmlright)

-            $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

+            $ret .= '<div class="inline-block floatleft">'.$morehtmlright.'</div>';

 

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '<div class="pagination paginationref"><ul class="right">';

         }

         if ($morehtml) {

-            $ret .= '<li class="noborder litext">' . $morehtml . '</li>';

+            $ret .= '<li class="noborder litext">'.$morehtml.'</li>';

         }

         if ($shownav && ($previous_ref || $next_ref)) {

-            $ret .= '<li class="pagination">' . $previous_ref . '</li>';

-            $ret .= '<li class="pagination">' . $next_ref . '</li>';

+            $ret .= '<li class="pagination">'.$previous_ref.'</li>';

+            $ret .= '<li class="pagination">'.$next_ref.'</li>';

         }

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '</ul></div>';

         }

 

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object); // Note that $action and $object may have been modified by hook

         if (empty($reshook))

             $morehtmlstatus .= $hookmanager->resPrint;

         else

             $morehtmlstatus = $hookmanager->resPrint;

         if ($morehtmlstatus)

-            $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

+            $ret .= '<div class="statusref">'.$morehtmlstatus.'</div>';

 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook

@@ -6539,29 +6539,29 @@ 
         // Left part of banner

         if ($morehtmlleft) {

             if ($conf->browser->layout == 'phone')

-                $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';    // class="center" to have photo in middle

+                $ret .= '<div class="floatleft">'.$morehtmlleft.'</div>'; // class="center" to have photo in middle

             else

-                $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';

+                $ret .= '<div class="inline-block floatleft">'.$morehtmlleft.'</div>';

         }

 

         //if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

-        $ret .= '<div class="inline-block floatleft valignmiddle refid' . (($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '') . '">';

+        $ret .= '<div class="inline-block floatleft valignmiddle refid'.(($shownav && ($previous_ref || $next_ref)) ? ' refidpadding' : '').'">';

 

         // For thirdparty, contact, user, member, the ref is the id, so we show something else

         if ($object->element == 'societe') {

             $ret .= dol_htmlentities($object->name);

         } else if ($object->element == 'member') {

-            $ret .= $object->ref . '<br>';

+            $ret .= $object->ref.'<br>';

             $fullname = $object->getFullName($langs);

             if ($object->morphy == 'mor' && $object->societe) {

-                $ret .= dol_htmlentities($object->societe) . ((!empty($fullname) && $object->societe != $fullname) ? ' (' . dol_htmlentities($fullname) . ')' : '');

+                $ret .= dol_htmlentities($object->societe).((!empty($fullname) && $object->societe != $fullname) ? ' ('.dol_htmlentities($fullname).')' : '');

             } else {

-                $ret .= dol_htmlentities($fullname) . ((!empty($object->societe) && $object->societe != $fullname) ? ' (' . dol_htmlentities($object->societe) . ')' : '');

+                $ret .= dol_htmlentities($fullname).((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');

             }

         } else if (in_array($object->element, array('contact', 'user', 'usergroup'))) {

             $ret .= dol_htmlentities($object->getFullName($langs));

         } else if (in_array($object->element, array('action', 'agenda'))) {

-            $ret .= $object->ref . '<br>' . $object->label;

+            $ret .= $object->ref.'<br>'.$object->label;

         } else if (in_array($object->element, array('adherent_type'))) {

             $ret .= $object->label;

         } else if ($object->element == 'ecm_directories') {

@@ -6571,7 +6571,7 @@ 
 

 

         if ($morehtmlref) {

-            $ret .= ' ' . $morehtmlref;

+            $ret .= ' '.$morehtmlref;

         }

         $ret .= '</div>';

 

@@ -6604,9 +6604,9 @@ 
         }

 

         // Barcode image

-        $url = DOL_URL_ROOT . '/viewimage.php?modulepart=barcode&generator=' . urlencode($object->barcode_type_coder) . '&code=' . urlencode($object->barcode) . '&encoding=' . urlencode($object->barcode_type_code);

-        $out = '<!-- url barcode = ' . $url . ' -->';

-        $out .= '<img src="' . $url . '">';

+        $url = DOL_URL_ROOT.'/viewimage.php?modulepart=barcode&generator='.urlencode($object->barcode_type_coder).'&code='.urlencode($object->barcode).'&encoding='.urlencode($object->barcode_type_code);

+        $out = '<!-- url barcode = '.$url.' -->';

+        $out .= '<img src="'.$url.'">';

         return $out;

     }

 

@@ -6643,25 +6643,25 @@ 
             $dir = $conf->societe->multidir_output[$entity];

             if (!empty($object->logo)) {

                 if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs

+                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_mini'); // getImageFileNameForSize include the thumbs

                 else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.getImageFileNameForSize($object->logo, '_small');

                 else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

+                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty').'/logos/'.$object->logo;

             }

             $email = $object->email;

         }

         else if ($modulepart == 'contact') {

-            $dir = $conf->societe->multidir_output[$entity] . '/contact';

+            $dir = $conf->societe->multidir_output[$entity].'/contact';

             if (!empty($object->photo)) {

                 if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_mini');

                 else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.getImageFileNameForSize($object->photo, '_small');

                 else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

+                    $file = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact').'/photos/'.$object->photo;

             }

             $email = $object->email;

             $capture = 'user';

@@ -6670,15 +6670,15 @@ 
             $dir = $conf->user->dir_output;

             if (!empty($object->photo)) {

                 if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_mini');

                 else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'user').$object->id.'/'.getImageFileNameForSize($object->photo, '_small');

                 else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

+                    $file = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id.'/'.$object->photo;

             }

             if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+                $altfile = $object->id.".jpg"; // For backward compatibility

             $email = $object->email;

             $capture = 'user';

         }

@@ -6686,15 +6686,15 @@ 
             $dir = $conf->adherent->dir_output;

             if (!empty($object->photo)) {

                 if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_mini');

                 else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

+                    $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.getImageFileNameForSize($object->photo, '_small');

                 else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

-                $originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

+                    $file = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

+                $originalfile = get_exdir(0, 0, 0, 0, $object, 'member').'photos/'.$object->photo;

             }

             if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+                $altfile = $object->id.".jpg"; // For backward compatibility

             $email = $object->email;

             $capture = 'user';

         }

@@ -6703,15 +6703,15 @@ 
             $dir = $conf->$modulepart->dir_output;

             if (!empty($object->photo)) {

                 if ((string) $imagesize == 'mini')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

+                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_mini');

                 else if ((string) $imagesize == 'small')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

+                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.getImageFileNameForSize($object->photo, '_small');

                 else

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

-                $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

+                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

+                $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart).'photos/'.$object->photo;

             }

             if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+                $altfile = $object->id.".jpg"; // For backward compatibility

             $email = $object->email;

         }

 

@@ -6719,27 +6719,27 @@ 
             $capture = $forcecapture;

 

         if ($dir) {

-            if ($file && file_exists($dir . "/" . $file)) {

+            if ($file && file_exists($dir."/".$file)) {

                 if ($addlinktofullsize) {

-                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

+                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

                     if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

+                        $ret .= '<a href="'.$urladvanced.'">';

                     else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                        $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

                 }

-                $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

+                $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($file).'&cache='.$cache.'">';

                 if ($addlinktofullsize)

                     $ret .= '</a>';

             }

-            else if ($altfile && file_exists($dir . "/" . $altfile)) {

+            else if ($altfile && file_exists($dir."/".$altfile)) {

                 if ($addlinktofullsize) {

-                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

+                    $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity='.$entity);

                     if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

+                        $ret .= '<a href="'.$urladvanced.'">';

                     else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                        $ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';

                 }

-                $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

+                $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Photo alt" id="photologo'.(preg_replace('/[^a-z]/i', '_', $file)).'" class="'.$cssclass.'" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($altfile).'&cache='.$cache.'">';

                 if ($addlinktofullsize)

                     $ret .= '</a>';

             }

@@ -6763,10 +6763,10 @@ 
                     $ret .= '<!-- Put link to gravatar -->';

                     //$defaultimg=urlencode(dol_buildpath($nophoto,3));

                     $defaultimg = 'mm';

-                    $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Gravatar avatar" title="' . $email . ' Gravatar avatar" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="https://www.gravatar.com/avatar/' . dol_hash(strtolower(trim($email)), 3) . '?s=' . $width . '&d=' . $defaultimg . '">'; // gravatar need md5 hash

+                    $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.dol_hash(strtolower(trim($email)), 3).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash

                 } else {

                     //$ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . $nophoto . '">';

-                    $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="No photo" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_BASE_URI . $nophoto . '">';

+                    $ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_BASE_URI.$nophoto.'">';

                 }

             }

 

@@ -6776,13 +6776,13 @@ 
                 }

                 $ret .= '<table class="nobordernopadding centpercent">';

                 if ($object->photo) {

-                    $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> ' . $langs->trans("Delete") . '<br><br></td></tr>';

+                    $ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';

                 }

-                $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"' . ($capture ? ' capture="' . $capture . '"' : '') . '></td></tr>';

+                $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';

                 $ret .= '</table>';

             }

         } else

-            dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);

+            dol_print_error('', 'Call of showphoto with wrong parameters modulepart='.$modulepart);

 

         return $ret;

     }

@@ -6825,37 +6825,37 @@ 
         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= ", e.label";

         }

-        $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup as ug ";

+        $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as ug ";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

-            $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=ug.entity";

+            $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."entity as e ON e.rowid=ug.entity";

             if ($force_entity)

-                $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";

+                $sql .= " WHERE ug.entity IN (0,".$force_entity.")";

             else

                 $sql .= " WHERE ug.entity IS NOT NULL";

         }

         else {

-            $sql .= " WHERE ug.entity IN (0," . $conf->entity . ")";

+            $sql .= " WHERE ug.entity IN (0,".$conf->entity.")";

         }

         if (is_array($exclude) && $excludeGroups)

-            $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";

+            $sql .= " AND ug.rowid NOT IN ('".$excludeGroups."')";

         if (is_array($include) && $includeGroups)

-            $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";

+            $sql .= " AND ug.rowid IN ('".$includeGroups."')";

         $sql .= " ORDER BY ug.nom ASC";

 

-        dol_syslog(get_class($this) . "::select_dolgroups", LOG_DEBUG);

+        dol_syslog(get_class($this)."::select_dolgroups", LOG_DEBUG);

         $resql = $this->db->query($sql);

         if ($resql) {

             // Enhance with select2

-            include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

+            include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

-            $out .= '<select class="flat minwidth200" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

+            $out .= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';

 

             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

                 if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                    $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'>&nbsp;</option>'."\n";

 

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

@@ -6863,17 +6863,17 @@ 
                     if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

                         $disableline = 1;

 

-                    $out .= '<option value="' . $obj->rowid . '"';

+                    $out .= '<option value="'.$obj->rowid.'"';

                     if ($disableline)

                         $out .= ' disabled';

-                    if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected) )) {

+                    if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected))) {

                         $out .= ' selected';

                     }

                     $out .= '>';

 

                     $out .= $obj->name;

                     if (!empty($conf->multicompany->enabled) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE) && $conf->entity == 1) {

-                        $out .= " (" . $obj->label . ")";

+                        $out .= " (".$obj->label.")";

                     }

 

                     $out .= '</option>';

@@ -6881,8 +6881,8 @@ 
                 }

             } else {

                 if ($show_empty)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

-                $out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

+                    $out .= '<option value="-1"'.(in_array(-1, $selected) ? ' selected' : '').'></option>'."\n";

+                $out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';

             }

             $out .= '</select>';

         }

@@ -6903,8 +6903,8 @@ 
         global $conf, $langs;

 

         $out = '<div class="nowrap">';

-        $out .= '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';

-        $out .= '<input type="image" class="liste_titre" name="button_removefilter" src="' . img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';

+        $out .= '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';

+        $out .= '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

         $out .= '</div>';

 

         return $out;

@@ -6929,12 +6929,12 @@ 
             	$("#checkallactions").click(function() {

                     if($(this).is(\':checked\')){

                         console.log("We check all");

-                		$(".' . $cssclass . '").prop(\'checked\', true).trigger(\'change\');

+                		$(".' . $cssclass.'").prop(\'checked\', true).trigger(\'change\');

                     }

                     else

                     {

                         console.log("We uncheck all");

-                		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

+                		$(".' . $cssclass.'").prop(\'checked\', false).trigger(\'change\');

                     }' . "\n";

         if ($calljsfunction)

             $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

@@ -6983,64 +6983,64 @@ 
     {

         global $db, $conf, $langs, $user;

 

-        $sql = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_cat WHERE active = 1';

-        $sql .= ' AND entity IN (0,' . getEntity('exp_tax_cat') . ')';

+        $sql = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat WHERE active = 1';

+        $sql .= ' AND entity IN (0,'.getEntity('exp_tax_cat').')';

         if (!empty($excludeid))

-            $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';

+            $sql .= ' AND rowid NOT IN ('.implode(',', $excludeid).')';

         $sql .= ' ORDER BY label';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0">&nbsp;</option>';

 

             while ($obj = $db->fetch_object($resql)) {

-                $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

+                $out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.$langs->trans($obj->label).'</option>';

             }

             $out .= '</select>';

             if (!empty($htmlname) && $user->admin)

-                $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                $out .= ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

 

             if (!empty($target)) {

-                $sql = "SELECT c.id FROM " . MAIN_DB_PREFIX . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

+                $sql = "SELECT c.id FROM ".MAIN_DB_PREFIX."c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

                 $resql = $db->query($sql);

                 if ($resql) {

                     if ($db->num_rows($resql) > 0) {

                         $obj = $db->fetch_object($resql);

                         $out .= '<script type="text/javascript">

 							$(function() {

-								$("select[name=' . $target . ']").on("change", function() {

+								$("select[name=' . $target.']").on("change", function() {

 									var current_val = $(this).val();

-									if (current_val == ' . $obj->id . ') {';

+									if (current_val == ' . $obj->id.') {';

                         if (!empty($default_selected) || !empty($selected))

-                            $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

+                            $out .= '$("select[name='.$htmlname.']").val("'.($default_selected > 0 ? $default_selected : $selected).'");';

 

                         $out .= '

-										$("select[name=' . $htmlname . ']").change();

+										$("select[name=' . $htmlname.']").change();

 									}

 								});

 

-								$("select[name=' . $htmlname . ']").change(function() {

+								$("select[name=' . $htmlname.']").change(function() {

 

-									if ($("select[name=' . $target . ']").val() == ' . $obj->id . ') {

+									if ($("select[name=' . $target.']").val() == '.$obj->id.') {

 										// get price of kilometer to fill the unit price

-										var data = ' . json_encode($params) . ';

+										var data = ' . json_encode($params).';

 										data.fk_c_exp_tax_cat = $(this).val();

 

 										$.ajax({

 											method: "POST",

 											dataType: "json",

 											data: data,

-											url: "' . (DOL_URL_ROOT . '/expensereport/ajax/ajaxik.php') . '",

+											url: "' . (DOL_URL_ROOT.'/expensereport/ajax/ajaxik.php').'",

 										}).done(function( data, textStatus, jqXHR ) {

 											console.log(data);

 											if (typeof data.up != "undefined") {

 												$("input[name=value_unit]").val(data.up);

-												$("select[name=' . $htmlname . ']").attr("title", data.title);

+												$("select[name=' . $htmlname.']").attr("title", data.title);

 											} else {

 												$("input[name=value_unit]").val("");

-												$("select[name=' . $htmlname . ']").attr("title", "");

+												$("select[name=' . $htmlname.']").attr("title", "");

 											}

 										});

 									}

@@ -7070,17 +7070,17 @@ 
     {

         global $db, $conf, $langs;

 

-        $sql = 'SELECT rowid, range_ik FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_range';

-        $sql .= ' WHERE entity = ' . $conf->entity . ' AND active = 1';

+        $sql = 'SELECT rowid, range_ik FROM '.MAIN_DB_PREFIX.'c_exp_tax_range';

+        $sql .= ' WHERE entity = '.$conf->entity.' AND active = 1';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0"></option>';

 

             while ($obj = $db->fetch_object($resql)) {

-                $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

+                $out .= '<option '.($selected == $obj->rowid ? 'selected="selected"' : '').' value="'.$obj->rowid.'">'.price($obj->range_ik, 0, $langs, 1, 0).'</option>';

             }

             $out .= '</select>';

         } else {

@@ -7104,16 +7104,16 @@ 
     {

         global $db, $langs;

 

-        $sql = 'SELECT id, code, label FROM ' . MAIN_DB_PREFIX . 'c_type_fees';

+        $sql = 'SELECT id, code, label FROM '.MAIN_DB_PREFIX.'c_type_fees';

         $sql .= ' WHERE active = 1';

 

         $resql = $db->query($sql);

         if ($resql) {

-            $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

+            $out = '<select id="select_'.$htmlname.'" name="'.$htmlname.'" class="'.$htmlname.' flat minwidth75imp">';

             if ($useempty)

                 $out .= '<option value="0"></option>';

             if ($allchoice)

-                $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

+                $out .= '<option value="-1">'.$langs->trans('AllExpenseReport').'</option>';

 

             $field = 'code';

             if ($useid)

@@ -7121,7 +7121,7 @@ 
 

             while ($obj = $db->fetch_object($resql)) {

                 $key = $langs->trans($obj->code);

-                $out .= '<option ' . ($selected == $obj->{$field} ? 'selected="selected"' : '') . ' value="' . $obj->{$field} . '">' . ($key != $obj->code ? $key : $obj->label) . '</option>';

+                $out .= '<option '.($selected == $obj->{$field} ? 'selected="selected"' : '').' value="'.$obj->{$field}.'">'.($key != $obj->code ? $key : $obj->label).'</option>';

             }

             $out .= '</select>';

         } else {

Braces +1351 added lines, -1001 removed lines

@@ -111,45 +111,58 @@ 
             if (!empty($perm)) {

                 $tmp = explode(':', $typeofdata);

                 $ret .= '<div class="editkey_' . $tmp[0] . (!empty($tmp[1]) ? ' ' . $tmp[1] : '') . '" id="' . $htmlname . '">';

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
                 $ret .= '</div>' . "\n";

-            }

-            else {

-                if ($fieldrequired)

-                    $ret .= '<span class="fieldrequired">';

+            } else {

+                if ($fieldrequired) {
+                                    $ret .= '<span class="fieldrequired">';
+                }
                 $ret .= $langs->trans($text);

-                if ($fieldrequired)

-                    $ret .= '</span>';

+                if ($fieldrequired) {
+                                    $ret .= '</span>';
+                }
             }

-        }

-        else {

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';

-            if ($fieldrequired)

-                $ret .= '<span class="fieldrequired">';

+        } else {

+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
+            }
+            if ($fieldrequired) {
+                            $ret .= '<span class="fieldrequired">';
+            }
             $ret .= $langs->trans($text);

-            if ($fieldrequired)

-                $ret .= '</span>';

-            if (!empty($notabletag))

-                $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<td align="right">';

-            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';

-            if (!empty($notabletag) && $notabletag == 1)

-                $ret .= ' : ';

-            if (!empty($notabletag) && $notabletag == 3)

-                $ret .= ' ';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</td>';

-            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm)

-                $ret .= '</tr></table>';

+            if ($fieldrequired) {
+                            $ret .= '</span>';
+            }
+            if (!empty($notabletag)) {
+                            $ret .= ' ';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</td>';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<td align="right">';
+            }
+            if ($htmlname && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '<a href="' . $_SERVER["PHP_SELF"] . '?action=edit' . $htmlname . '&amp;' . $paramid . '=' . $object->id . $moreparam . '">' . img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)) . '</a>';
+            }
+            if (!empty($notabletag) && $notabletag == 1) {
+                            $ret .= ' : ';
+            }
+            if (!empty($notabletag) && $notabletag == 3) {
+                            $ret .= ' ';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</td>';
+            }
+            if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit' . $htmlname && $perm) {
+                            $ret .= '</tr></table>';
+            }
         }

 

         return $ret;

@@ -180,8 +193,9 @@ 
         $ret = '';

 

         // Check parameters

-        if (empty($typeofdata))

-            return 'ErrorBadParameter';

+        if (empty($typeofdata)) {
+                    return 'ErrorBadParameter';
+        }
 

         // When option to edit inline is activated

         if (!empty($conf->global->MAIN_USE_JQUERY_JEDITABLE) && !preg_match('/^select;|datehourpicker/', $typeofdata)) { // TODO add jquery timepicker

@@ -193,10 +207,12 @@ 
                 $ret .= '<input type="hidden" name="action" value="set' . $htmlname . '">';

                 $ret .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

                 $ret .= '<input type="hidden" name="' . $paramid . '" value="' . $object->id . '">';

-                if (empty($notabletag))

-                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';

-                if (empty($notabletag))

-                    $ret .= '<tr><td>';

+                if (empty($notabletag)) {
+                                    $ret .= '<table class="nobordernopadding centpercent" cellpadding="0" cellspacing="0">';
+                }
+                if (empty($notabletag)) {
+                                    $ret .= '<tr><td>';
+                }
                 if (preg_match('/^(string|email)/', $typeofdata)) {

                     $tmp = explode(':', $typeofdata);

                     $ret .= '<input type="text" id="' . $htmlname . '" name="' . $htmlname . '" value="' . ($editvalue ? $editvalue : $value) . '"' . ($tmp[1] ? ' size="' . $tmp[1] . '"' : '') . '>';

@@ -235,35 +251,39 @@ 
                     $doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), true, true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));

                     $ret .= $doleditor->Create(1);

                 }

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '<td align="left">';

+                if (empty($notabletag)) {
+                                    $ret .= '<td align="left">';
+                }
                 //else $ret.='<div class="clearboth"></div>';

                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="modify" value="' . $langs->trans("Modify") . '">';

-                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag))

-                    $ret .= '<br>' . "\n";

+                if (preg_match('/ckeditor|textarea/', $typeofdata) && empty($notabletag)) {
+                                    $ret .= '<br>' . "\n";
+                }
                 $ret .= '<input type="submit" class="button' . (empty($notabletag) ? '' : ' ') . '" name="cancel" value="' . $langs->trans("Cancel") . '">';

-                if (empty($notabletag))

-                    $ret .= '</td>';

+                if (empty($notabletag)) {
+                                    $ret .= '</td>';
+                }
 

-                if (empty($notabletag))

-                    $ret .= '</tr></table>' . "\n";

+                if (empty($notabletag)) {
+                                    $ret .= '</tr></table>' . "\n";
+                }
                 $ret .= '</form>' . "\n";

-            }

-            else {

-                if (preg_match('/^(email)/', $typeofdata))

-                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);

-                elseif (preg_match('/^(amount|numeric)/', $typeofdata))

-                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');

-                elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata))

-                    $ret .= dol_htmlentitiesbr($value);

-                elseif ($typeofdata == 'day' || $typeofdata == 'datepicker')

-                    $ret .= dol_print_date($value, 'day');

-                elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')

-                    $ret .= dol_print_date($value, 'dayhour');

-                else if (preg_match('/^select;/', $typeofdata)) {

+            } else {

+                if (preg_match('/^(email)/', $typeofdata)) {
+                                    $ret .= dol_print_email($value, 0, 0, 0, 0, 1);
+                } elseif (preg_match('/^(amount|numeric)/', $typeofdata)) {
+                                    $ret .= ($value != '' ? price($value, '', $langs, 0, -1, -1, $conf->currency) : '');
+                } elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {
+                                    $ret .= dol_htmlentitiesbr($value);
+                } elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
+                                    $ret .= dol_print_date($value, 'day');
+                } elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
+                                    $ret .= dol_print_date($value, 'dayhour');
+                } else if (preg_match('/^select;/', $typeofdata)) {

                     $arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));

                     foreach ($arraydata as $val) {

                         $tmp = explode(':', $val);

@@ -278,8 +298,9 @@ 
                         $tmpcontent = $firstline . ((strlen($firstline) != strlen($tmpcontent)) ? '...' : '');

                     }

                     $ret .= $tmpcontent;

-                } else

-                    $ret .= $value;

+                } else {
+                                    $ret .= $value;
+                }
 

                 if ($formatfunc && method_exists($object, $formatfunc)) {

                     $ret = $object->$formatfunc($ret);

@@ -309,12 +330,13 @@ 
         $out = '';

 

         // Check parameters

-        if (preg_match('/^text/', $inputType))

-            $value = dol_nl2br($value);

-        else if (preg_match('/^numeric/', $inputType))

-            $value = price($value);

-        else if ($inputType == 'day' || $inputType == 'datepicker')

-            $value = dol_print_date($value, 'day');

+        if (preg_match('/^text/', $inputType)) {
+                    $value = dol_nl2br($value);
+        } else if (preg_match('/^numeric/', $inputType)) {
+                    $value = price($value);
+        } else if ($inputType == 'day' || $inputType == 'datepicker') {
+                    $value = dol_print_date($value, 'day');
+        }
 

         if ($condition) {

             $element = false;

@@ -339,32 +361,35 @@ 
             if (preg_match('/^(string|email|numeric)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
                 $out .= '<input id="width_' . $htmlname . '" value="' . $inputOption . '" type="hidden"/>' . "\n";

-            }

-            else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

+            } else if ((preg_match('/^day$/', $inputType)) || (preg_match('/^datepicker/', $inputType)) || (preg_match('/^datehourpicker/', $inputType))) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

-                if (!empty($tmp[1]))

-                    $inputOption = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

+                if (!empty($tmp[1])) {
+                                    $inputOption = $tmp[1];
+                }
+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
 

                 $out .= '<input id="timestamp" type="hidden"/>' . "\n"; // Use for timestamp format

-            }

-            else if (preg_match('/^(select|autocomplete)/', $inputType)) {

+            } else if (preg_match('/^(select|autocomplete)/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $loadmethod = $tmp[1];

-                if (!empty($tmp[2]))

-                    $savemethod = $tmp[2];

-                if (!empty($tmp[3]))

-                    $button_only = true;

-            }

-            else if (preg_match('/^textarea/', $inputType)) {

+                if (!empty($tmp[2])) {
+                                    $savemethod = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $button_only = true;
+                }
+            } else if (preg_match('/^textarea/', $inputType)) {

                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $rows = (empty($tmp[1]) ? '8' : $tmp[1]);

@@ -373,12 +398,15 @@ 
                 $tmp = explode(':', $inputType);

                 $inputType = $tmp[0];

                 $toolbar = $tmp[1];

-                if (!empty($tmp[2]))

-                    $width = $tmp[2];

-                if (!empty($tmp[3]))

-                    $heigth = $tmp[3];

-                if (!empty($tmp[4]))

-                    $savemethod = $tmp[4];

+                if (!empty($tmp[2])) {
+                                    $width = $tmp[2];
+                }
+                if (!empty($tmp[3])) {
+                                    $heigth = $tmp[3];
+                }
+                if (!empty($tmp[4])) {
+                                    $savemethod = $tmp[4];
+                }
 

                 if (!empty($conf->fckeditor->enabled)) {

                     $out .= '<input id="ckeditor_toolbar" value="' . $toolbar . '" type="hidden"/>' . "\n";

@@ -391,18 +419,23 @@ 
             $out .= '<input id="table_element_' . $htmlname . '" value="' . $table_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="fk_element_' . $htmlname . '" value="' . $fk_element . '" type="hidden"/>' . "\n";

             $out .= '<input id="loadmethod_' . $htmlname . '" value="' . $loadmethod . '" type="hidden"/>' . "\n";

-            if (!empty($savemethod))

-                $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";

-            if (!empty($ext_element))

-                $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";

+            if (!empty($savemethod)) {
+                            $out .= '<input id="savemethod_' . $htmlname . '" value="' . $savemethod . '" type="hidden"/>' . "\n";
+            }
+            if (!empty($ext_element)) {
+                            $out .= '<input id="ext_element_' . $htmlname . '" value="' . $ext_element . '" type="hidden"/>' . "\n";
+            }
             if (!empty($custommsg)) {

                 if (is_array($custommsg)) {

-                    if (!empty($custommsg['success']))

-                        $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";

-                    if (!empty($custommsg['error']))

-                        $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";

-                } else

-                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";

+                    if (!empty($custommsg['success'])) {
+                                            $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg['success'] . '" type="hidden"/>' . "\n";
+                    }
+                    if (!empty($custommsg['error'])) {
+                                            $out .= '<input id="errormsg_' . $htmlname . '" value="' . $custommsg['error'] . '" type="hidden"/>' . "\n";
+                    }
+                } else {
+                                    $out .= '<input id="successmsg_' . $htmlname . '" value="' . $custommsg . '" type="hidden"/>' . "\n";
+                }
             }

             if ($inputType == 'textarea') {

                 $out .= '<input id="textarea_' . $htmlname . '_rows" value="' . $rows . '" type="hidden"/>' . "\n";

@@ -440,16 +473,20 @@ 
     {

         global $conf;

 

-        if ($incbefore)

-            $text = $incbefore . $text;

-        if (!$htmltext)

-            return $text;

+        if ($incbefore) {
+                    $text = $incbefore . $text;
+        }
+        if (!$htmltext) {
+                    return $text;
+        }
 

         $tag = 'td';

-        if ($notabs == 2)

-            $tag = 'div';

-        if ($notabs == 3)

-            $tag = 'span';

+        if ($notabs == 2) {
+                    $tag = 'div';
+        }
+        if ($notabs == 3) {
+                    $tag = 'span';
+        }
         // Sanitize tooltip

         $htmltext = str_replace("\\", "\\\\", $htmltext);

         $htmltext = str_replace("\r", "", $htmltext);

@@ -478,24 +515,35 @@ 
         }

         if ($tooltipon == 2 || $tooltipon == 3) {

             $paramfortooltipimg = ' class="' . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '"';

-            if ($tooltiptrigger == '')

-                $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on img tag to store tooltip

-            else

-                $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';

-        } else

-            $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

+            if ($tooltiptrigger == '') {
+                            $paramfortooltipimg .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"';
+            }
+            // Attribut to put on img tag to store tooltip

+            else {
+                            $paramfortooltipimg .= ' dolid="' . $tooltiptrigger . '"';
+            }
+        } else {
+                    $paramfortooltipimg = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : '');
+        }
+        // Attribut to put on td text tag

         if ($tooltipon == 1 || $tooltipon == 3) {

             $paramfortooltiptd = ' class="' . ($tooltipon == 3 ? 'cursorpointer ' : '') . $classfortooltip . ' inline-block' . ($extracss ? ' ' . $extracss : '') . '" style="padding: 0px;' . ($extrastyle ? ' ' . $extrastyle : '') . '" ';

-            if ($tooltiptrigger == '')

-                $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"'; // Attribut to put on td tag to store tooltip

-            else

-                $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';

-        } else

-            $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : ''); // Attribut to put on td text tag

-        if (empty($notabs))

-            $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';

-        elseif ($notabs == 2)

-            $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';

+            if ($tooltiptrigger == '') {
+                            $paramfortooltiptd .= ' title="' . ($noencodehtmltext ? $htmltext : dol_escape_htmltag($htmltext, 1)) . '"';
+            }
+            // Attribut to put on td tag to store tooltip

+            else {
+                            $paramfortooltiptd .= ' dolid="' . $tooltiptrigger . '"';
+            }
+        } else {
+                    $paramfortooltiptd = ($extracss ? ' class="' . $extracss . '"' : '') . ($extrastyle ? ' style="' . $extrastyle . '"' : '');
+        }
+        // Attribut to put on td text tag

+        if (empty($notabs)) {
+                    $s .= '<table class="nobordernopadding" summary=""><tr style="height: auto;">';
+        } elseif ($notabs == 2) {
+                    $s .= '<div class="inline-block' . ($forcenowrap ? ' nowrap' : '') . '">';
+        }
         // Define value if value is before

         if ($direction < 0) {

             $s .= '<' . $tag . $paramfortooltipimg;

@@ -506,19 +554,22 @@ 
         }

         // Use another method to help avoid having a space in value in order to use this value with jquery

         // Define label

-        if ((string) $text != '')

-            $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';

+        if ((string) $text != '') {
+                    $s .= '<' . $tag . $paramfortooltiptd . '>' . $text . '</' . $tag . '>';
+        }
         // Define value if value is after

         if ($direction > 0) {

             $s .= '<' . $tag . $paramfortooltipimg;

-            if ($tag == 'td')

-                $s .= ' valign="middle" width="14"';

+            if ($tag == 'td') {
+                            $s .= ' valign="middle" width="14"';
+            }
             $s .= '>' . $textfordialog . $img . '</' . $tag . '>';

         }

-        if (empty($notabs))

-            $s .= '</tr></table>';

-        elseif ($notabs == 2)

-            $s .= '</div>';

+        if (empty($notabs)) {
+                    $s .= '</tr></table>';
+        } elseif ($notabs == 2) {
+                    $s .= '</div>';
+        }
 

         return $s;

     }

@@ -542,20 +593,22 @@ 
         global $conf, $langs;

 

         $alt = '';

-        if ($tooltiptrigger)

-            $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");

+        if ($tooltiptrigger) {
+                    $alt = $langs->transnoentitiesnoconv("ClickToShowHelp");
+        }
 

         //For backwards compatibility

-        if ($type == '0')

-            $type = 'info';

-        elseif ($type == '1')

-            $type = 'help';

+        if ($type == '0') {
+                    $type = 'info';
+        } elseif ($type == '1') {
+                    $type = 'help';
+        }
 

         // If info or help with no javascript, show only text

         if (empty($conf->use_javascript_ajax)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-            else {

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            } else {

                 $alt = $htmltext;

                 $htmltext = '';

             }

@@ -563,27 +616,30 @@ 
 

         // If info or help with smartphone, show only text (tooltip hover can't works)

         if (!empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
         }

         // If info or help with smartphone, show only text (tooltip on lick does not works with dialog on smaprtphone)

         if (!empty($conf->dol_no_mouse_hover) && !empty($tooltiptrigger)) {

-            if ($type == 'info' || $type == 'help')

-                return $text;

-        }

-

-        if ($type == 'info')

-            $img = img_help(0, $alt);

-        elseif ($type == 'help')

-            $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);

-        elseif ($type == 'superadmin')

-            $img = img_picto($alt, 'redstar');

-        elseif ($type == 'admin')

-            $img = img_picto($alt, 'star');

-        elseif ($type == 'warning')

-            $img = img_warning($alt);

-        else

-            $img = img_picto($alt, $type);

+            if ($type == 'info' || $type == 'help') {
+                            return $text;
+            }
+        }

+

+        if ($type == 'info') {
+                    $img = img_help(0, $alt);
+        } elseif ($type == 'help') {
+                    $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
+        } elseif ($type == 'superadmin') {
+                    $img = img_picto($alt, 'redstar');
+        } elseif ($type == 'admin') {
+                    $img = img_picto($alt, 'star');
+        } elseif ($type == 'warning') {
+                    $img = img_warning($alt);
+        } else {
+                    $img = img_picto($alt, $type);
+        }
 

         return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && !$img) ? 3 : 2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);

     }

@@ -600,8 +656,9 @@ 
     {

         global $conf, $langs, $hookmanager;

 

-        if (count($arrayofaction) == 0)

-            return;

+        if (count($arrayofaction) == 0) {
+                    return;
+        }
 

         $disabled = 0;

         $ret = '<div class="centpercent center">';

@@ -733,10 +790,11 @@ 
                     $i++;

                 }

 

-                if (empty($disablefavorites))

-                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);

-                else

-                    $countryArray = dol_sort_array($countryArray, 'label');

+                if (empty($disablefavorites)) {
+                                    array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+                } else {
+                                    $countryArray = dol_sort_array($countryArray, 'label');
+                }
 

                 if ($showempty) {

                     $out .= '<option value="">&nbsp;</option>' . "\n";

@@ -746,19 +804,22 @@ 
                     //if ($showempty) $out.= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                     $out .= '<option value="special_allnotme"' . ($selected == 'special_allnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

                     $out .= '<option value="special_eec"' . ($selected == 'special_eec' ? ' selected' : '') . '>' . $langs->trans("CountriesInEEC") . '</option>';

-                    if ($mysoc->isInEEC())

-                        $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';

+                    if ($mysoc->isInEEC()) {
+                                            $out .= '<option value="special_eecnotme"' . ($selected == 'special_eecnotme' ? ' selected' : '') . '>' . $langs->trans("CountriesInEECExceptMe", $langs->transnoentitiesnoconv("Country" . $mysoc->country_code)) . '</option>';
+                    }
                     $out .= '<option value="special_noteec"' . ($selected == 'special_noteec' ? ' selected' : '') . '>' . $langs->trans("CountriesNotInEEC") . '</option>';

                     $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

                 }

 

                 foreach ($countryArray as $row) {

                     //if (empty($showempty) && empty($row['rowid'])) continue;

-                    if (empty($row['rowid']))

-                        continue;

+                    if (empty($row['rowid'])) {
+                                            continue;
+                    }
 

-                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso'])

-                        $atleastonefavorite++;

+                    if (empty($disablefavorites) && $row['favorite'] && $row['code_iso']) {
+                                            $atleastonefavorite++;
+                    }
                     if (empty($row['favorite']) && $atleastonefavorite) {

                         $atleastonefavorite = 0;

                         $out .= '<option value="" disabled class="selectoptiondisabledwhite">--------------</option>';

@@ -769,18 +830,19 @@ 
                     } else {

                         $out .= '<option value="' . ($usecodeaskey ? ($usecodeaskey == 'code2' ? $row['code_iso'] : $row['code_iso3']) : $row['rowid']) . '">';

                     }

-                    if ($row['label'])

-                        $out .= dol_trunc($row['label'], $maxlength, 'middle');

-                    else

-                        $out .= '&nbsp;';

-                    if ($row['code_iso'])

-                        $out .= ' (' . $row['code_iso'] . ')';

+                    if ($row['label']) {
+                                            $out .= dol_trunc($row['label'], $maxlength, 'middle');
+                    } else {
+                                            $out .= '&nbsp;';
+                    }
+                    if ($row['code_iso']) {
+                                            $out .= ' (' . $row['code_iso'] . ')';
+                    }
                     $out .= '</option>';

                 }

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -854,8 +916,9 @@ 
                         $out .= '<option value="' . $row['rowid'] . '">';

                     }

 

-                    if ($row['code'])

-                        $out .= $row['code'];

+                    if ($row['code']) {
+                                            $out .= $row['code'];
+                    }
 

                     $out .= '</option>';

                 }

@@ -893,24 +956,28 @@ 
 

         // If product & services are enabled or both disabled.

         if ($forceall == 1 || (empty($forceall) && !empty($conf->product->enabled) && !empty($conf->service->enabled)) || (empty($forceall) && empty($conf->product->enabled) && empty($conf->service->enabled))) {

-            if (empty($hidetext))

-                print $langs->trans("Type") . ': ';

+            if (empty($hidetext)) {
+                            print $langs->trans("Type") . ': ';
+            }
             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

             if ($showempty) {

                 print '<option value="-1"';

-                if ($selected == -1)

-                    print ' selected';

+                if ($selected == -1) {
+                                    print ' selected';
+                }
                 print '>&nbsp;</option>';

             }

 

             print '<option value="0"';

-            if (0 == $selected)

-                print ' selected';

+            if (0 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Product");

 

             print '<option value="1"';

-            if (1 == $selected)

-                print ' selected';

+            if (1 == $selected) {
+                            print ' selected';
+            }
             print '>' . $langs->trans("Service");

 

             print '</select>';

@@ -941,8 +1008,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_fees);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -996,23 +1065,26 @@ 
         print '<select id="select_' . $htmlname . '" class="flat" name="' . $htmlname . '">';

         if ($showempty) {

             print '<option value="-1"';

-            if ($selected == -1)

-                print ' selected';

+            if ($selected == -1) {
+                            print ' selected';
+            }
             print '>&nbsp;</option>';

         }

 

         foreach ($this->cache_types_fees as $key => $value) {

             print '<option value="' . $key . '"';

-            if ($key == $selected)

-                print ' selected';

+            if ($key == $selected) {
+                            print ' selected';
+            }
             print '>';

             print $value;

             print '</option>';

         }

 

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -1075,9 +1147,9 @@ 
             $urloption = 'htmlname=' . $htmlname . '&outjson=1&filter=' . $filter . ($showtype ? '&showtype=' . $showtype : '');

             $out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT . '/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if (empty($hidelabel))

-                print $langs->trans("RefOrLabel") . ' : ';

-            else if ($hidelabel > 1) {

+            if (empty($hidelabel)) {
+                            print $langs->trans("RefOrLabel") . ' : ';
+            } else if ($hidelabel > 1) {

                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                 if ($hidelabel == 2) {

                     $out .= img_picto($langs->trans("Search"), 'search');

@@ -1124,10 +1196,11 @@ 
         $num = 0;

         $outarray = array();

 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         // Clean $filter that may contains sql conditions so sql code

         if (function_exists('testSqlAndScriptInject')) {

@@ -1145,21 +1218,26 @@ 
         }

 

         $sql .= " FROM (" . MAIN_DB_PREFIX . "societe as s";

-        if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " )";

         if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

             $sql .= " LEFT OUTER JOIN " . MAIN_DB_PREFIX . "c_country as dictp ON dictp.rowid=s.fk_pays";

         }

         $sql .= " WHERE s.entity IN (" . getEntity('societe') . ")";

-        if (!empty($user->socid))

-            $sql .= " AND s.rowid = " . $user->socid;

-        if ($filter)

-            $sql .= " AND (" . $filter . ")";

-        if (!$user->rights->societe->client->voir && !$user->socid)

-            $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

-        if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX))

-            $sql .= " AND s.status <> 0";

+        if (!empty($user->socid)) {
+                    $sql .= " AND s.rowid = " . $user->socid;
+        }
+        if ($filter) {
+                    $sql .= " AND (" . $filter . ")";
+        }
+        if (!$user->rights->societe->client->voir && !$user->socid) {
+                    $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
+        if (!empty($conf->global->COMPANY_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND s.status <> 0";
+        }
         // Add criteria

         if ($filterkey && $filterkey != '') {

             $sql .= " AND (";

@@ -1167,16 +1245,19 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(s.nom LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
             if (!empty($conf->barcode->enabled)) {

                 $sql .= " OR s.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

             }

@@ -1202,13 +1283,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -1233,16 +1316,21 @@ 
                     }

 

                     if ($showtype) {

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ' (';

-                        if ($obj->client == 1 || $obj->client == 3)

-                            $label .= $langs->trans("Customer");

-                        if ($obj->client == 2 || $obj->client == 3)

-                            $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");

-                        if ($obj->fournisseur)

-                            $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");

-                        if ($obj->client || $obj->fournisseur)

-                            $label .= ')';

+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ' (';
+                        }
+                        if ($obj->client == 1 || $obj->client == 3) {
+                                                    $label .= $langs->trans("Customer");
+                        }
+                        if ($obj->client == 2 || $obj->client == 3) {
+                                                    $label .= ($obj->client == 3 ? ', ' : '') . $langs->trans("Prospect");
+                        }
+                        if ($obj->fournisseur) {
+                                                    $label .= ($obj->client ? ', ' : '') . $langs->trans("Supplier");
+                        }
+                        if ($obj->client || $obj->fournisseur) {
+                                                    $label .= ')';
+                        }
                     }

 

                     if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {

@@ -1263,20 +1351,21 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

         $this->result = array('nbofthirdparties' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1302,8 +1391,9 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "societe_remise_except as re";

         $sql .= " WHERE re.fk_soc = " . (int) $socid;

         $sql .= " AND re.entity = " . $conf->entity;

-        if ($filter)

-            $sql .= " AND " . $filter;

+        if ($filter) {
+                    $sql .= " AND " . $filter;
+        }
         $sql .= " ORDER BY re.description ASC";

 

         dol_syslog(get_class($this) . "::select_remises", LOG_DEBUG);

@@ -1320,18 +1410,23 @@ 
                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

                     $desc = dol_trunc($obj->description, 40);

-                    if (preg_match('/\(CREDIT_NOTE\)/', $desc))

-                        $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);

-                    if (preg_match('/\(DEPOSIT\)/', $desc))

-                        $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);

-                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);

-                    if (preg_match('/\(EXCESS PAID\)/', $desc))

-                        $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);

+                    if (preg_match('/\(CREDIT_NOTE\)/', $desc)) {
+                                            $desc = preg_replace('/\(CREDIT_NOTE\)/', $langs->trans("CreditNote"), $desc);
+                    }
+                    if (preg_match('/\(DEPOSIT\)/', $desc)) {
+                                            $desc = preg_replace('/\(DEPOSIT\)/', $langs->trans("Deposit"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS RECEIVED\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS RECEIVED\)/', $langs->trans("ExcessReceived"), $desc);
+                    }
+                    if (preg_match('/\(EXCESS PAID\)/', $desc)) {
+                                            $desc = preg_replace('/\(EXCESS PAID\)/', $langs->trans("ExcessPaid"), $desc);
+                    }
 

                     $selectstring = '';

-                    if ($selected > 0 && $selected == $obj->rowid)

-                        $selectstring = ' selected';

+                    if ($selected > 0 && $selected == $obj->rowid) {
+                                            $selectstring = ' selected';
+                    }
 

                     $disabled = '';

                     if ($maxvalue > 0 && $obj->amount_ttc > $maxvalue) {

@@ -1341,8 +1436,9 @@ 
 

                     if (!empty($conf->global->MAIN_SHOW_FACNUMBER_IN_DISCOUNT_LIST) && !empty($obj->fk_facture_source)) {

                         $tmpfac = new Facture($this->db);

-                        if ($tmpfac->fetch($obj->fk_facture_source) > 0)

-                            $desc = $desc . ' - ' . $tmpfac->ref;

+                        if ($tmpfac->fetch($obj->fk_facture_source) > 0) {
+                                                    $desc = $desc . ' - ' . $tmpfac->ref;
+                        }
                     }

 

                     print '<option value="' . $obj->rowid . '"' . $selectstring . $disabled . '>' . $desc . ' (' . price($obj->amount_ht) . ' ' . $langs->trans("HT") . ' - ' . price($obj->amount_ttc) . ' ' . $langs->trans("TTC") . ')</option>';

@@ -1351,8 +1447,7 @@ 
             }

             print '</select>';

             return $qualifiedlines;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

             return -1;

         }

@@ -1415,13 +1510,15 @@ 
 

         $langs->load('companies');

 

-        if (empty($htmlid))

-            $htmlid = $htmlname;

+        if (empty($htmlid)) {
+                    $htmlid = $htmlname;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
         $out = '';

 

         if (!is_object($hookmanager)) {

@@ -1431,16 +1528,20 @@ 
 

         // We search third parties

         $sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";

-        if ($showsoc > 0)

-            $sql .= " , s.nom as company";

+        if ($showsoc > 0) {
+                    $sql .= " , s.nom as company";
+        }
         $sql .= " FROM " . MAIN_DB_PREFIX . "socpeople as sp";

-        if ($showsoc > 0)

-            $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";

+        if ($showsoc > 0) {
+                    $sql .= " LEFT OUTER JOIN  " . MAIN_DB_PREFIX . "societe as s ON s.rowid=sp.fk_soc";
+        }
         $sql .= " WHERE sp.entity IN (" . getEntity('socpeople') . ")";

-        if ($socid > 0 || $socid == -1)

-            $sql .= " AND sp.fk_soc=" . $socid;

-        if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX))

-            $sql .= " AND sp.statut <> 0";

+        if ($socid > 0 || $socid == -1) {
+                    $sql .= " AND sp.fk_soc=" . $socid;
+        }
+        if (!empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) {
+                    $sql .= " AND sp.statut <> 0";
+        }
         $sql .= " ORDER BY sp.lastname ASC";

 

         dol_syslog(get_class($this) . "::select_contacts", LOG_DEBUG);

@@ -1453,12 +1554,15 @@ 
                 $out .= ajax_combobox($htmlid, $events, $conf->global->CONTACT_USE_SEARCH_TO_SELECT);

             }

 

-            if ($htmlname != 'none' || $options_only)

-                $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';

-            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';

-            if ($showempty == 2)

-                $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';

+            if ($htmlname != 'none' || $options_only) {
+                            $out .= '<select class="flat' . ($moreclass ? ' ' . $moreclass : '') . '" id="' . $htmlid . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . (!empty($moreparam) ? $moreparam : '') . '>';
+            }
+            if (($showempty == 1 || ($showempty == 3 && $num > 1)) && !$multiple) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>&nbsp;</option>';
+            }
+            if ($showempty == 2) {
+                            $out .= '<option value="0"' . (in_array(0, $selected) ? ' selected' : '') . '>' . $langs->trans("Internal") . '</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -1474,49 +1578,56 @@ 
                     if ($obj->statut == 1) {

                         if ($htmlname != 'none') {

                             $disabled = 0;

-                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude))

-                                $disabled = 1;

-                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto))

-                                $disabled = 1;

+                            if (is_array($exclude) && count($exclude) && in_array($obj->rowid, $exclude)) {
+                                                            $disabled = 1;
+                            }
+                            if (is_array($limitto) && count($limitto) && !in_array($obj->rowid, $limitto)) {
+                                                            $disabled = 1;
+                            }
                             if (!empty($selected) && in_array($obj->rowid, $selected)) {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= ' selected>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

-                            }

-                            else {

+                            } else {

                                 $out .= '<option value="' . $obj->rowid . '"';

-                                if ($disabled)

-                                    $out .= ' disabled';

+                                if ($disabled) {
+                                                                    $out .= ' disabled';
+                                }
                                 $out .= '>';

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                                 $out .= '</option>';

                             }

-                        }

-                        else {

+                        } else {

                             if (in_array($obj->rowid, $selected)) {

                                 $out .= $contactstatic->getFullName($langs);

-                                if ($showfunction && $obj->poste)

-                                    $out .= ' (' . $obj->poste . ')';

-                                if (($showsoc > 0) && $obj->company)

-                                    $out .= ' - (' . $obj->company . ')';

+                                if ($showfunction && $obj->poste) {
+                                                                    $out .= ' (' . $obj->poste . ')';
+                                }
+                                if (($showsoc > 0) && $obj->company) {
+                                                                    $out .= ' - (' . $obj->company . ')';
+                                }
                             }

                         }

                     }

                     $i++;

                 }

-            }

-            else {

+            } else {

                 $out .= '<option value="-1"' . (($showempty == 2 || $multiple) ? '' : ' selected') . ' disabled>';

                 $out .= ($socid != -1) ? ($langs->trans($socid ? "NoContactDefinedForThirdParty" : "NoContactDefined")) : $langs->trans('SelectAThirdPartyFirst');

                 $out .= '</option>';

@@ -1597,24 +1708,27 @@ 
         global $conf, $user, $langs;

 

         // If no preselected user defined, we take current user

-        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE))

-            $selected = $user->id;

+        if ((is_numeric($selected) && ($selected < -2 || empty($selected))) && empty($conf->global->SOCIETE_DISABLE_DEFAULT_SALESREPRESENTATIVE)) {
+                    $selected = $user->id;
+        }
 

-        if ($selected === '')

-            $selected = array();

-        else if (!is_array($selected))

-            $selected = array($selected);

+        if ($selected === '') {
+                    $selected = array();
+        } else if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $excludeUsers = null;

         $includeUsers = null;

 

         // Permettre l'exclusion d'utilisateurs

-        if (is_array($exclude))

-            $excludeUsers = implode(",", $exclude);

+        if (is_array($exclude)) {
+                    $excludeUsers = implode(",", $exclude);
+        }
         // Permettre l'inclusion d'utilisateurs

-        if (is_array($include))

-            $includeUsers = implode(",", $include);

-        else if ($include == 'hierarchy') {

+        if (is_array($include)) {
+                    $includeUsers = implode(",", $include);
+        } else if ($include == 'hierarchy') {

             // Build list includeUsers to have only hierarchy

             $includeUsers = implode(",", $user->getAllChildIds(0));

         } else if ($include == 'hierarchyme') {

@@ -1633,12 +1747,12 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "user as u";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=u.entity";

-            if ($force_entity)

-                $sql .= " WHERE u.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE u.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE u.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE u.entity IS NOT NULL";
+            }
+        } else {

             if (!empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {

                 $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "usergroup_user as ug";

                 $sql .= " ON ug.fk_user = u.rowid";

@@ -1647,16 +1761,21 @@ 
                 $sql .= " WHERE u.entity IN (0," . $conf->entity . ")";

             }

         }

-        if (!empty($user->societe_id))

-            $sql .= " AND u.fk_soc = " . $user->societe_id;

-        if (is_array($exclude) && $excludeUsers)

-            $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";

-        if ($includeUsers)

-            $sql .= " AND u.rowid IN (" . $includeUsers . ")";

-        if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive)

-            $sql .= " AND u.statut <> 0";

-        if (!empty($morefilter))

-            $sql .= " " . $morefilter;

+        if (!empty($user->societe_id)) {
+                    $sql .= " AND u.fk_soc = " . $user->societe_id;
+        }
+        if (is_array($exclude) && $excludeUsers) {
+                    $sql .= " AND u.rowid NOT IN (" . $excludeUsers . ")";
+        }
+        if ($includeUsers) {
+                    $sql .= " AND u.rowid IN (" . $includeUsers . ")";
+        }
+        if (!empty($conf->global->USER_HIDE_INACTIVE_IN_COMBOBOX) || $noactive) {
+                    $sql .= " AND u.statut <> 0";
+        }
+        if (!empty($morefilter)) {
+                    $sql .= " " . $morefilter;
+        }
 

         if (empty($conf->global->MAIN_FIRSTNAME_NAME_POSITION)) { // MAIN_FIRSTNAME_NAME_POSITION is 0 means firstname+lastname

             $sql .= " ORDER BY u.firstname ASC";

@@ -1676,10 +1795,12 @@ 
 

                 // do not use maxwidthonsmartphone by default. Set it by caller so auto size to 100% will work when not defined

                 $out .= '<select class="flat' . ($morecss ? ' minwidth100 ' . $morecss : ' minwidth200') . '" id="' . $htmlname . '" name="' . $htmlname . ($multiple ? '[]' : '') . '" ' . ($multiple ? 'multiple' : '') . ' ' . ($disabled ? ' disabled' : '') . '>';

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

-                if ($show_every)

-                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . ((empty($selected) || in_array(-1, $selected)) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
+                if ($show_every) {
+                                    $out .= '<option value="-2"' . ((in_array(-2, $selected)) ? ' selected' : '') . '>-- ' . $langs->trans("Everybody") . ' --</option>' . "\n";
+                }
 

                 $userstatic = new User($this->db);

 

@@ -1691,19 +1812,21 @@ 
                     $userstatic->firstname = $obj->firstname;

 

                     $disableline = '';

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = ($enableonlytext ? $enableonlytext : '1');

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = ($enableonlytext ? $enableonlytext : '1');
+                    }
 

                     if ((is_object($selected) && $selected->id == $obj->rowid) || (!is_object($selected) && in_array($obj->rowid, $selected) )) {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= ' selected>';

-                    }

-                    else {

+                    } else {

                         $out .= '<option value="' . $obj->rowid . '"';

-                        if ($disableline)

-                            $out .= ' disabled';

+                        if ($disableline) {
+                                                    $out .= ' disabled';
+                        }
                         $out .= '>';

                     }

 

@@ -1757,8 +1880,9 @@ 
             dol_print_error($this->db);

         }

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -1810,15 +1934,18 @@ 
         }

         $nbassignetouser = count($assignedtouser);

 

-        if ($nbassignetouser && $action != 'view')

-            $out .= '<br>';

-        if ($nbassignetouser)

-            $out .= '<ul class="attendees">';

+        if ($nbassignetouser && $action != 'view') {
+                    $out .= '<br>';
+        }
+        if ($nbassignetouser) {
+                    $out .= '<ul class="attendees">';
+        }
         $i = 0;

         $ownerid = 0;

         foreach ($assignedtouser as $key => $value) {

-            if ($value['id'] == $ownerid)

-                continue;

+            if ($value['id'] == $ownerid) {
+                            continue;
+            }
 

             $out .= '<li>';

             $userstatic->fetch($value['id']);

@@ -1844,8 +1971,9 @@ 
             $out .= '</li>';

             $i++;

         }

-        if ($nbassignetouser)

-            $out .= '</ul>';

+        if ($nbassignetouser) {
+                    $out .= '</ul>';
+        }
 

         //$out.='</form>';

         return $out;

@@ -1976,9 +2104,9 @@ 
                                 </script>

                                 <?php

                             }

-                            if (empty($hidelabel))

-                                print $langs->trans("RefOrLabel") . ' : ';

-                            else if ($hidelabel > 1) {

+                            if (empty($hidelabel)) {
+                                                            print $langs->trans("RefOrLabel") . ' : ';
+                            } else if ($hidelabel > 1) {

                                 $placeholder = ' placeholder="' . $langs->trans("RefOrLabel") . '"';

                                 if ($hidelabel == 2) {

                                     print img_picto($langs->trans("Search"), 'search');

@@ -2069,13 +2197,15 @@ 
         // Price by quantity

         if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY) || !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {

             $sql .= ", (SELECT pp.rowid FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid";

-            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_rowid";

             $sql .= ", (SELECT pp.price_by_qty FROM " . MAIN_DB_PREFIX . "product_price as pp WHERE pp.fk_product = p.rowid"; // price_by_qty is 1 if some prices by qty exists in subtable

-            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES))

-                $sql .= " AND price_level=" . $price_level;

+            if ($price_level >= 1 && !empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY_MULTIPRICES)) {
+                            $sql .= " AND price_level=" . $price_level;
+            }
             $sql .= " ORDER BY date_price";

             $sql .= " DESC LIMIT 1) as price_by_qty";

             $selectFields .= ", price_rowid, price_by_qty";

@@ -2117,14 +2247,15 @@ 
             $sql .= " AND p.finished = " . $finished;

         } elseif ($finished == 1) {

             $sql .= " AND p.finished = " . $finished;

-            if ($status >= 0)

-                $sql .= " AND p.tosell = " . $status;

-        }

-        elseif ($status >= 0) {

+            if ($status >= 0) {
+                            $sql .= " AND p.tosell = " . $status;
+            }
+        } elseif ($status >= 0) {

             $sql .= " AND p.tosell = " . $status;

         }

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $filtertype;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $filtertype;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2132,28 +2263,35 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(p.ref LIKE '" . $db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $db->escape($prefix . $crit) . "%'";

-                if (!empty($conf->global->MAIN_MULTILANGS))

-                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty($conf->global->MAIN_MULTILANGS)) {
+                                    $sql .= " OR pl.label LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 if (!empty($conf->global->PRODUCT_AJAX_SEARCH_ON_DESCRIPTION)) {

                     $sql .= " OR p.description LIKE '" . $db->escape($prefix . $crit) . "%'";

-                    if (!empty($conf->global->MAIN_MULTILANGS))

-                        $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";

+                    if (!empty($conf->global->MAIN_MULTILANGS)) {
+                                            $sql .= " OR pl.description LIKE '" . $db->escape($prefix . $crit) . "%'";
+                    }
                 }

-                if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF))

-                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";

+                if (!empty($conf->global->MAIN_SEARCH_PRODUCT_BY_FOURN_REF)) {
+                                    $sql .= " OR pfp.ref_fourn LIKE '" . $db->escape($prefix . $crit) . "%'";
+                }
                 $sql .= ")";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty($conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         if (count($warehouseStatusArray)) {

@@ -2192,13 +2330,15 @@ 
             // Do not use textifempty = ' ' or '&nbsp;' here, or search on key will search on ' key'.

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty($conf->global->PRODUIT_USE_SEARCH_TO_SELECT)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="0" selected>' . $textifempty . '</option>';

+            if ($showempty) {
+                            $out .= '<option value="0" selected>' . $textifempty . '</option>';
+            }
 

             $i = 0;

             while ($num && $i < $num) {

@@ -2272,11 +2412,11 @@ 
 

             $this->db->free($result);

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             dol_print_error($db);

         }

     }

@@ -2313,10 +2453,12 @@ 
         $maxlengtharticle = (empty($conf->global->PRODUCT_MAX_LENGTH_COMBO) ? 48 : $conf->global->PRODUCT_MAX_LENGTH_COMBO);

 

         $label = $objp->label;

-        if (!empty($objp->label_translated))

-            $label = $objp->label_translated;

-        if (!empty($filterkey) && $filterkey != '')

-            $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+        if (!empty($objp->label_translated)) {
+                    $label = $objp->label_translated;
+        }
+        if (!empty($filterkey) && $filterkey != '') {
+                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+        }
 

         $outkey = $objp->rowid;

         $outref = $objp->ref;

@@ -2334,23 +2476,27 @@ 
             $opt .= ' pbq="' . $objp->price_by_qty_rowid . '" data-pbq="' . $objp->price_by_qty_rowid . '" data-pbqqty="' . $objp->price_by_qty_quantity . '" data-pbqpercent="' . $objp->price_by_qty_remise_percent . '"';

         }

         if (!empty($conf->stock->enabled) && $objp->fk_product_type == 0 && isset($objp->stock)) {

-            if ($objp->stock > 0)

-                $opt .= ' class="product_line_stock_ok"';

-            else if ($objp->stock <= 0)

-                $opt .= ' class="product_line_stock_too_low"';

+            if ($objp->stock > 0) {
+                            $opt .= ' class="product_line_stock_ok"';
+            } else if ($objp->stock <= 0) {
+                            $opt .= ' class="product_line_stock_too_low"';
+            }
         }

         $opt .= '>';

         $opt .= $objp->ref;

-        if ($outbarcode)

-            $opt .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $opt .= ' (' . $outbarcode . ')';
+        }
         $opt .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $objRef = $objp->ref;

-        if (!empty($filterkey) && $filterkey != '')

-            $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+        if (!empty($filterkey) && $filterkey != '') {
+                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+        }
         $outval .= $objRef;

-        if ($outbarcode)

-            $outval .= ' (' . $outbarcode . ')';

+        if ($outbarcode) {
+                    $outval .= ' (' . $outbarcode . ')';
+        }
         $outval .= ' - ' . dol_trunc($label, $maxlengtharticle);

 

         $found = 0;

@@ -2549,15 +2695,18 @@ 
         $sql .= " pfp.supplier_reputation";

         $sql .= " FROM " . MAIN_DB_PREFIX . "product as p";

         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";

-        if ($socid)

-            $sql .= " AND pfp.fk_soc = " . $socid;

+        if ($socid) {
+                    $sql .= " AND pfp.fk_soc = " . $socid;
+        }
         $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe as s ON pfp.fk_soc = s.rowid";

         $sql .= " WHERE p.entity IN (" . getEntity('product') . ")";

         $sql .= " AND p.tobuy = 1";

-        if (strval($filtertype) != '')

-            $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);

-        if (!empty($filtre))

-            $sql .= " " . $filtre;

+        if (strval($filtertype) != '') {
+                    $sql .= " AND p.fk_product_type=" . $this->db->escape($filtertype);
+        }
+        if (!empty($filtre)) {
+                    $sql .= " " . $filtre;
+        }
         // Add criteria on ref/label

         if ($filterkey != '') {

             $sql .= ' AND (';

@@ -2565,18 +2714,22 @@ 
             // For natural search

             $scrit = explode(' ', $filterkey);

             $i = 0;

-            if (count($scrit) > 1)

-                $sql .= "(";

+            if (count($scrit) > 1) {
+                            $sql .= "(";
+            }
             foreach ($scrit as $crit) {

-                if ($i > 0)

-                    $sql .= " AND ";

+                if ($i > 0) {
+                                    $sql .= " AND ";
+                }
                 $sql .= "(pfp.ref_fourn LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.ref LIKE '" . $this->db->escape($prefix . $crit) . "%' OR p.label LIKE '" . $this->db->escape($prefix . $crit) . "%')";

                 $i++;

             }

-            if (count($scrit) > 1)

-                $sql .= ")";

-            if (!empty($conf->barcode->enabled))

-                $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";

+            if (count($scrit) > 1) {
+                            $sql .= ")";
+            }
+            if (!empty($conf->barcode->enabled)) {
+                            $sql .= " OR p.barcode LIKE '" . $this->db->escape($prefix . $filterkey) . "%'";
+            }
             $sql .= ')';

         }

         $sql .= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";

@@ -2593,18 +2746,21 @@ 
 

             //$out.='<select class="flat" id="select'.$htmlname.'" name="'.$htmlname.'">';	// remove select to have id same with combo and ajax

             $out .= '<select class="flat maxwidthonsmartphone" id="' . $htmlname . '" name="' . $htmlname . '">';

-            if (!$selected)

-                $out .= '<option value="0" selected>&nbsp;</option>';

-            else

-                $out .= '<option value="0">&nbsp;</option>';

+            if (!$selected) {
+                            $out .= '<option value="0" selected>&nbsp;</option>';
+            } else {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             $i = 0;

             while ($i < $num) {

                 $objp = $this->db->fetch_object($result);

 

                 $outkey = $objp->idprodfournprice;                                                    // id in table of price

-                if (!$outkey && $alsoproductwithnosupplierprice)

-                    $outkey = 'idprod_' . $objp->rowid;   // id of product

+                if (!$outkey && $alsoproductwithnosupplierprice) {
+                                    $outkey = 'idprod_' . $objp->rowid;
+                }
+                // id of product

 

                 $outref = $objp->ref;

                 $outval = '';

@@ -2615,32 +2771,39 @@ 
                 $outdurationunit = $outtype == Product::TYPE_SERVICE ? substr($objp->duration, -1) : '';

 

                 $opt = '<option value="' . $outkey . '"';

-                if ($selected && $selected == $objp->idprodfournprice)

-                    $opt .= ' selected';

-                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice))

-                    $opt .= ' disabled';

+                if ($selected && $selected == $objp->idprodfournprice) {
+                                    $opt .= ' selected';
+                }
+                if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
+                                    $opt .= ' disabled';
+                }
                 if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {

                     $opt .= ' pbq="' . $objp->idprodfournprice . '" data-pbq="' . $objp->idprodfournprice . '" data-pbqqty="' . $objp->quantity . '" data-pbqpercent="' . $objp->remise_percent . '"';

                 }

                 $opt .= '>';

 

                 $objRef = $objp->ref;

-                if ($filterkey && $filterkey != '')

-                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRef = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRef, 1);
+                }
                 $objRefFourn = $objp->ref_fourn;

-                if ($filterkey && $filterkey != '')

-                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $objRefFourn = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $objRefFourn, 1);
+                }
                 $label = $objp->label;

-                if ($filterkey && $filterkey != '')

-                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);

+                if ($filterkey && $filterkey != '') {
+                                    $label = preg_replace('/(' . preg_quote($filterkey) . ')/i', '<strong>$1</strong>', $label, 1);
+                }
 

                 $opt .= $objp->ref;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $opt .= ' (' . $objp->ref_fourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $opt .= ' (' . $objp->ref_fourn . ')';
+                }
                 $opt .= ' - ';

                 $outval .= $objRef;

-                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn))

-                    $outval .= ' (' . $objRefFourn . ')';

+                if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
+                                    $outval .= ' (' . $objRefFourn . ')';
+                }
                 $outval .= ' - ';

                 $opt .= dol_trunc($label, 72) . ' - ';

                 $outval .= dol_trunc($label, 72) . ' - ';

@@ -2734,11 +2897,11 @@ 
             include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

             $out .= ajax_combobox($htmlname);

 

-            if (empty($outputmode))

-                return $out;

+            if (empty($outputmode)) {
+                            return $out;
+            }
             return $outarray;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -2827,8 +2990,9 @@ 
                         $opt .= " - ";

                         $opt .= price($objp->unitprice, 1, $langs, 0, 0, -1, $conf->currency) . "/" . $langs->trans("Unit");

                     }

-                    if ($objp->duration)

-                        $opt .= " - " . $objp->duration;

+                    if ($objp->duration) {
+                                            $opt .= " - " . $objp->duration;
+                    }
                     $opt .= "</option>\n";

 

                     $form .= $opt;

@@ -2839,8 +3003,7 @@ 
             $form .= '</select>';

             $this->db->free($result);

             return $form;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

     }

@@ -2868,8 +3031,9 @@ 
         $resql = $this->db->query($sql);

         if ($resql) {

             print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-            if ($showempty)

-                print '<option value="0">&nbsp;</option>';

+            if ($showempty) {
+                            print '<option value="0">&nbsp;</option>';
+            }
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

@@ -2903,8 +3067,10 @@ 
         global $langs;

 

         $num = count($this->cache_conditions_paiements);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -2949,8 +3115,10 @@ 
         global $langs;

 

         $num = count($this->cache_availability);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3001,8 +3169,9 @@ 
         dol_syslog(__METHOD__ . " selected=" . $selected . ", htmlname=" . $htmlname, LOG_DEBUG);

 

         print '<select id="' . $htmlname . '" class="flat" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_availability as $id => $arrayavailability) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3013,8 +3182,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3027,8 +3197,10 @@ 
         global $langs;

 

         $num = count($this->cache_demand_reason);

-        if ($num > 0)

-            return 0;    // Cache already loaded

+        if ($num > 0) {
+                    return 0;
+        }
+        // Cache already loaded

 

         $sql = "SELECT rowid, code, label";

         $sql .= " FROM " . MAIN_DB_PREFIX . 'c_input_reason';

@@ -3044,10 +3216,14 @@ 
 

                 // Si traduction existe, on l'utilise, sinon on prend le libelle par defaut

                 $label = ($obj->label != '-' ? $obj->label : '');

-                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code))

-                    $label = $langs->trans("DemandReasonType" . $obj->code); // So translation key DemandReasonTypeSRC_XXX will work

-                if ($langs->trans($obj->code) != $obj->code)

-                    $label = $langs->trans($obj->code);                // So translation key SRC_XXX will work

+                if ($langs->trans("DemandReasonType" . $obj->code) != ("DemandReasonType" . $obj->code)) {
+                                    $label = $langs->trans("DemandReasonType" . $obj->code);
+                }
+                // So translation key DemandReasonTypeSRC_XXX will work

+                if ($langs->trans($obj->code) != $obj->code) {
+                                    $label = $langs->trans($obj->code);
+                }
+                // So translation key SRC_XXX will work

 

                 $tmparray[$obj->rowid]['id'] = $obj->rowid;

                 $tmparray[$obj->rowid]['code'] = $obj->code;

@@ -3059,8 +3235,7 @@ 
 

             unset($tmparray);

             return $num;

-        }

-        else {

+        } else {

             dol_print_error($this->db);

             return -1;

         }

@@ -3083,11 +3258,13 @@ 
         $this->loadCacheInputReason();

 

         print '<select class="flat" id="select_' . $htmlname . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0"' . (empty($selected) ? ' selected' : '') . '>&nbsp;</option>';
+        }
         foreach ($this->cache_demand_reason as $id => $arraydemandreason) {

-            if ($arraydemandreason['code'] == $exclude)

-                continue;

+            if ($arraydemandreason['code'] == $exclude) {
+                            continue;
+            }
 

             if ($selected && ($selected == $arraydemandreason['id'] || $selected == $arraydemandreason['code'])) {

                 print '<option value="' . $arraydemandreason['id'] . '" selected>';

@@ -3099,8 +3276,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3115,8 +3293,10 @@ 
         global $langs;

 

         $num = count($this->cache_types_paiements);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -3177,12 +3357,14 @@ 
         $this->load_cache_conditions_paiements();

 

         // Set default value if not already set by caller

-        if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID))

-            $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;

+        if (empty($selected) && !empty($conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID)) {
+                    $selected = $conf->global->MAIN_DEFAULT_PAYMENT_TERM_ID;
+        }
 

         print '<select id="' . $htmlname . '" class="flat selectpaymentterms' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($addempty)

-            print '<option value="0">&nbsp;</option>';

+        if ($addempty) {
+                    print '<option value="0">&nbsp;</option>';
+        }
         foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {

             if ($selected == $id) {

                 print '<option value="' . $id . '" selected>';

@@ -3193,8 +3375,9 @@ 
             print '</option>';

         }

         print '</select>';

-        if ($user->admin && empty($noinfoadmin))

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && empty($noinfoadmin)) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -3220,59 +3403,68 @@ 
         dol_syslog(__METHOD__ . " " . $selected . ", " . $htmlname . ", " . $filtertype . ", " . $format, LOG_DEBUG);

 

         $filterarray = array();

-        if ($filtertype == 'CRDT')

-            $filterarray = array(0, 2, 3);

-        elseif ($filtertype == 'DBIT')

-            $filterarray = array(1, 2, 3);

-        elseif ($filtertype != '' && $filtertype != '-1')

-            $filterarray = explode(',', $filtertype);

+        if ($filtertype == 'CRDT') {
+                    $filterarray = array(0, 2, 3);
+        } elseif ($filtertype == 'DBIT') {
+                    $filterarray = array(1, 2, 3);
+        } elseif ($filtertype != '' && $filtertype != '-1') {
+                    $filterarray = explode(',', $filtertype);
+        }
 

         $this->load_cache_types_paiements();

 

         print '<select id="select' . $htmlname . '" class="flat selectpaymenttypes' . ($morecss ? ' ' . $morecss : '') . '" name="' . $htmlname . '">';

-        if ($empty)

-            print '<option value="">&nbsp;</option>';

+        if ($empty) {
+                    print '<option value="">&nbsp;</option>';
+        }
         foreach ($this->cache_types_paiements as $id => $arraytypes) {

             // If not good status

-            if ($active >= 0 && $arraytypes['active'] != $active)

-                continue;

+            if ($active >= 0 && $arraytypes['active'] != $active) {
+                            continue;
+            }
 

             // On passe si on a demande de filtrer sur des modes de paiments particuliers

-            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray))

-                continue;

+            if (count($filterarray) && !in_array($arraytypes['type'], $filterarray)) {
+                            continue;
+            }
 

             // We discard empty line if showempty is on because an empty line has already been output.

-            if ($empty && empty($arraytypes['code']))

-                continue;

-

-            if ($format == 0)

-                print '<option value="' . $id . '"';

-            elseif ($format == 1)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 2)

-                print '<option value="' . $arraytypes['code'] . '"';

-            elseif ($format == 3)

-                print '<option value="' . $id . '"';

+            if ($empty && empty($arraytypes['code'])) {
+                            continue;
+            }
+

+            if ($format == 0) {
+                            print '<option value="' . $id . '"';
+            } elseif ($format == 1) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 2) {
+                            print '<option value="' . $arraytypes['code'] . '"';
+            } elseif ($format == 3) {
+                            print '<option value="' . $id . '"';
+            }
             // Si selected est text, on compare avec code, sinon avec id

-            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code'])

-                print ' selected';

-            elseif ($selected == $id)

-                print ' selected';

+            if (preg_match('/[a-z]/i', $selected) && $selected == $arraytypes['code']) {
+                            print ' selected';
+            } elseif ($selected == $id) {
+                            print ' selected';
+            }
             print '>';

-            if ($format == 0)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 1)

-                $value = $arraytypes['code'];

-            elseif ($format == 2)

-                $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);

-            elseif ($format == 3)

-                $value = $arraytypes['code'];

+            if ($format == 0) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 1) {
+                            $value = $arraytypes['code'];
+            } elseif ($format == 2) {
+                            $value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
+            } elseif ($format == 3) {
+                            $value = $arraytypes['code'];
+            }
             print $value ? $value : '&nbsp;';

             print '</option>';

         }

         print '</select>';

-        if ($user->admin && !$noadmininfo)

-            print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin && !$noadmininfo) {
+                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
     }

 

     /**

@@ -3326,8 +3518,9 @@ 
         $sql = "SELECT rowid, code, libelle as label";

         $sql .= " FROM " . MAIN_DB_PREFIX . "c_shipment_mode";

         $sql .= " WHERE active > 0";

-        if ($filtre)

-            $sql .= " AND " . $filtre;

+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY libelle ASC";

 

         dol_syslog(get_class($this) . "::selectShippingMode", LOG_DEBUG);

@@ -3352,8 +3545,9 @@ 
                     $i++;

                 }

                 print "</select>";

-                if ($user->admin)

-                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+                if ($user->admin) {
+                                    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+                }
             } else {

                 print $langs->trans("NoShippingMethodDefined");

             }

@@ -3466,8 +3660,9 @@ 
 

         $resql = $this->db->query($sql);

         if ($resql && $this->db->num_rows($resql) > 0) {

-            if ($showempty)

-                $return .= '<option value="none"></option>';

+            if ($showempty) {
+                            $return .= '<option value="none"></option>';
+            }
 

             while ($res = $this->db->fetch_object($resql)) {

                 $unitLabel = $res->label;

@@ -3510,10 +3705,12 @@ 
         $sql = "SELECT rowid, label, bank, clos as status, currency_code";

         $sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";

         $sql .= " WHERE entity IN (" . getEntity('bank_account') . ")";

-        if ($statut != 2)

-            $sql .= " AND clos = '" . $statut . "'";

-        if ($filtre)

-            $sql .= " AND " . $filtre;

+        if ($statut != 2) {
+                    $sql .= " AND clos = '" . $statut . "'";
+        }
+        if ($filtre) {
+                    $sql .= " AND " . $filtre;
+        }
         $sql .= " ORDER BY label";

 

         dol_syslog(get_class($this) . "::select_comptes", LOG_DEBUG);

@@ -3535,23 +3732,24 @@ 
                         print '<option value="' . $obj->rowid . '">';

                     }

                     print trim($obj->label);

-                    if ($showcurrency)

-                        print ' (' . $obj->currency_code . ')';

-                    if ($statut == 2 && $obj->status == 1)

-                        print ' (' . $langs->trans("Closed") . ')';

+                    if ($showcurrency) {
+                                            print ' (' . $obj->currency_code . ')';
+                    }
+                    if ($statut == 2 && $obj->status == 1) {
+                                            print ' (' . $langs->trans("Closed") . ')';
+                    }
                     print '</option>';

                     $i++;

                 }

                 print "</select>";

+            } else {

+                if ($statut == 0) {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';
+                } else {
+                                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';
+                }
             }

-            else {

-                if ($statut == 0)

-                    print '<span class="opacitymedium">' . $langs->trans("NoActiveBankAccountDefined") . '</span>';

-                else

-                    print '<span class="opacitymedium">' . $langs->trans("NoBankAccountFound") . '</span>';

-            }

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -3575,8 +3773,9 @@ 
             print '<input type="hidden" name="action" value="setbankaccount">';

             print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

             $nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);

-            if ($nbaccountfound > 0)

-                print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';

+            if ($nbaccountfound > 0) {
+                            print '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+            }
             print '</form>';

         } else {

 

@@ -3586,8 +3785,9 @@ 
                 require_once DOL_DOCUMENT_ROOT . '/compta/bank/class/account.class.php';

                 $bankstatic = new Account($this->db);

                 $result = $bankstatic->fetch($selected);

-                if ($result)

-                    print $bankstatic->getNomUrl(1);

+                if ($result) {
+                                    print $bankstatic->getNomUrl(1);
+                }
             } else {

                 print "&nbsp;";

             }

@@ -3633,15 +3833,16 @@ 
                 $i = 0;

                 while ($i < $num) {

                     $objp = $this->db->fetch_object($result);

-                    if ($objp)

-                        $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);

+                    if ($objp) {
+                                            $cate_arbo[$objp->rowid] = array('id' => $objp->rowid, 'fulllabel' => $objp->label);
+                    }
                     $i++;

                 }

                 $this->db->free($result);

-            } else

-                dol_print_error($this->db);

-        }

-        else {

+            } else {
+                            dol_print_error($this->db);
+            }
+        } else {

             $cat = new Categorie($this->db);

             $cate_arbo = $cat->get_full_arbo($type, $excludeafterid);

         }

@@ -3649,9 +3850,9 @@ 
         $output = '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

         $outarray = array();

         if (is_array($cate_arbo)) {

-            if (!count($cate_arbo))

-                $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';

-            else {

+            if (!count($cate_arbo)) {
+                            $output .= '<option value="-1" disabled>' . $langs->trans("NoCategoriesDefined") . '</option>';
+            } else {

                 $output .= '<option value="-1">&nbsp;</option>';

                 foreach ($cate_arbo as $key => $value) {

                     if ($cate_arbo[$key]['id'] == $selected || ($selected == 'auto' && count($cate_arbo) == 1)) {

@@ -3668,8 +3869,9 @@ 
         $output .= '</select>';

         $output .= "\n";

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $output;

     }

 

@@ -3733,8 +3935,9 @@ 
 

         // Clean parameters

         $newselectedchoice = empty($selectedchoice) ? "no" : $selectedchoice;

-        if ($conf->browser->layout == 'phone')

-            $width = '95%';

+        if ($conf->browser->layout == 'phone') {
+                    $width = '95%';
+        }
 

         if (is_array($formquestion) && !empty($formquestion)) {

             // First add hidden fields and value

@@ -3748,8 +3951,9 @@ 
 

             // Now add questions

             $more .= '<table class="paddingtopbottomonly" width="100%">' . "\n";

-            if (!empty($formquestion['text']))

-                $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";

+            if (!empty($formquestion['text'])) {
+                            $more .= '<tr><td colspan="2">' . $formquestion['text'] . '</td></tr>' . "\n";
+            }
             foreach ($formquestion as $key => $input) {

                 if (is_array($input) && !empty($input)) {

                     $size = (!empty($input['size']) ? ' size="' . $input['size'] . '"' : '');

@@ -3762,42 +3966,45 @@ 
                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td><td align="left"><input type="password" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $size . ' value="' . $input['value'] . '"' . $moreattr . ' /></td></tr>' . "\n";

                     } elseif ($input['type'] == 'select') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td class="tdtop" align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td class="tdtop" align="left">';
+                        }
                         $more .= $this->selectarray($input['name'], $input['values'], $input['default'], 1, 0, 0, $moreattr, 0, 0, 0, '', $morecss);

                         $more .= '</td></tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'checkbox') {

+                    } elseif ($input['type'] == 'checkbox') {

                         $more .= '<tr>';

                         $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . ' </td><td align="left">';

                         $more .= '<input type="checkbox" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '"' . $moreattr;

-                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0')

-                            $more .= ' checked';

-                        if (is_bool($input['value']) && $input['value'])

-                            $more .= ' checked';

-                        if (isset($input['disabled']))

-                            $more .= ' disabled';

+                        if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+                                                    $more .= ' checked';
+                        }
+                        if (is_bool($input['value']) && $input['value']) {
+                                                    $more .= ' checked';
+                        }
+                        if (isset($input['disabled'])) {
+                                                    $more .= ' disabled';
+                        }
                         $more .= ' /></td>';

                         $more .= '</tr>' . "\n";

-                    }

-                    elseif ($input['type'] == 'radio') {

+                    } elseif ($input['type'] == 'radio') {

                         $i = 0;

                         foreach ($input['values'] as $selkey => $selval) {

                             $more .= '<tr>';

-                            if ($i == 0)

-                                $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

-                            else

-                                $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';

+                            if ($i == 0) {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? ' class="tdtop"' : (' class="tdtop ' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';
+                            } else {
+                                                            $more .= '<td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>&nbsp;</td>';
+                            }
                             $more .= '<td><input type="radio" class="flat' . $morecss . '" id="' . $input['name'] . '" name="' . $input['name'] . '" value="' . $selkey . '"' . $moreattr;

-                            if ($input['disabled'])

-                                $more .= ' disabled';

+                            if ($input['disabled']) {
+                                                            $more .= ' disabled';
+                            }
                             $more .= ' /> ';

                             $more .= $selval;

                             $more .= '</td></tr>' . "\n";

                             $i++;

                         }

-                    }

-                    elseif ($input['type'] == 'date') {

+                    } elseif ($input['type'] == 'date') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>' . $input['label'] . '</td>';

                         $more .= '<td align="left">';

                         $more .= $this->selectDate($input['value'], $input['name'], 0, 0, 0, '', 1, 0);

@@ -3809,13 +4016,12 @@ 
                         $formquestion[] = array('name' => $input['name'] . 'min');

                     } elseif ($input['type'] == 'other') {

                         $more .= '<tr><td' . (empty($input['tdclass']) ? '' : (' class="' . $input['tdclass'] . '"')) . '>';

-                        if (!empty($input['label']))

-                            $more .= $input['label'] . '</td><td align="left">';

+                        if (!empty($input['label'])) {
+                                                    $more .= $input['label'] . '</td><td align="left">';
+                        }
                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

-                    }

-

-                    elseif ($input['type'] == 'onecolumn') {

+                    } elseif ($input['type'] == 'onecolumn') {

                         $more .= '<tr><td colspan="2" align="left">';

                         $more .= $input['value'];

                         $more .= '</td></tr>' . "\n";

@@ -3828,10 +4034,12 @@ 
         // JQUI method dialog is broken with jmobile, we use standard HTML.

         // Note: When using dol_use_jmobile or no js, you must also check code for button use a GET url with action=xxx and check that you also output the confirm code when action=xxx

         // See page product/card.php for example

-        if (!empty($conf->dol_use_jmobile))

-            $useajax = 0;

-        if (empty($conf->use_javascript_ajax))

-            $useajax = 0;

+        if (!empty($conf->dol_use_jmobile)) {
+                    $useajax = 0;
+        }
+        if (empty($conf->use_javascript_ajax)) {
+                    $useajax = 0;
+        }
 

         if ($useajax) {

             $autoOpen = true;

@@ -3849,10 +4057,12 @@ 
             if (is_array($formquestion)) {

                 foreach ($formquestion as $key => $input) {

                     //print "xx ".$key." rr ".is_array($input)."<br>\n";

-                    if (is_array($input) && isset($input['name']))

-                        array_push($inputok, $input['name']);

-                    if (isset($input['inputko']) && $input['inputko'] == 1)

-                        array_push($inputko, $input['name']);

+                    if (is_array($input) && isset($input['name'])) {
+                                            array_push($inputok, $input['name']);
+                    }
+                    if (isset($input['inputko']) && $input['inputko'] == 1) {
+                                            array_push($inputko, $input['name']);
+                    }
                 }

             }

             // Show JQuery confirm box. Note that global var $useglobalvars is used inside this template

@@ -3937,12 +4147,14 @@ 
         } else {

             $formconfirm .= "\n<!-- begin formconfirm page=" . $page . " -->\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<form method="POST" action="' . $page . '" class="notoptoleftroright">' . "\n";
+            }
 

             $formconfirm .= '<input type="hidden" name="action" value="' . $action . '">' . "\n";

-            if (empty($disableformtag))

-                $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">' . "\n";
+            }
 

             $formconfirm .= '<table width="100%" class="valid">' . "\n";

 

@@ -3967,8 +4179,9 @@ 
 

             $formconfirm .= '</table>' . "\n";

 

-            if (empty($disableformtag))

-                $formconfirm .= "</form>\n";

+            if (empty($disableformtag)) {
+                            $formconfirm .= "</form>\n";
+            }
             $formconfirm .= '<br>';

 

             $formconfirm .= "<!-- end formconfirm -->\n";

@@ -4158,14 +4371,16 @@ 
             $ret .= '<td align="left"><input type="submit" class="button" value="' . $langs->trans("Modify") . '"></td>';

             $ret .= '</tr></table></form>';

         } else {

-            if ($displayhour)

-                $ret .= dol_print_date($selected, 'dayhour');

-            else

-                $ret .= dol_print_date($selected, 'day');

+            if ($displayhour) {
+                            $ret .= dol_print_date($selected, 'dayhour');
+            } else {
+                            $ret .= dol_print_date($selected, 'day');
+            }
         }

 

-        if (empty($nooutput))

-            print $ret;

+        if (empty($nooutput)) {
+                    print $ret;
+        }
         return $ret;

     }

 

@@ -4291,10 +4506,10 @@ 
         } else {

             if (!empty($rate)) {

                 print price($rate, 1, $langs, 1, 0);

-                if ($currency && $rate != 1)

-                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';

-            }

-            else {

+                if ($currency && $rate != 1) {
+                                    print ' &nbsp; (' . price($rate, 1, $langs, 1, 0) . ' ' . $currency . ' = 1 ' . $conf->currency . ')';
+                }
+            } else {

                 print 1;

             }

         }

@@ -4327,34 +4542,41 @@ 
             print '<div class="inline-block">';

             if (!empty($discount_type)) {

                 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

-                }

-                else {

-                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        $translationKey = 'HasAbsoluteDiscountFromSupplier';

-                    else

-                        $translationKey = 'HasCreditNoteFromSupplier';

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            $translationKey = 'HasAbsoluteDiscountFromSupplier';
+                    } else {
+                                            $translationKey = 'HasCreditNoteFromSupplier';
+                    }
                 }

             } else {

                 if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {

-                    if (!$filter || $filter == "fk_facture_source IS NULL")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';    // If we want deposit to be substracted to payments only and not to total of final invoice

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

-                }

-                else {

-                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        $translationKey = 'CompanyHasAbsoluteDiscount';

-                    else

-                        $translationKey = 'CompanyHasCreditNote';

+                    if (!$filter || $filter == "fk_facture_source IS NULL") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    }
+                    // If we want deposit to be substracted to payments only and not to total of final invoice

+                    else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
+                } else {

+                    if (!$filter || $filter == "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            $translationKey = 'CompanyHasAbsoluteDiscount';
+                    } else {
+                                            $translationKey = 'CompanyHasCreditNote';
+                    }
                 }

             }

             print $langs->trans($translationKey, price($amount, 0, $langs, 0, 0, -1, $conf->currency));

-            if (empty($hidelist))

-                print ': ';

+            if (empty($hidelist)) {
+                            print ': ';
+            }
             print '</div>';

             if (empty($hidelist)) {

                 print '<div class="inline-block" style="padding-right: 10px">';

@@ -4364,15 +4586,18 @@ 
                 } else {

                     $newfilter .= ' AND fk_facture IS NULL AND fk_facture_line IS NULL'; // Customer discounts available

                 }

-                if ($filter)

-                    $newfilter .= ' AND (' . $filter . ')';

+                if ($filter) {
+                                    $newfilter .= ' AND (' . $filter . ')';
+                }
                 $nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);

                 if ($nbqualifiedlines > 0) {

                     print ' &nbsp; <input type="submit" class="button" value="' . dol_escape_htmltag($langs->trans("UseLine")) . '"';

-                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

-                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')")

-                        print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';

+                    if (!empty($discount_type) && $filter && $filter != "fk_invoice_supplier_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS PAID)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
+                    if (empty($discount_type) && $filter && $filter != "fk_facture_source IS NULL OR (description LIKE '(DEPOSIT)%' AND description NOT LIKE '(EXCESS RECEIVED)%')") {
+                                            print ' title="' . $langs->trans("UseCreditNoteInInvoicePayment") . '"';
+                    }
 

                     print '>';

                 }

@@ -4473,10 +4698,11 @@ 
             }

         }

 

-        if ($nooutput)

-            return $out;

-        else

-            print $out;

+        if ($nooutput) {
+                    return $out;
+        } else {
+                    print $out;
+        }
     }

 

     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps

@@ -4509,8 +4735,10 @@ 
 

         $out = '';

 

-        if ($selected == 'euro' || $selected == 'euros')

-            $selected = 'EUR';   // Pour compatibilite

+        if ($selected == 'euro' || $selected == 'euros') {
+                    $selected = 'EUR';
+        }
+        // Pour compatibilite

 

         $out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="' . $htmlname . '" id="' . $htmlname . '">';

         foreach ($langs->cache_currencies as $code_iso => $currency) {

@@ -4524,8 +4752,9 @@ 
             $out .= '</option>';

         }

         $out .= '</select>';

-        if ($user->admin)

-            $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+        if ($user->admin) {
+                    $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+        }
 

         // Make select dynamic

         include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';

@@ -4554,14 +4783,16 @@ 
         $sql .= " WHERE entity IN ('" . getEntity('mutlicurrency') . "')";

         $resql = $db->query($sql);

         if ($resql) {

-            while ($obj = $db->fetch_object($resql))

-                $TCurrency[$obj->code] = $obj->code;

+            while ($obj = $db->fetch_object($resql)) {
+                            $TCurrency[$obj->code] = $obj->code;
+            }
         }

 

         $out = '';

         $out .= '<select class="flat" name="' . $htmlname . '" id="' . $htmlname . '">';

-        if ($useempty)

-            $out .= '<option value=""></option>';

+        if ($useempty) {
+                    $out .= '<option value=""></option>';
+        }
         // If company current currency not in table, we add it into list. Should always be available.

         if (!in_array($conf->currency, $TCurrency)) {

             $TCurrency[$conf->currency] = $conf->currency;

@@ -4569,10 +4800,11 @@ 
         if (count($TCurrency) > 0) {

             foreach ($langs->cache_currencies as $code_iso => $currency) {

                 if (isset($TCurrency[$code_iso])) {

-                    if (!empty($selected) && $selected == $code_iso)

-                        $out .= '<option value="' . $code_iso . '" selected="selected">';

-                    else

-                        $out .= '<option value="' . $code_iso . '">';

+                    if (!empty($selected) && $selected == $code_iso) {
+                                            $out .= '<option value="' . $code_iso . '" selected="selected">';
+                    } else {
+                                            $out .= '<option value="' . $code_iso . '">';
+                    }
 

                     $out .= $currency['label'];

                     $out .= ' (' . $langs->getCurrencySymbol($code_iso) . ')';

@@ -4602,8 +4834,10 @@ 
         global $langs;

 

         $num = count($this->cache_vatrates);

-        if ($num > 0)

-            return $num;    // Cache already loaded

+        if ($num > 0) {
+                    return $num;
+        }
+        // Cache already loaded

 

         dol_syslog(__METHOD__, LOG_DEBUG);

 

@@ -4632,20 +4866,23 @@ 
                     $this->cache_vatrates[$i]['label'] = $obj->taux . '%' . ($obj->code ? ' (' . $obj->code . ')' : '');   // Label must contains only 0-9 , . % or *

                     $this->cache_vatrates[$i]['labelallrates'] = $obj->taux . '/' . ($obj->localtax1 ? $obj->localtax1 : '0') . '/' . ($obj->localtax2 ? $obj->localtax2 : '0') . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                     $positiverates = '';

-                    if ($obj->taux)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->taux;

-                    if ($obj->localtax1)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;

-                    if ($obj->localtax2)

-                        $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;

-                    if (empty($positiverates))

-                        $positiverates = '0';

+                    if ($obj->taux) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->taux;
+                    }
+                    if ($obj->localtax1) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax1;
+                    }
+                    if ($obj->localtax2) {
+                                            $positiverates .= ($positiverates ? '/' : '') . $obj->localtax2;
+                    }
+                    if (empty($positiverates)) {
+                                            $positiverates = '0';
+                    }
                     $this->cache_vatrates[$i]['labelpositiverates'] = $positiverates . ($obj->code ? ' (' . $obj->code . ')' : ''); // Must never be used as key, only label

                 }

 

                 return $num;

-            }

-            else {

+            } else {

                 $this->error = '<font class="error">' . $langs->trans("ErrorNoVATRateDefinedForSellerCountry", $country_code) . '</font>';

                 return -1;

             }

@@ -4749,17 +4986,19 @@ 
                     $defaultcode = $reg[1];

                     $defaulttx = preg_replace('/\s*\(.*\)/', '', $defaulttx);

                 }

-                if (empty($defaulttx))

-                    $defaultnpr = 0;

+                if (empty($defaulttx)) {
+                                    $defaultnpr = 0;
+                }
             }

 

             // Si taux par defaut n'a pu etre determine, on prend dernier de la liste.

             // Comme ils sont tries par ordre croissant, dernier = plus eleve = taux courant

             if ($defaulttx < 0 || dol_strlen($defaulttx) == 0) {

-                if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS))

-                    $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];

-                else

-                    $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);

+                if (empty($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS)) {
+                                    $defaulttx = $this->cache_vatrates[$num - 1]['txtva'];
+                } else {
+                                    $defaulttx = ($conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS == 'none' ? '' : $conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS);
+                }
             }

 

             // Disabled if seller is not subject to VAT

@@ -4773,22 +5012,26 @@ 
                 }

             }

 

-            if (!$options_only)

-                $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';

+            if (!$options_only) {
+                            $return .= '<select class="flat minwidth75imp" id="' . $htmlname . '" name="' . $htmlname . '"' . ($disabled ? ' disabled' : '') . $title . '>';
+            }
 

             $selectedfound = false;

             foreach ($this->cache_vatrates as $rate) {

                 // Keep only 0 if seller is not subject to VAT

-                if ($disabled && $rate['txtva'] != 0)

-                    continue;

+                if ($disabled && $rate['txtva'] != 0) {
+                                    continue;
+                }
 

                 // Define key to use into select list

                 $key = $rate['txtva'];

                 $key .= $rate['nprtva'] ? '*' : '';

-                if ($mode > 0 && $rate['code'])

-                    $key .= ' (' . $rate['code'] . ')';

-                if ($mode < 0)

-                    $key = $rate['rowid'];

+                if ($mode > 0 && $rate['code']) {
+                                    $key .= ' (' . $rate['code'] . ')';
+                }
+                if ($mode < 0) {
+                                    $key = $rate['rowid'];
+                }
 

                 $return .= '<option value="' . $key . '"';

                 if (!$selectedfound) {

@@ -4815,10 +5058,10 @@ 
                 $return .= '</option>';

             }

 

-            if (!$options_only)

-                $return .= '</select>';

-        }

-        else {

+            if (!$options_only) {
+                            $return .= '</select>';
+            }
+        } else {

             $return .= $this->error;

         }

 

@@ -4890,12 +5133,15 @@ 
 

         $retstring = '';

 

-        if ($prefix == '')

-            $prefix = 're';

-        if ($h == '')

-            $h = 0;

-        if ($m == '')

-            $m = 0;

+        if ($prefix == '') {
+                    $prefix = 're';
+        }
+        if ($h == '') {
+                    $h = 0;
+        }
+        if ($m == '') {
+                    $m = 0;
+        }
         $emptydate = 0;

         $emptyhours = 0;

         if ($empty == 1) {

@@ -4944,10 +5190,12 @@ 
             $smin = !isset($conf->global->MAIN_DEFAULT_DATE_MIN) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_MIN;

             $ssec = !isset($conf->global->MAIN_DEFAULT_DATE_SEC) ? ($h == -1 ? '59' : '') : $conf->global->MAIN_DEFAULT_DATE_SEC;

         }

-        if ($h == 3)

-            $shour = '';

-        if ($m == 3)

-            $smin = '';

+        if ($h == 3) {
+                    $shour = '';
+        }
+        if ($m == 3) {
+                    $smin = '';
+        }
 

         // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'

         $usecalendar = 'combo';

@@ -4979,14 +5227,14 @@ 
                         $base = DOL_URL_ROOT . '/core/';

                         $retstring .= ' onClick="showDP(\'' . $base . '\',\'' . $prefix . '\',\'' . $langs->trans("FormatDateShortJavaInput") . '\',\'' . $langs->defaultlang . '\');"';

                         $retstring .= '>' . img_object($langs->trans("SelectDate"), 'calendarday', 'class="datecallink"') . '</button>';

-                    } else

-                        $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';

+                    } else {
+                                            $retstring .= '<button id="' . $prefix . 'Button" type="button" class="dpInvisibleButtons">' . img_object($langs->trans("Disabled"), 'calendarday', 'class="datecallink"') . '</button>';
+                    }
 

                     $retstring .= '<input type="hidden" id="' . $prefix . 'day"   name="' . $prefix . 'day"   value="' . $sday . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'month" name="' . $prefix . 'month" value="' . $smonth . '">' . "\n";

                     $retstring .= '<input type="hidden" id="' . $prefix . 'year"  name="' . $prefix . 'year"  value="' . $syear . '">' . "\n";

-                }

-                elseif ($usecalendar == 'jquery') {

+                } elseif ($usecalendar == 'jquery') {

                     if (!$disabled) {

                         // Output javascript for datepicker

                         $retstring .= "<script type='text/javascript'>";

@@ -5096,32 +5344,38 @@ 
             }

         }

 

-        if ($d && $h)

-            $retstring .= ($h == 2 ? '<br>' : ' ');

+        if ($d && $h) {
+                    $retstring .= ($h == 2 ? '<br>' : ' ');
+        }
 

         if ($h) {

             // Show hour

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'hour' : '') . '" id="' . $prefix . 'hour" name="' . $prefix . 'hour">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($hour = 0; $hour < 24; $hour++) {

-                if (strlen($hour) < 2)

-                    $hour = "0" . $hour;

+                if (strlen($hour) < 2) {
+                                    $hour = "0" . $hour;
+                }
                 $retstring .= '<option value="' . $hour . '"' . (($hour == $shour) ? ' selected' : '') . '>' . $hour . (empty($conf->dol_optimize_smallscreen) ? '' : 'H') . '</option>';

             }

             $retstring .= '</select>';

-            if ($m && empty($conf->dol_optimize_smallscreen))

-                $retstring .= ":";

+            if ($m && empty($conf->dol_optimize_smallscreen)) {
+                            $retstring .= ":";
+            }
         }

 

         if ($m) {

             // Show minutes

             $retstring .= '<select' . ($disabled ? ' disabled' : '') . ' class="flat valignmiddle maxwidth50 ' . ($fullday ? $fullday . 'min' : '') . '" id="' . $prefix . 'min" name="' . $prefix . 'min">';

-            if ($emptyhours)

-                $retstring .= '<option value="-1">&nbsp;</option>';

+            if ($emptyhours) {
+                            $retstring .= '<option value="-1">&nbsp;</option>';
+            }
             for ($min = 0; $min < 60; $min++) {

-                if (strlen($min) < 2)

-                    $min = "0" . $min;

+                if (strlen($min) < 2) {
+                                    $min = "0" . $min;
+                }
                 $retstring .= '<option value="' . $min . '"' . (($min == $smin) ? ' selected' : '') . '>' . $min . (empty($conf->dol_optimize_smallscreen) ? '' : '') . '</option>';

             }

             $retstring .= '</select>';

@@ -5152,21 +5406,25 @@ 
               } */

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'hour\'].value=formatDate(new Date(), \'HH\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 //$reset_scripts .= 'this.form.elements[\''.$prefix.'min\'].value=formatDate(new Date(), \'mm\'); ';

                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

@@ -5188,19 +5446,23 @@ 
             $reset_scripts .= 'jQuery(\'#' . $prefix . 'year\').val(\'' . dol_print_date(dol_now(), '%Y') . '\');';

             // Update the hour part

             if ($h) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'hour\').val(\'' . dol_print_date(dol_now(), '%H') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // Update the minute part

             if ($m) {

-                if ($fullday)

-                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";

+                if ($fullday) {
+                                    $reset_scripts .= " if (jQuery('#fullday:checked').val() == null) {";
+                }
                 $reset_scripts .= 'jQuery(\'#' . $prefix . 'min\').val(\'' . dol_print_date(dol_now(), '%M') . '\');';

-                if ($fullday)

-                    $reset_scripts .= ' } ';

+                if ($fullday) {
+                                    $reset_scripts .= ' } ';
+                }
             }

             // If reset_scripts is not empty, print the link with the reset_scripts in the onClick

             if ($reset_scripts && empty($conf->dol_optimize_smallscreen)) {

@@ -5263,41 +5525,46 @@ 
             $retstring .= "</select>";

         } elseif ($typehour == 'text' || $typehour == 'textselect') {

             $retstring .= '<input placeholder="' . $langs->trans('HourShort') . '" type="number" min="0" size="1" name="' . $prefix . 'hour"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputhour" value="' . (($hourSelected != '') ? ((int) $hourSelected) : '') . '">';

-        } else

-            return 'BadValueForParameterTypeHour';

+        } else {
+                    return 'BadValueForParameterTypeHour';
+        }
 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('HourShort');

-        else

-            $retstring .= '<span class="hideonsmartphone">:</span>';

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('HourShort');
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">:</span>';
+        }
 

         // Minutes

-        if ($minunderhours)

-            $retstring .= '<br>';

-        else

-            $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';

+        if ($minunderhours) {
+                    $retstring .= '<br>';
+        } else {
+                    $retstring .= '<span class="hideonsmartphone">&nbsp;</span>';
+        }
 

         if ($typehour == 'select' || $typehour == 'textselect') {

             $retstring .= '<select class="flat" id="select_' . $prefix . 'min" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . '>';

             for ($min = 0; $min <= 55; $min = $min + 5) {

                 $retstring .= '<option value="' . $min . '"';

-                if ($minSelected == $min)

-                    $retstring .= ' selected';

+                if ($minSelected == $min) {
+                                    $retstring .= ' selected';
+                }
                 $retstring .= '>' . $min . '</option>';

             }

             $retstring .= "</select>";

-        }

-        elseif ($typehour == 'text') {

+        } elseif ($typehour == 'text') {

             $retstring .= '<input placeholder="' . $langs->trans('MinuteShort') . '" type="number" min="0" size="1" name="' . $prefix . 'min"' . ($disabled ? ' disabled' : '') . ' class="flat maxwidth50 inputminute" value="' . (($minSelected != '') ? ((int) $minSelected) : '') . '">';

         }

 

-        if ($typehour != 'text')

-            $retstring .= ' ' . $langs->trans('MinuteShort');

+        if ($typehour != 'text') {
+                    $retstring .= ' ' . $langs->trans('MinuteShort');
+        }
 

         //$retstring.="&nbsp;";

 

-        if (!empty($nooutput))

-            return $retstring;

+        if (!empty($nooutput)) {
+                    return $retstring;
+        }
 

         print $retstring;

         return;

@@ -5340,8 +5607,9 @@ 
         }

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         dol_syslog(get_class($this) . "::selectForForms", LOG_DEBUG);

@@ -5356,11 +5624,11 @@ 
             // Activate the auto complete using ajax call.

             $out .= ajax_autocompleter($preselectedvalue, $htmlname, $urlforajaxcall, $urloption, $conf->global->$confkeyforautocompletemode, 0, array());

             $out .= '<style type="text/css">.ui-autocomplete { z-index: 250; }</style>';

-            if ($placeholder)

-                $placeholder = ' placeholder="' . $placeholder . '"';

+            if ($placeholder) {
+                            $placeholder = ' placeholder="' . $placeholder . '"';
+            }
             $out .= '<input type="text" class="' . $morecss . '" name="search_' . $htmlname . '" id="search_' . $htmlname . '" value="' . $preselectedvalue . '"' . $placeholder . ' />';

-        }

-        else {

+        } else {

             // Immediate load of all database

             $out .= $this->selectForFormsList($objecttmp, $htmlname, $preselectedvalue, $showempty, $searchkey, $placeholder, $morecss, $moreparams, $forcecombo);

         }

@@ -5390,19 +5658,22 @@ 
         global $conf, $langs, $user;

 

         $prefixforautocompletemode = $objecttmp->element;

-        if ($prefixforautocompletemode == 'societe')

-            $prefixforautocompletemode = 'company';

+        if ($prefixforautocompletemode == 'societe') {
+                    $prefixforautocompletemode = 'company';
+        }
         $confkeyforautocompletemode = strtoupper($prefixforautocompletemode) . '_USE_SEARCH_TO_SELECT'; // For example COMPANY_USE_SEARCH_TO_SELECT

 

         $fieldstoshow = 't.ref';

         if (!empty($objecttmp->fields)) { // For object that declare it, it is better to use declared fields ( like societe, contact, ...)

             $tmpfieldstoshow = '';

             foreach ($objecttmp->fields as $key => $val) {

-                if ($val['showoncombobox'])

-                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;

+                if ($val['showoncombobox']) {
+                                    $tmpfieldstoshow .= ($tmpfieldstoshow ? ',' : '') . 't.' . $key;
+                }
             }

-            if ($tmpfieldstoshow)

-                $fieldstoshow = $tmpfieldstoshow;

+            if ($tmpfieldstoshow) {
+                            $fieldstoshow = $tmpfieldstoshow;
+            }
         }

 

         $out = '';

@@ -5412,23 +5683,28 @@ 
 

         // Search data

         $sql = "SELECT t.rowid, " . $fieldstoshow . " FROM " . MAIN_DB_PREFIX . $objecttmp->table_element . " as t";

-        if ($objecttmp->ismultientitymanaged == 2)

-            if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";

+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+        }
         $sql .= " WHERE 1=1";

-        if (!empty($objecttmp->ismultientitymanaged))

-            $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";

+        if (!empty($objecttmp->ismultientitymanaged)) {
+                    $sql .= " AND t.entity IN (" . getEntity($objecttmp->table_element) . ")";
+        }
         if ($objecttmp->ismultientitymanaged == 1 && !empty($user->societe_id)) {

-            if ($objecttmp->element == 'societe')

-                $sql .= " AND t.rowid = " . $user->societe_id;

-            else

-                $sql .= " AND t.fk_soc = " . $user->societe_id;

-        }

-        if ($searchkey != '')

-            $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);

-        if ($objecttmp->ismultientitymanaged == 2)

-            if (!$user->rights->societe->client->voir && !$user->societe_id)

-                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;

+            if ($objecttmp->element == 'societe') {
+                            $sql .= " AND t.rowid = " . $user->societe_id;
+            } else {
+                            $sql .= " AND t.fk_soc = " . $user->societe_id;
+            }
+        }

+        if ($searchkey != '') {
+                    $sql .= natural_search(explode(',', $fieldstoshow), $searchkey);
+        }
+        if ($objecttmp->ismultientitymanaged == 2) {
+                    if (!$user->rights->societe->client->voir && !$user->societe_id)

+                $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+        }
         $sql .= $this->db->order($fieldstoshow, "ASC");

         //$sql.=$this->db->plimit($limit, 0);

         // Build output string

@@ -5447,13 +5723,15 @@ 
 

             //if (! empty($conf->use_javascript_ajax) || $forcecombo) $textifempty='';

             if (!empty($conf->global->$confkeyforautocompletemode)) {

-                if ($showempty && !is_numeric($showempty))

-                    $textifempty = $langs->trans($showempty);

-                else

-                    $textifempty .= $langs->trans("All");

+                if ($showempty && !is_numeric($showempty)) {
+                                    $textifempty = $langs->trans($showempty);
+                } else {
+                                    $textifempty .= $langs->trans("All");
+                }
             }

-            if ($showempty)

-                $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";

+            if ($showempty) {
+                            $out .= '<option value="-1">' . $textifempty . '</option>' . "\n";
+            }
 

             $num = $this->db->num_rows($resql);

             $i = 0;

@@ -5477,21 +5755,22 @@ 
                     }

 

                     $i++;

-                    if (($i % 10) == 0)

-                        $out .= "\n";

+                    if (($i % 10) == 0) {
+                                            $out .= "\n";
+                    }
                 }

             }

 

             $out .= '</select>' . "\n";

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

         $this->result = array('nbofelement' => $num);

 

-        if ($outputmode)

-            return $outarray;

+        if ($outputmode) {
+                    return $outarray;
+        }
         return $out;

     }

 

@@ -5527,8 +5806,9 @@ 
         //if (preg_match('/^multi/',$htmlname)) $jsbeautify = 1;

         $jsbeautify = 1;

 

-        if ($value_as_key)

-            $array = array_combine($array, $array);

+        if ($value_as_key) {
+                    $array = array_combine($array, $array);
+        }
 

         $out = '';

 

@@ -5548,10 +5828,13 @@ 
 

         if ($show_empty) {

             $textforempty = ' ';

-            if (!empty($conf->use_javascript_ajax))

-                $textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

-            if (!is_numeric($show_empty))

-                $textforempty = $show_empty;

+            if (!empty($conf->use_javascript_ajax)) {
+                            $textforempty = '&nbsp;';
+            }
+            // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.

+            if (!is_numeric($show_empty)) {
+                            $textforempty = $show_empty;
+            }
             $out .= '<option class="optiongrey" ' . ($moreparamonempty ? $moreparamonempty . ' ' : '') . 'value="' . ($show_empty < 0 ? $show_empty : -1) . '"' . ($id == $show_empty ? ' selected' : '') . '>' . $textforempty . '</option>' . "\n";

         }

 

@@ -5564,10 +5847,11 @@ 
             }

 

             // Sort

-            if ($sort == 'ASC')

-                asort($array);

-            elseif ($sort == 'DESC')

-                arsort($array);

+            if ($sort == 'ASC') {
+                            asort($array);
+            } elseif ($sort == 'DESC') {
+                            arsort($array);
+            }
 

             foreach ($array as $key => $value) {

                 $disabled = '';

@@ -5581,26 +5865,31 @@ 
                 }

 

                 if ($key_in_label) {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));

-                    else

-                        $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);

-                }

-                else {

-                    if (empty($nohtmlescape))

-                        $selectOptionValue = dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);

-                    else

-                        $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;

-                    if ($value == '' || $value == '-')

-                        $selectOptionValue = '&nbsp;';

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = dol_escape_htmltag($key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value));
+                    } else {
+                                            $selectOptionValue = $key . ' - ' . ($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    }
+                } else {

+                    if (empty($nohtmlescape)) {
+                                            $selectOptionValue = dol_escape_htmltag($maxlen ? dol_trunc($value, $maxlen) : $value);
+                    } else {
+                                            $selectOptionValue = $maxlen ? dol_trunc($value, $maxlen) : $value;
+                    }
+                    if ($value == '' || $value == '-') {
+                                            $selectOptionValue = '&nbsp;';
+                    }
                 }

 

                 $out .= '<option value="' . $key . '"';

                 $out .= $style . $disabled;

-                if ($id != '' && $id == $key && !$disabled)

-                    $out .= ' selected';  // To preselect a value

-                if ($nohtmlescape)

-                    $out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';

+                if ($id != '' && $id == $key && !$disabled) {
+                                    $out .= ' selected';
+                }
+                // To preselect a value

+                if ($nohtmlescape) {
+                                    $out .= ' data-html="' . dol_escape_htmltag($selectOptionValue) . '"';
+                }
                 $out .= '>';

                 //var_dump($selectOptionValue);

                 $out .= $selectOptionValue;

@@ -5636,8 +5925,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"></select>';

 

@@ -5736,8 +6026,9 @@ 
         global $delayedhtmlcontent;

 

         // TODO Use an internal dolibarr component instead of select2

-        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT'))

-            return '';

+        if (empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) && !defined('REQUIRE_JQUERY_MULTISELECT')) {
+                    return '';
+        }
 

         $out = '<select type="text" class="' . $htmlname . ($morecss ? ' ' . $morecss : '') . '" ' . ($moreparam ? $moreparam . ' ' : '') . 'name="' . $htmlname . '"><option></option></select>';

 

@@ -5907,8 +6198,9 @@ 
 

         $out .= '<select id="' . $htmlname . '" class="multiselect' . ($morecss ? ' ' . $morecss : '') . '" multiple name="' . $htmlname . '[]"' . ($moreattrib ? ' ' . $moreattrib : '') . ($width ? ' style="width: ' . (preg_match('/%/', $width) ? $width : $width . 'px') . '"' : '') . '>' . "\n";

         if (is_array($array) && !empty($array)) {

-            if ($value_as_key)

-                $array = array_combine($array, $array);

+            if ($value_as_key) {
+                            $array = array_combine($array, $array);
+            }
 

             if (!empty($array)) {

                 foreach ($array as $key => $value) {

@@ -5943,8 +6235,9 @@ 
     {

         global $conf, $langs, $user;

 

-        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))

-            return '';

+        if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+                    return '';
+        }
 

         $tmpvar = "MAIN_SELECTEDFIELDS_" . $varpage;

         if (!empty($user->conf->$tmpvar)) {

@@ -5952,10 +6245,11 @@ 
             foreach ($array as $key => $val) {

                 //var_dump($key);

                 //var_dump($tmparray);

-                if (in_array($key, $tmparray))

-                    $array[$key]['checked'] = 1;

-                else

-                    $array[$key]['checked'] = 0;

+                if (in_array($key, $tmparray)) {
+                                    $array[$key]['checked'] = 1;
+                } else {
+                                    $array[$key]['checked'] = 0;
+                }
             }

         }

         //var_dump($array);

@@ -6121,40 +6415,47 @@ 
                 // To work with non standard path

                 if ($objecttype == 'facture') {

                     $tplpath = 'compta/' . $element;

-                    if (empty($conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'facturerec') {

+                    if (empty($conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'facturerec') {

                     $tplpath = 'compta/facture';

                     $tplname = 'linkedobjectblockForRec';

-                    if (empty($conf->facture->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'propal') {

+                    if (empty($conf->facture->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'propal') {

                     $tplpath = 'comm/' . $element;

-                    if (empty($conf->propal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'supplier_proposal') {

-                    if (empty($conf->supplier_proposal->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

+                    if (empty($conf->propal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'supplier_proposal') {

+                    if (empty($conf->supplier_proposal->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'shipping' || $objecttype == 'shipment') {

                     $tplpath = 'expedition';

-                    if (empty($conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'reception') {

+                    if (empty($conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'reception') {

                     $tplpath = 'reception';

-                    if (empty($conf->reception->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'delivery') {

+                    if (empty($conf->reception->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'delivery') {

                     $tplpath = 'livraison';

-                    if (empty($conf->expedition->enabled))

-                        continue; // Do not show if module disabled

-                }

-                else if ($objecttype == 'invoice_supplier') {

+                    if (empty($conf->expedition->enabled)) {
+                                            continue;
+                    }
+                    // Do not show if module disabled

+                } else if ($objecttype == 'invoice_supplier') {

                     $tplpath = 'fourn/facture';

                 } else if ($objecttype == 'order_supplier') {

                     $tplpath = 'fourn/commande';

@@ -6218,20 +6519,23 @@ 
         $linktoelemlist = '';

         $listofidcompanytoscan = '';

 

-        if (!is_object($object->thirdparty))

-            $object->fetch_thirdparty();

+        if (!is_object($object->thirdparty)) {
+                    $object->fetch_thirdparty();
+        }
 

         $possiblelinks = array();

         if (is_object($object->thirdparty) && !empty($object->thirdparty->id) && $object->thirdparty->id > 0) {

             $listofidcompanytoscan = $object->thirdparty->id;

-            if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO))

-                $listofidcompanytoscan .= ',' . $object->thirdparty->parent;

+            if (($object->thirdparty->parent > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PARENT_IN_LINKTO)) {
+                            $listofidcompanytoscan .= ',' . $object->thirdparty->parent;
+            }
             if (($object->fk_project > 0) && !empty($conf->global->THIRDPARTY_INCLUDE_PROJECT_THIRDPARY_IN_LINKTO)) {

                 include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';

                 $tmpproject = new Project($this->db);

                 $tmpproject->fetch($object->fk_project);

-                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id))

-                    $listofidcompanytoscan .= ',' . $tmpproject->socid;

+                if ($tmpproject->socid > 0 && ($tmpproject->socid != $object->thirdparty->id)) {
+                                    $listofidcompanytoscan .= ',' . $tmpproject->socid;
+                }
                 unset($tmpproject);

             }

 

@@ -6267,8 +6571,9 @@ 
         foreach ($possiblelinks as $key => $possiblelink) {

             $num = 0;

 

-            if (empty($possiblelink['enabled']))

-                continue;

+            if (empty($possiblelink['enabled'])) {
+                            continue;
+            }
 

             if (!empty($possiblelink['perms']) && (empty($restrictlinksto) || in_array($key, $restrictlinksto)) && (empty($excludelinksto) || !in_array($key, $excludelinksto))) {

                 print '<div id="' . $key . 'list"' . (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? ' style="display:none"' : '') . '>';

@@ -6319,11 +6624,13 @@ 
                 }

 

                 //$linktoelem.=($linktoelem?' &nbsp; ':'');

-                if ($num > 0)

-                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';

+                if ($num > 0) {
+                                    $linktoelemlist .= '<li><a href="#linkto' . $key . '" class="linkto dropdowncloseonclick" rel="' . $key . '">' . $langs->trans($possiblelink['label']) . ' (' . $num . ')</a></li>';
+                }
                 //else $linktoelem.=$langs->trans($possiblelink['label']);

-                else

-                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';

+                else {
+                                    $linktoelemlist .= '<li><span class="linktodisabled">' . $langs->trans($possiblelink['label']) . ' (0)</span></li>';
+                }
             }

         }

 

@@ -6381,8 +6688,9 @@ 
         $disabled = ($disabled ? ' disabled' : '');

 

         $resultyesno = '<select class="flat width75" id="' . $htmlname . '" name="' . $htmlname . '"' . $disabled . '>' . "\n";

-        if ($useempty)

-            $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+        if ($useempty) {
+                    $resultyesno .= '<option value="-1"' . (($value < 0) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+        }
         if (("$value" == 'yes') || ($value == 1)) {

             $resultyesno .= '<option value="' . $yes . '" selected>' . $langs->trans("Yes") . '</option>' . "\n";

             $resultyesno .= '<option value="' . $no . '">' . $langs->trans("No") . '</option>' . "\n";

@@ -6461,10 +6769,12 @@ 
         global $langs, $conf, $hookmanager;

 

         $ret = '';

-        if (empty($fieldid))

-            $fieldid = 'rowid';

-        if (empty($fieldref))

-            $fieldref = 'ref';

+        if (empty($fieldid)) {
+                    $fieldid = 'rowid';
+        }
+        if (empty($fieldref)) {
+                    $fieldref = 'ref';
+        }
 

         // Add where from hooks

         if (is_object($hookmanager)) {

@@ -6503,8 +6813,9 @@ 
         $ret .= '<!-- Start banner content --><div style="vertical-align: middle">';

 

         // Right part of banner

-        if ($morehtmlright)

-            $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';

+        if ($morehtmlright) {
+                    $ret .= '<div class="inline-block floatleft">' . $morehtmlright . '</div>';
+        }
 

         if ($previous_ref || $next_ref || $morehtml) {

             $ret .= '<div class="pagination paginationref"><ul class="right">';

@@ -6522,26 +6833,32 @@ 
 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlStatus', $parameters, $object);    // Note that $action and $object may have been modified by hook

-        if (empty($reshook))

-            $morehtmlstatus .= $hookmanager->resPrint;

-        else

-            $morehtmlstatus = $hookmanager->resPrint;

-        if ($morehtmlstatus)

-            $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';

+        if (empty($reshook)) {
+                    $morehtmlstatus .= $hookmanager->resPrint;
+        } else {
+                    $morehtmlstatus = $hookmanager->resPrint;
+        }
+        if ($morehtmlstatus) {
+                    $ret .= '<div class="statusref">' . $morehtmlstatus . '</div>';
+        }
 

         $parameters = array();

         $reshook = $hookmanager->executeHooks('moreHtmlRef', $parameters, $object); // Note that $action and $object may have been modified by hook

-        if (empty($reshook))

-            $morehtmlref .= $hookmanager->resPrint;

-        elseif ($reshook > 0)

-            $morehtmlref = $hookmanager->resPrint;

+        if (empty($reshook)) {
+                    $morehtmlref .= $hookmanager->resPrint;
+        } elseif ($reshook > 0) {
+                    $morehtmlref = $hookmanager->resPrint;
+        }
 

         // Left part of banner

         if ($morehtmlleft) {

-            if ($conf->browser->layout == 'phone')

-                $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';    // class="center" to have photo in middle

-            else

-                $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';

+            if ($conf->browser->layout == 'phone') {
+                            $ret .= '<div class="floatleft">' . $morehtmlleft . '</div>';
+            }
+            // class="center" to have photo in middle

+            else {
+                            $ret .= '<div class="inline-block floatleft">' . $morehtmlleft . '</div>';
+            }
         }

 

         //if ($conf->browser->layout == 'phone') $ret.='<div class="clearboth"></div>';

@@ -6566,8 +6883,9 @@ 
             $ret .= $object->label;

         } else if ($object->element == 'ecm_directories') {

             $ret .= '';

-        } else if ($fieldref != 'none')

-            $ret .= dol_htmlentities($object->$fieldref);

+        } else if ($fieldref != 'none') {
+                    $ret .= dol_htmlentities($object->$fieldref);
+        }
 

 

         if ($morehtmlref) {

@@ -6592,15 +6910,17 @@ 
         global $conf;

 

         //Check if barcode is filled in the card

-        if (empty($object->barcode))

-            return '';

+        if (empty($object->barcode)) {
+                    return '';
+        }
 

         // Complete object if not complete

         if (empty($object->barcode_type_code) || empty($object->barcode_type_coder)) {

             $result = $object->fetch_barcode();

             //Check if fetch_barcode() failed

-            if ($result < 1)

-                return '<!-- ErrorFetchBarcode -->';

+            if ($result < 1) {
+                            return '<!-- ErrorFetchBarcode -->';
+            }
         }

 

         // Barcode image

@@ -6642,108 +6962,120 @@ 
         if ($modulepart == 'societe') {

             $dir = $conf->societe->multidir_output[$entity];

             if (!empty($object->logo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');             // getImageFileNameForSize include the thumbs

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_mini');
+                }
+                // getImageFileNameForSize include the thumbs

+                else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . getImageFileNameForSize($object->logo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'thirdparty') . '/logos/' . $object->logo;

             }

             $email = $object->email;

-        }

-        else if ($modulepart == 'contact') {

+        } else if ($modulepart == 'contact') {

             $dir = $conf->societe->multidir_output[$entity] . '/contact';

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'contact') . '/photos/' . $object->photo;

             }

             $email = $object->email;

             $capture = 'user';

-        }

-        else if ($modulepart == 'userphoto') {

+        } else if ($modulepart == 'userphoto') {

             $dir = $conf->user->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . $object->id . '/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'user') . '/' . $object->id . '/' . $object->photo;

             }

-            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

             $capture = 'user';

-        }

-        else if ($modulepart == 'memberphoto') {

+        } else if ($modulepart == 'memberphoto') {

             $dir = $conf->adherent->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;
+                }
                 $originalfile = get_exdir(0, 0, 0, 0, $object, 'member') . 'photos/' . $object->photo;

             }

-            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

             $capture = 'user';

-        }

-        else {

+        } else {

             // Generic case to show photos

             $dir = $conf->$modulepart->dir_output;

             if (!empty($object->photo)) {

-                if ((string) $imagesize == 'mini')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');

-                else if ((string) $imagesize == 'small')

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');

-                else

-                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

+                if ((string) $imagesize == 'mini') {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_mini');
+                } else if ((string) $imagesize == 'small') {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . getImageFileNameForSize($object->photo, '_small');
+                } else {
+                                    $file = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;
+                }
                 $originalfile = get_exdir($id, 2, 0, 0, $object, $modulepart) . 'photos/' . $object->photo;

             }

-            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS))

-                $altfile = $object->id . ".jpg"; // For backward compatibility

+            if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
+                            $altfile = $object->id . ".jpg";
+            }
+            // For backward compatibility

             $email = $object->email;

         }

 

-        if ($forcecapture)

-            $capture = $forcecapture;

+        if ($forcecapture) {
+                    $capture = $forcecapture;
+        }
 

         if ($dir) {

             if ($file && file_exists($dir . "/" . $file)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($file) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else if ($altfile && file_exists($dir . "/" . $altfile)) {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else if ($altfile && file_exists($dir . "/" . $altfile)) {

                 if ($addlinktofullsize) {

                     $urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 0, '&entity=' . $entity);

-                    if ($urladvanced)

-                        $ret .= '<a href="' . $urladvanced . '">';

-                    else

-                        $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';

+                    if ($urladvanced) {
+                                            $ret .= '<a href="' . $urladvanced . '">';
+                    } else {
+                                            $ret .= '<a href="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($originalfile) . '&cache=' . $cache . '">';
+                    }
                 }

                 $ret .= '<img class="photo' . $modulepart . ($cssclass ? ' ' . $cssclass : '') . '" alt="Photo alt" id="photologo' . (preg_replace('/[^a-z]/i', '_', $file)) . '" class="' . $cssclass . '" ' . ($width ? ' width="' . $width . '"' : '') . ($height ? ' height="' . $height . '"' : '') . ' src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $modulepart . '&entity=' . $entity . '&file=' . urlencode($altfile) . '&cache=' . $cache . '">';

-                if ($addlinktofullsize)

-                    $ret .= '</a>';

-            }

-            else {

+                if ($addlinktofullsize) {
+                                    $ret .= '</a>';
+                }
+            } else {

                 $nophoto = '/public/theme/common/nophoto.png';

                 if (in_array($modulepart, array('userphoto', 'contact'))) { // For module that are "physical" users

                     $nophoto = '/public/theme/common/user_anonymous.png';

@@ -6781,8 +7113,9 @@ 
                 $ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput"' . ($capture ? ' capture="' . $capture . '"' : '') . '></td></tr>';

                 $ret .= '</table>';

             }

-        } else

-            dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);

+        } else {
+                    dol_print_error('', 'Call of showphoto with wrong parameters modulepart=' . $modulepart);
+        }
 

         return $ret;

     }

@@ -6809,14 +7142,17 @@ 
         global $conf, $user, $langs;

 

         // Permettre l'exclusion de groupes

-        if (is_array($exclude))

-            $excludeGroups = implode("','", $exclude);

+        if (is_array($exclude)) {
+                    $excludeGroups = implode("','", $exclude);
+        }
         // Permettre l'inclusion de groupes

-        if (is_array($include))

-            $includeGroups = implode("','", $include);

+        if (is_array($include)) {
+                    $includeGroups = implode("','", $include);
+        }
 

-        if (!is_array($selected))

-            $selected = array($selected);

+        if (!is_array($selected)) {
+                    $selected = array($selected);
+        }
 

         $out = '';

 

@@ -6828,18 +7164,20 @@ 
         $sql .= " FROM " . MAIN_DB_PREFIX . "usergroup as ug ";

         if (!empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && !$user->entity) {

             $sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "entity as e ON e.rowid=ug.entity";

-            if ($force_entity)

-                $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";

-            else

-                $sql .= " WHERE ug.entity IS NOT NULL";

-        }

-        else {

+            if ($force_entity) {
+                            $sql .= " WHERE ug.entity IN (0," . $force_entity . ")";
+            } else {
+                            $sql .= " WHERE ug.entity IS NOT NULL";
+            }
+        } else {

             $sql .= " WHERE ug.entity IN (0," . $conf->entity . ")";

         }

-        if (is_array($exclude) && $excludeGroups)

-            $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";

-        if (is_array($include) && $includeGroups)

-            $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";

+        if (is_array($exclude) && $excludeGroups) {
+                    $sql .= " AND ug.rowid NOT IN ('" . $excludeGroups . "')";
+        }
+        if (is_array($include) && $includeGroups) {
+                    $sql .= " AND ug.rowid IN ('" . $includeGroups . "')";
+        }
         $sql .= " ORDER BY ug.nom ASC";

 

         dol_syslog(get_class($this) . "::select_dolgroups", LOG_DEBUG);

@@ -6854,18 +7192,21 @@ 
             $num = $this->db->num_rows($resql);

             $i = 0;

             if ($num) {

-                if ($show_empty && !$multiple)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";

+                if ($show_empty && !$multiple) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '>&nbsp;</option>' . "\n";
+                }
 

                 while ($i < $num) {

                     $obj = $this->db->fetch_object($resql);

                     $disableline = 0;

-                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly))

-                        $disableline = 1;

+                    if (is_array($enableonly) && count($enableonly) && !in_array($obj->rowid, $enableonly)) {
+                                            $disableline = 1;
+                    }
 

                     $out .= '<option value="' . $obj->rowid . '"';

-                    if ($disableline)

-                        $out .= ' disabled';

+                    if ($disableline) {
+                                            $out .= ' disabled';
+                    }
                     if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && in_array($obj->rowid, $selected) )) {

                         $out .= ' selected';

                     }

@@ -6880,13 +7221,13 @@ 
                     $i++;

                 }

             } else {

-                if ($show_empty)

-                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";

+                if ($show_empty) {
+                                    $out .= '<option value="-1"' . (in_array(-1, $selected) ? ' selected' : '') . '></option>' . "\n";
+                }
                 $out .= '<option value="" disabled>' . $langs->trans("NoUserGroupDefined") . '</option>';

             }

             $out .= '</select>';

-        }

-        else {

+        } else {

             dol_print_error($this->db);

         }

 

@@ -6922,8 +7263,9 @@ 
         global $conf, $langs;

 

         $out = '';

-        if (!empty($conf->use_javascript_ajax))

-            $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';

+        if (!empty($conf->use_javascript_ajax)) {
+                    $out .= '<div class="inline-block checkallactions"><input type="checkbox" id="checkallactions" name="checkallactions" class="checkallactions"></div>';
+        }
         $out .= '<script type="text/javascript">

             $(document).ready(function() {

             	$("#checkallactions").click(function() {

@@ -6936,8 +7278,9 @@ 
                         console.log("We uncheck all");

                 		$(".' . $cssclass . '").prop(\'checked\', false).trigger(\'change\');

                     }' . "\n";

-        if ($calljsfunction)

-            $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';

+        if ($calljsfunction) {
+                    $out .= 'if (typeof initCheckForSelect == \'function\') { initCheckForSelect(0); } else { console.log("No function initCheckForSelect found. Call won\'t be done."); }';
+        }
         $out .= '         });

 

         	$(".checkforselect").change(function() {

@@ -6985,22 +7328,25 @@ 
 

         $sql = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'c_exp_tax_cat WHERE active = 1';

         $sql .= ' AND entity IN (0,' . getEntity('exp_tax_cat') . ')';

-        if (!empty($excludeid))

-            $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';

+        if (!empty($excludeid)) {
+                    $sql .= ' AND rowid NOT IN (' . implode(',', $excludeid) . ')';
+        }
         $sql .= ' ORDER BY label';

 

         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0">&nbsp;</option>';

+            if ($useempty) {
+                            $out .= '<option value="0">&nbsp;</option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . $langs->trans($obj->label) . '</option>';

             }

             $out .= '</select>';

-            if (!empty($htmlname) && $user->admin)

-                $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);

+            if (!empty($htmlname) && $user->admin) {
+                            $out .= ' ' . info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+            }
 

             if (!empty($target)) {

                 $sql = "SELECT c.id FROM " . MAIN_DB_PREFIX . "c_type_fees as c WHERE c.code = 'EX_KME' AND c.active = 1";

@@ -7013,8 +7359,9 @@ 
 								$("select[name=' . $target . ']").on("change", function() {

 									var current_val = $(this).val();

 									if (current_val == ' . $obj->id . ') {';

-                        if (!empty($default_selected) || !empty($selected))

-                            $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';

+                        if (!empty($default_selected) || !empty($selected)) {
+                                                    $out .= '$("select[name=' . $htmlname . ']").val("' . ($default_selected > 0 ? $default_selected : $selected) . '");';
+                        }
 

                         $out .= '

 										$("select[name=' . $htmlname . ']").change();

@@ -7050,8 +7397,7 @@ 
                     }

                 }

             }

-        }

-        else {

+        } else {

             dol_print_error($db);

         }

 

@@ -7076,8 +7422,9 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $out .= '<option ' . ($selected == $obj->rowid ? 'selected="selected"' : '') . ' value="' . $obj->rowid . '">' . price($obj->range_ik, 0, $langs, 1, 0) . '</option>';

@@ -7110,14 +7457,17 @@ 
         $resql = $db->query($sql);

         if ($resql) {

             $out = '<select id="select_' . $htmlname . '" name="' . $htmlname . '" class="' . $htmlname . ' flat minwidth75imp">';

-            if ($useempty)

-                $out .= '<option value="0"></option>';

-            if ($allchoice)

-                $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';

+            if ($useempty) {
+                            $out .= '<option value="0"></option>';
+            }
+            if ($allchoice) {
+                            $out .= '<option value="-1">' . $langs->trans('AllExpenseReport') . '</option>';
+            }
 

             $field = 'code';

-            if ($useid)

-                $field = 'id';

+            if ($useid) {
+                            $field = 'id';
+            }
 

             while ($obj = $db->fetch_object($resql)) {

                 $key = $langs->trans($obj->code);

dolibarr/htdocs/adherents/type.php

Spacing +105 added lines, -105 removed lines

@@ -28,12 +28,12 @@ 
  *      \brief      Member's type setup

  */

 

-require DOL_BASE_PATH . '/main.inc.php';

+require DOL_BASE_PATH.'/main.inc.php';

 

-require_once DOL_DOCUMENT_ROOT . '/core/lib/member.lib.php';

-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';

-require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';

-require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/lib/member.lib.php';

+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';

+require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';

+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';

 

 $langs->load("members");

 

@@ -101,7 +101,7 @@ 
     $action = '';

 

     if (!empty($backtopage)) {

-        header("Location: " . $backtopage);

+        header("Location: ".$backtopage);

         exit;

     }

 }

@@ -122,7 +122,7 @@ 
         $error++;

         setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');

     } else {

-        $sql = "SELECT libelle FROM " . MAIN_DB_PREFIX . "adherent_type WHERE libelle='" . $db->escape($object->label) . "'";

+        $sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";

         $result = $db->query($sql);

         if ($result) {

             $num = $db->num_rows($result);

@@ -137,7 +137,7 @@ 
     if (!$error) {

         $id = $object->create($user);

         if ($id > 0) {

-            header("Location: " . $_SERVER["PHP_SELF"]);

+            header("Location: ".$_SERVER["PHP_SELF"]);

             exit;

         } else {

             setEventMessages($object->error, $object->errors, 'errors');

@@ -173,7 +173,7 @@ 
     }

 

     //header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$object->id);

-    header("Location: " . $_SERVER["PHP_SELF"] . "&rowid=" . $object->id);

+    header("Location: ".$_SERVER["PHP_SELF"]."&rowid=".$object->id);

     exit;

 }

 

@@ -183,7 +183,7 @@ 
 

     if ($res > 0) {

         setEventMessages($langs->trans("MemberTypeDeleted"), null, 'mesgs');

-        header("Location: " . $_SERVER["PHP_SELF"]);

+        header("Location: ".$_SERVER["PHP_SELF"]);

         exit;

     } else {

         setEventMessages($langs->trans("MemberTypeCanNotBeDeleted"), null, 'errors');

@@ -206,8 +206,8 @@ 
     //dol_fiche_head('');

 

     $sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.vote";

-    $sql .= " FROM " . MAIN_DB_PREFIX . "adherent_type as d";

-    $sql .= " WHERE d.entity IN (" . getEntity('member_type') . ")";

+    $sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";

+    $sql .= " WHERE d.entity IN (".getEntity('member_type').")";

 

     $result = $db->query($sql);

     if ($result) {

@@ -220,35 +220,35 @@ 
 

         $newcardbutton = '';

         if ($user->rights->adherent->configurer) {

-            $newcardbutton = '<a class="butActionNew" href="' . DOL_URL_ROOT . '/adherents/type.php?action=create"><span class="valignmiddle">' . $langs->trans('NewMemberType') . '</span>';

+            $newcardbutton = '<a class="butActionNew" href="'.DOL_URL_ROOT.'/adherents/type.php?action=create"><span class="valignmiddle">'.$langs->trans('NewMemberType').'</span>';

             $newcardbutton .= '<span class="fa fa-plus-circle valignmiddle"></span>';

             $newcardbutton .= '</a>';

         }

 

         // print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-        print '<form method="POST" href="' . $_SERVER["PHP_SELF"] . '">';

+        print '<form method="POST" href="'.$_SERVER["PHP_SELF"].'">';

         if ($optioncss != '') {

-            print '<input type="hidden" name="optioncss" value="' . $optioncss . '">';

+            print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';

         }

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

         print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';

         print '<input type="hidden" name="action" value="list">';

-        print '<input type="hidden" name="sortfield" value="' . $sortfield . '">';

-        print '<input type="hidden" name="page" value="' . $page . '">';

-        print '<input type="hidden" name="sortorder" value="' . $sortorder . '">';

+        print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';

+        print '<input type="hidden" name="page" value="'.$page.'">';

+        print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';

 

         print_barre_liste($langs->trans("MembersTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_generic.png', 0, $newcardbutton, '', $limit);

 

         $moreforfilter = '';

 

         print '<div class="div-table-responsive">';

-        print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

+        print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

 

         print '<tr class="liste_titre">';

-        print '<th>' . $langs->trans("Ref") . '</th>';

-        print '<th>' . $langs->trans("Label") . '</th>';

-        print '<th align="center">' . $langs->trans("SubscriptionRequired") . '</th>';

-        print '<th align="center">' . $langs->trans("VoteAllowed") . '</th>';

+        print '<th>'.$langs->trans("Ref").'</th>';

+        print '<th>'.$langs->trans("Label").'</th>';

+        print '<th align="center">'.$langs->trans("SubscriptionRequired").'</th>';

+        print '<th align="center">'.$langs->trans("VoteAllowed").'</th>';

         print '<th>&nbsp;</th>';

         print "</tr>\n";

 

@@ -266,11 +266,11 @@ 
             print $membertype->getNomUrl(1);

             //<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>

             print '</td>';

-            print '<td>' . dol_escape_htmltag($objp->label) . '</td>';

-            print '<td align="center">' . yn($objp->subscription) . '</td>';

-            print '<td align="center">' . yn($objp->vote) . '</td>';

+            print '<td>'.dol_escape_htmltag($objp->label).'</td>';

+            print '<td align="center">'.yn($objp->subscription).'</td>';

+            print '<td align="center">'.yn($objp->vote).'</td>';

             if ($user->rights->adherent->configurer) {

-                print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=edit&rowid=' . $objp->rowid . '">' . img_edit() . '</a></td>';

+                print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=edit&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';

             } else

                 print '<td align="right">&nbsp;</td>';

             print "</tr>";

@@ -298,8 +298,8 @@ 
     print load_fiche_titre($langs->trans("NewMemberType"));

 

     //print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';

-    print '<form href="' . $_SERVER['PHP_SELF'] . '" method="POST">';

-    print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

+    print '<form href="'.$_SERVER['PHP_SELF'].'" method="POST">';

+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

     print '<input type="hidden" name="action" value="add">';

 

     dol_fiche_head('');

@@ -307,28 +307,28 @@ 
     print '<table class="border" width="100%">';

     print '<tbody>';

 

-    print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Label") . '</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';

+    print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';

 

-    print '<tr><td>' . $langs->trans("SubscriptionRequired") . '</td><td>';

+    print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';

     print $form->selectyesno("subscription", 1, 1);

     print '</td></tr>';

 

-    print '<tr><td>' . $langs->trans("VoteAllowed") . '</td><td>';

+    print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';

     print $form->selectyesno("vote", 0, 1);

     print '</td></tr>';

 

-    print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

+    print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

     print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';

 

-    print '<tr><td class="tdtop">' . $langs->trans("WelcomeEMail") . '</td><td>';

-    require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+    print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';

+    require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

     $doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');

     $doleditor->Create();

     print '</td></tr>';

 

     // Other attributes

     $parameters = array();

-    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action);    // Note that $action and $object may have been modified by hook

+    $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook

     print $hookmanager->resPrint;

     if (empty($reshook)) {

         print $object->showOptionals($extrafields, 'edit');

@@ -339,9 +339,9 @@ 
     dol_fiche_end();

 

     print '<div class="center">';

-    print '<input type="submit" name="button" class="button" value="' . $langs->trans("Add") . '">';

+    print '<input type="submit" name="button" class="button" value="'.$langs->trans("Add").'">';

     print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-    print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '" onclick="history.go(-1)" />';

+    print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'" onclick="history.go(-1)" />';

     print '</div>';

 

     print "</form>\n";

@@ -362,7 +362,7 @@ 
          * Confirmation suppression

          */

         if ($action == 'delete') {

-            print $form->formconfirm($_SERVER['PHP_SELF'] . "&rowid=" . $object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);

+            print $form->formconfirm($_SERVER['PHP_SELF']."&rowid=".$object->id, $langs->trans("DeleteAMemberType"), $langs->trans("ConfirmDeleteMemberType", $object->label), "confirm_delete", '', 0, 1);

         }

 

         $head = member_type_prepare_head($object);

@@ -370,7 +370,7 @@ 
         dol_fiche_head($head, 'card', $langs->trans("MemberType"), -1, 'group');

 

         //$linkback = '<a href="'.DOL_URL_ROOT.'/adherents/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

-        $linkback = '<a href="' . BASE_URI . '?controller=adherents&method=type&restore_lastsearch_values=1">' . $langs->trans("BackToList") . '</a>';

+        $linkback = '<a href="'.BASE_URI.'?controller=adherents&method=type&restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';

 

         dol_banner_tab($object, 'rowid', $linkback);

 

@@ -379,22 +379,22 @@ 
 

         print '<table class="border" width="100%">';

 

-        print '<tr><td class="titlefield">' . $langs->trans("SubscriptionRequired") . '</td><td>';

+        print '<tr><td class="titlefield">'.$langs->trans("SubscriptionRequired").'</td><td>';

         print yn($object->subscription);

         print '</tr>';

 

-        print '<tr><td>' . $langs->trans("VoteAllowed") . '</td><td>';

+        print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';

         print yn($object->vote);

         print '</tr>';

 

-        print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

-        print nl2br($object->note) . "</td></tr>";

+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

+        print nl2br($object->note)."</td></tr>";

 

-        print '<tr><td class="tdtop">' . $langs->trans("WelcomeEMail") . '</td><td>';

-        print nl2br($object->mail_valid) . "</td></tr>";

+        print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';

+        print nl2br($object->mail_valid)."</td></tr>";

 

         // Other attributes

-        include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';

+        include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';

 

         print '</table>';

         print '</div>';

@@ -409,15 +409,15 @@ 
 

         // Edit

         if ($user->rights->adherent->configurer) {

-            print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER['PHP_SELF'] . '&action=edit&amp;rowid=' . $object->id . '">' . $langs->trans("Modify") . '</a></div>';

+            print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'&action=edit&amp;rowid='.$object->id.'">'.$langs->trans("Modify").'</a></div>';

         }

 

         // Add

-        print '<div class="inline-block divButAction"><a class="butAction" href="card.php&action=create&typeid=' . $object->id . '&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '&rowid=' . $object->id) . '">' . $langs->trans("AddMember") . '</a></div>';

+        print '<div class="inline-block divButAction"><a class="butAction" href="card.php&action=create&typeid='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'&rowid='.$object->id).'">'.$langs->trans("AddMember").'</a></div>';

 

         // Delete

         if ($user->rights->adherent->configurer) {

-            print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '&action=delete&rowid=' . $object->id . '">' . $langs->trans("DeleteType") . '</a></div>';

+            print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'&action=delete&rowid='.$object->id.'">'.$langs->trans("DeleteType").'</a></div>';

         }

 

         print "</div>";

@@ -433,10 +433,10 @@ 
         $sql .= " d.datefin,";

         $sql .= " d.email, d.fk_adherent_type as type_id, d.morphy, d.statut,";

         $sql .= " t.libelle as type, t.subscription";

-        $sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "adherent_type as t";

+        $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."adherent_type as t";

         $sql .= " WHERE d.fk_adherent_type = t.rowid ";

-        $sql .= " AND d.entity IN (" . getEntity('adherent') . ")";

-        $sql .= " AND t.rowid = " . $object->id;

+        $sql .= " AND d.entity IN (".getEntity('adherent').")";

+        $sql .= " AND t.rowid = ".$object->id;

         if ($sall) {

             $sql .= natural_search(array("f.firstname", "d.lastname", "d.societe", "d.email", "d.login", "d.address", "d.town", "d.note_public", "d.note_private"), $sall);

         }

@@ -458,13 +458,13 @@ 
             $sql .= natural_search("d.email", $search_email);

         }

         if ($filter == 'uptodate') {

-            $sql .= " AND datefin >= '" . $db->idate($now) . "'";

+            $sql .= " AND datefin >= '".$db->idate($now)."'";

         }

         if ($filter == 'outofdate') {

-            $sql .= " AND datefin < '" . $db->idate($now) . "'";

+            $sql .= " AND datefin < '".$db->idate($now)."'";

         }

 

-        $sql .= " " . $db->order($sortfield, $sortorder);

+        $sql .= " ".$db->order($sortfield, $sortorder);

 

         // Count total nb of records

         $nbtotalofrecords = '';

@@ -480,7 +480,7 @@ 
             }

         }

 

-        $sql .= " " . $db->plimit($conf->liste_limit + 1, $offset);

+        $sql .= " ".$db->plimit($conf->liste_limit + 1, $offset);

 

         $resql = $db->query($sql);

         if ($resql) {

@@ -509,30 +509,30 @@ 
             if ($type > 0) {

                 $membertype = new AdherentType($db);

                 $result = $membertype->fetch($type);

-                $titre .= " (" . $membertype->label . ")";

+                $titre .= " (".$membertype->label.")";

             }

 

-            $param = "&rowid=" . $object->id;

+            $param = "&rowid=".$object->id;

             if (!empty($status))

-                $param .= "&status=" . $status;

+                $param .= "&status=".$status;

             if (!empty($search_lastname))

-                $param .= "&search_lastname=" . $search_lastname;

+                $param .= "&search_lastname=".$search_lastname;

             if (!empty($search_firstname))

-                $param .= "&search_firstname=" . $search_firstname;

+                $param .= "&search_firstname=".$search_firstname;

             if (!empty($search_login))

-                $param .= "&search_login=" . $search_login;

+                $param .= "&search_login=".$search_login;

             if (!empty($search_email))

-                $param .= "&search_email=" . $search_email;

+                $param .= "&search_email=".$search_email;

             if (!empty($filter))

-                $param .= "&filter=" . $filter;

+                $param .= "&filter=".$filter;

 

             if ($sall) {

-                print $langs->trans("Filter") . " (" . $langs->trans("Lastname") . ", " . $langs->trans("Firstname") . ", " . $langs->trans("EMail") . ", " . $langs->trans("Address") . " " . $langs->trans("or") . " " . $langs->trans("Town") . "): " . $sall;

+                print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("EMail").", ".$langs->trans("Address")." ".$langs->trans("or")." ".$langs->trans("Town")."): ".$sall;

             }

 

             //print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';

-            print '<form method="POST" href="' . $_SERVER["PHP_SELF"] . '">';

-            print '<input class="flat" type="hidden" name="rowid" value="' . $object->id . '" size="12"></td>';

+            print '<form method="POST" href="'.$_SERVER["PHP_SELF"].'">';

+            print '<input class="flat" type="hidden" name="rowid" value="'.$object->id.'" size="12"></td>';

 

             print '<br>';

             print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);

@@ -540,34 +540,34 @@ 
             $moreforfilter = '';

 

             print '<div class="div-table-responsive">';

-            print '<table class="tagtable liste' . ($moreforfilter ? " listwithfilterbefore" : "") . '">' . "\n";

+            print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";

 

             // Lignes des champs de filtre

             print '<tr class="liste_titre_filter">';

 

             print '<td class="liste_titre" align="left">';

-            print '<input class="flat" type="text" name="search_lastname" value="' . dol_escape_htmltag($search_lastname) . '" size="12"></td>';

+            print '<input class="flat" type="text" name="search_lastname" value="'.dol_escape_htmltag($search_lastname).'" size="12"></td>';

 

             print '<td class="liste_titre" align="left">';

-            print '<input class="flat" type="text" name="search_login" value="' . dol_escape_htmltag($search_login) . '" size="7"></td>';

+            print '<input class="flat" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'" size="7"></td>';

 

             print '<td class="liste_titre">&nbsp;</td>';

 

             print '<td class="liste_titre" align="left">';

-            print '<input class="flat" type="text" name="search_email" value="' . dol_escape_htmltag($search_email) . '" size="12"></td>';

+            print '<input class="flat" type="text" name="search_email" value="'.dol_escape_htmltag($search_email).'" size="12"></td>';

 

             print '<td class="liste_titre">&nbsp;</td>';

 

             print '<td align="right" colspan="2" class="liste_titre">';

-            print '<input type="image" class="liste_titre" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/search.png" name="button_search" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';

+            print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" name="button_search" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';

             print '&nbsp; ';

-            print '<input type="image" class="liste_titre" src="' . DOL_URL_ROOT . '/theme/' . $conf->theme . '/img/searchclear.png" name="button_removefilter" value="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '" title="' . dol_escape_htmltag($langs->trans("RemoveFilter")) . '">';

+            print '<input type="image" class="liste_titre" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/searchclear.png" name="button_removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';

             print '</td>';

 

             print "</tr>\n";

 

             print '<tr class="liste_titre">';

-            print_liste_field_titre($langs->trans("Name") . " / " . $langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);

+            print_liste_field_titre($langs->trans("Name")." / ".$langs->trans("Company"), $_SERVER["PHP_SELF"], "d.lastname", $param, "", "", $sortfield, $sortorder);

             print_liste_field_titre("Login", $_SERVER["PHP_SELF"], "d.login", $param, "", "", $sortfield, $sortorder);

             print_liste_field_titre("Nature", $_SERVER["PHP_SELF"], "d.morphy", $param, "", "", $sortfield, $sortorder);

             print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "d.email", $param, "", "", $sortfield, $sortorder);

@@ -589,14 +589,14 @@ 
                 print '<tr class="oddeven">';

                 if ($objp->societe != '') {

                     // print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,20).' / '.dol_trunc($objp->societe,12).'</a></td>'."\n";

-                    print '<td><a href="' . BASE_URI . '?controller=adherent&method=card&rowid=' . $objp->rowid . '">' . img_object($langs->trans("ShowMember"), "user") . ' ' . $adh->getFullName($langs, 0, -1, 20) . ' / ' . dol_trunc($objp->societe, 12) . '</a></td>' . "\n";

+                    print '<td><a href="'.BASE_URI.'?controller=adherent&method=card&rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->societe, 12).'</a></td>'."\n";

                 } else {

                     // print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"),"user").' '.$adh->getFullName($langs,0,-1,32).'</a></td>'."\n";

-                    print '<td><a href="' . BASE_URI . '?adherent&method=card&rowid=' . $objp->rowid . '">' . img_object($langs->trans("ShowMember"), "user") . ' ' . $adh->getFullName($langs, 0, -1, 32) . '</a></td>' . "\n";

+                    print '<td><a href="'.BASE_URI.'?adherent&method=card&rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user").' '.$adh->getFullName($langs, 0, -1, 32).'</a></td>'."\n";

                 }

 

                 // Login

-                print "<td>" . $objp->login . "</td>\n";

+                print "<td>".$objp->login."</td>\n";

 

                 // Type

                 /* print '<td class="nowrap">';

@@ -607,10 +607,10 @@ 
                  */

 

                 // Moral/Physique

-                print "<td>" . $adh->getmorphylib($objp->morphy) . "</td>\n";

+                print "<td>".$adh->getmorphylib($objp->morphy)."</td>\n";

 

                 // EMail

-                print "<td>" . dol_print_email($objp->email, 0, 0, 1) . "</td>\n";

+                print "<td>".dol_print_email($objp->email, 0, 0, 1)."</td>\n";

 

                 // Statut

                 print '<td class="nowrap">';

@@ -621,7 +621,7 @@ 
                 if ($datefin) {

                     print '<td align="center" class="nowrap">';

                     if ($datefin < dol_now() && $objp->statut > 0) {

-                        print dol_print_date($datefin, 'day') . " " . img_warning($langs->trans("SubscriptionLate"));

+                        print dol_print_date($datefin, 'day')." ".img_warning($langs->trans("SubscriptionLate"));

                     } else {

                         print dol_print_date($datefin, 'day');

                     }

@@ -631,7 +631,7 @@ 
                     if ($objp->subscription == 'yes') {

                         print $langs->trans("SubscriptionNotReceived");

                         if ($objp->statut > 0)

-                            print " " . img_warning();

+                            print " ".img_warning();

                     }

                     else {

                         print '&nbsp;';

@@ -643,12 +643,12 @@ 
                 print '<td align="center">';

                 if ($user->rights->adherent->creer) {

                     // print '<a href="card.php?rowid=' . $objp->rowid . '&action=edit&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?rowid=' . $object->id) . '">' . img_edit() . '</a>';

-                    print '<a href="' . BASE_URI . '?controller=adherent&method=card&rowid=' . $objp->rowid . '&action=edit&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '&rowid=' . $object->id) . '">' . img_edit() . '</a>';

+                    print '<a href="'.BASE_URI.'?controller=adherent&method=card&rowid='.$objp->rowid.'&action=edit&backtopage='.urlencode($_SERVER["PHP_SELF"].'&rowid='.$object->id).'">'.img_edit().'</a>';

                 }

                 print '&nbsp;';

                 if ($user->rights->adherent->supprimer) {

                     // print '<a href="card.php?rowid=' . $objp->rowid . '&action=resign">' . img_picto($langs->trans("Resiliate"), 'disable.png') . '</a>';

-                    print '<a href="' . BASE_URI . '?controller=adherent&method=card&rowid=' . $objp->rowid . '&action=resign">' . img_picto($langs->trans("Resiliate"), 'disable.png') . '</a>';

+                    print '<a href="'.BASE_URI.'?controller=adherent&method=card&rowid='.$objp->rowid.'&action=resign">'.img_picto($langs->trans("Resiliate"), 'disable.png').'</a>';

                 }

                 print "</td>";

 

@@ -682,39 +682,39 @@ 
         $head = member_type_prepare_head($object);

 

         //print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'">';

-        print '<form method="post" href="' . $_SERVER["PHP_SELF"] . '&rowid=' . $object->id . '">';

-        print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';

-        print '<input type="hidden" name="rowid" value="' . $object->id . '">';

+        print '<form method="post" href="'.$_SERVER["PHP_SELF"].'&rowid='.$object->id.'">';

+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

+        print '<input type="hidden" name="rowid" value="'.$object->id.'">';

         print '<input type="hidden" name="action" value="update">';

 

         dol_fiche_head($head, 'card', $langs->trans("MemberType"), 0, 'group');

 

         print '<table class="border" width="100%">';

 

-        print '<tr><td class="titlefield">' . $langs->trans("Ref") . '</td><td>' . $object->id . '</td></tr>';

+        print '<tr><td class="titlefield">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';

 

-        print '<tr><td class="fieldrequired">' . $langs->trans("Label") . '</td><td><input type="text" name="label" size="40" value="' . dol_escape_htmltag($object->label) . '"></td></tr>';

+        print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';

 

-        print '<tr><td>' . $langs->trans("SubscriptionRequired") . '</td><td>';

+        print '<tr><td>'.$langs->trans("SubscriptionRequired").'</td><td>';

         print $form->selectyesno("subscription", $object->subscription, 1);

         print '</td></tr>';

 

-        print '<tr><td>' . $langs->trans("VoteAllowed") . '</td><td>';

+        print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';

         print $form->selectyesno("vote", $object->vote, 1);

         print '</td></tr>';

 

-        print '<tr><td class="tdtop">' . $langs->trans("Description") . '</td><td>';

-        print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">' . $object->note . '</textarea></td></tr>';

+        print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';

+        print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';

 

-        print '<tr><td class="tdtop">' . $langs->trans("WelcomeEMail") . '</td><td>';

-        require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';

+        print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';

+        require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';

         $doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 280, 'dolibarr_notes', '', false, true, $conf->fckeditor->enabled, 15, '90%');

         $doleditor->Create();

         print "</td></tr>";

 

         // Other attributes

         $parameters = array();

-        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action);    // Note that $action and $object may have been modified by hook

+        $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook

         print $hookmanager->resPrint;

         if (empty($reshook)) {

             print $object->showOptionals($extrafields, 'edit');

@@ -726,17 +726,17 @@ 
         if (empty($reshook)) {

             print '<br><br><table class="border" width="100%">';

             foreach ($extrafields->attribute_label as $key => $label) {

-                if (isset($_POST["options_" . $key])) {

-                    if (is_array($_POST["options_" . $key])) {

+                if (isset($_POST["options_".$key])) {

+                    if (is_array($_POST["options_".$key])) {

                         // $_POST["options"] is an array but following code expects a comma separated string

-                        $value = implode(",", $_POST["options_" . $key]);

+                        $value = implode(",", $_POST["options_".$key]);

                     } else {

-                        $value = $_POST["options_" . $key];

+                        $value = $_POST["options_".$key];

                     }

                 } else {

-                    $value = $adht->array_options["options_" . $key];

+                    $value = $adht->array_options["options_".$key];

                 }

-                print '<tr><td width="30%">' . $label . '</td><td>';

+                print '<tr><td width="30%">'.$label.'</td><td>';

                 print $extrafields->showInputField($key, $value);

                 print "</td></tr>\n";

             }

@@ -746,9 +746,9 @@ 
         dol_fiche_end();

 

         print '<div class="center">';

-        print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';

+        print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';

         print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';

-        print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';

+        print '<input type="submit" name="cancel" class="button" value="'.$langs->trans("Cancel").'">';

         print '</div>';

 

         print "</form>";

Braces +37 added lines, -28 removed lines

@@ -115,8 +115,9 @@ 
 

     // Fill array 'array_options' with data from add form

     $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-    if ($ret < 0)

-        $error++;

+    if ($ret < 0) {
+            $error++;
+    }
 

     if (empty($object->label)) {

         $error++;

@@ -161,8 +162,9 @@ 
 

     // Fill array 'array_options' with data from add form

     $ret = $extrafields->setOptionalsFromPost($extralabels, $object);

-    if ($ret < 0)

-        $error++;

+    if ($ret < 0) {
+            $error++;
+    }
 

     $ret = $object->update($user);

 

@@ -271,8 +273,9 @@ 
             print '<td align="center">' . yn($objp->vote) . '</td>';

             if ($user->rights->adherent->configurer) {

                 print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=edit&rowid=' . $objp->rowid . '">' . img_edit() . '</a></td>';

-            } else

-                print '<td align="right">&nbsp;</td>';

+            } else {
+                            print '<td align="right">&nbsp;</td>';
+            }
             print "</tr>";

             $i++;

         }

@@ -280,8 +283,7 @@ 
         print '</div>';

 

         print '</form>';

-    }

-    else {

+    } else {

         dol_print_error($db);

     }

 }

@@ -470,10 +472,11 @@ 
         $nbtotalofrecords = '';

         if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {

             $resql = $db->query($sql);

-            if ($resql)

-                $nbtotalofrecords = $db->num_rows($result);

-            else

-                dol_print_error($db);

+            if ($resql) {
+                            $nbtotalofrecords = $db->num_rows($result);
+            } else {
+                            dol_print_error($db);
+            }
             if (($page * $limit) > $nbtotalofrecords) { // if total resultset is smaller then paging size (filtering), goto and load page 0

                 $page = 0;

                 $offset = 0;

@@ -513,18 +516,24 @@ 
             }

 

             $param = "&rowid=" . $object->id;

-            if (!empty($status))

-                $param .= "&status=" . $status;

-            if (!empty($search_lastname))

-                $param .= "&search_lastname=" . $search_lastname;

-            if (!empty($search_firstname))

-                $param .= "&search_firstname=" . $search_firstname;

-            if (!empty($search_login))

-                $param .= "&search_login=" . $search_login;

-            if (!empty($search_email))

-                $param .= "&search_email=" . $search_email;

-            if (!empty($filter))

-                $param .= "&filter=" . $filter;

+            if (!empty($status)) {
+                            $param .= "&status=" . $status;
+            }
+            if (!empty($search_lastname)) {
+                            $param .= "&search_lastname=" . $search_lastname;
+            }
+            if (!empty($search_firstname)) {
+                            $param .= "&search_firstname=" . $search_firstname;
+            }
+            if (!empty($search_login)) {
+                            $param .= "&search_login=" . $search_login;
+            }
+            if (!empty($search_email)) {
+                            $param .= "&search_email=" . $search_email;
+            }
+            if (!empty($filter)) {
+                            $param .= "&filter=" . $filter;
+            }
 

             if ($sall) {

                 print $langs->trans("Filter") . " (" . $langs->trans("Lastname") . ", " . $langs->trans("Firstname") . ", " . $langs->trans("EMail") . ", " . $langs->trans("Address") . " " . $langs->trans("or") . " " . $langs->trans("Town") . "): " . $sall;

@@ -630,10 +639,10 @@ 
                     print '<td align="left" class="nowrap">';

                     if ($objp->subscription == 'yes') {

                         print $langs->trans("SubscriptionNotReceived");

-                        if ($objp->statut > 0)

-                            print " " . img_warning();

-                    }

-                    else {

+                        if ($objp->statut > 0) {
+                                                    print " " . img_warning();
+                        }
+                    } else {

                         print '&nbsp;';

                     }

                     print '</td>';

dolibarr/htdocs/viewimage.php

Indentation +75 added lines, -75 removed lines

@@ -40,23 +40,23 @@ 
 // Note that only directory logo is free to access without login.

 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file']))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+    if (! defined("NOLOGIN"))		define("NOLOGIN",1);

+    if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

+    if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // For direct external download link, we don't need to load/check we are into a login session

 if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+    if (! defined("NOLOGIN"))		define("NOLOGIN",1);

+    if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

+    if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // Some value of modulepart can be used to get resources that are public so no login are required.

 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+    if (! defined("NOLOGIN"))		define("NOLOGIN",1);

+    if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

+    if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 

 // For multicompany

@@ -125,43 +125,43 @@ 
 // If we have a hash public (hashp), we guess the original_file.

 if (! empty($hashp))

 {

-	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-	$ecmfile=new EcmFiles($db);

-	$result = $ecmfile->fetch(0, '', '', '', $hashp);

-	if ($result > 0)

-	{

-		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory

-		// filepath can be 'users/X' or 'X/propale/PR11111'

-		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

-		{

-			$tmp = explode('/', $tmp[1], 2);

-		}

-		$moduleparttocheck = $tmp[0];	// moduleparttocheck is first part of path

-

-		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.

-		{

-			if ($moduleparttocheck == $modulepart)

-			{

-				// We remove first level of directory

-				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

-				//var_dump($original_file); exit;

-			}

-			else

-			{

-				accessforbidden('Bad link. File is from another module part.',0,0,1);

-			}

-		}

-		else

-		{

-			$modulepart = $moduleparttocheck;

-			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

-		}

-	}

-	else

-	{

-		$langs->load("errors");

-		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);

-	}

+    include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

+    $ecmfile=new EcmFiles($db);

+    $result = $ecmfile->fetch(0, '', '', '', $hashp);

+    if ($result > 0)

+    {

+        $tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory

+        // filepath can be 'users/X' or 'X/propale/PR11111'

+        if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

+        {

+            $tmp = explode('/', $tmp[1], 2);

+        }

+        $moduleparttocheck = $tmp[0];	// moduleparttocheck is first part of path

+

+        if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.

+        {

+            if ($moduleparttocheck == $modulepart)

+            {

+                // We remove first level of directory

+                $original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+                //var_dump($original_file); exit;

+            }

+            else

+            {

+                accessforbidden('Bad link. File is from another module part.',0,0,1);

+            }

+        }

+        else

+        {

+            $modulepart = $moduleparttocheck;

+            $original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+        }

+    }

+    else

+    {

+        $langs->load("errors");

+        accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);

+    }

 }

 

 // Define mime type

@@ -185,50 +185,50 @@ 
 

 if (! empty($hashp))

 {

-	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed

-	$sqlprotectagainstexternals = '';

+    $accessallowed = 1;					// When using hashp, link is public so we force $accessallowed

+    $sqlprotectagainstexternals = '';

 }

 else

 {

-	// Basic protection (against external users only)

-	if ($user->societe_id > 0)

-	{

-		if ($sqlprotectagainstexternals)

-		{

-			$resql = $db->query($sqlprotectagainstexternals);

-			if ($resql)

-			{

-				$num=$db->num_rows($resql);

-				$i=0;

-				while ($i < $num)

-				{

-					$obj = $db->fetch_object($resql);

-					if ($user->societe_id != $obj->fk_soc)

-					{

-						$accessallowed=0;

-						break;

-					}

-					$i++;

-				}

-			}

-		}

-	}

+    // Basic protection (against external users only)

+    if ($user->societe_id > 0)

+    {

+        if ($sqlprotectagainstexternals)

+        {

+            $resql = $db->query($sqlprotectagainstexternals);

+            if ($resql)

+            {

+                $num=$db->num_rows($resql);

+                $i=0;

+                while ($i < $num)

+                {

+                    $obj = $db->fetch_object($resql);

+                    if ($user->societe_id != $obj->fk_soc)

+                    {

+                        $accessallowed=0;

+                        break;

+                    }

+                    $i++;

+                }

+            }

+        }

+    }

 }

 

 // Security:

 // Limit access if permissions are wrong

 if (! $accessallowed)

 {

-	accessforbidden();

+    accessforbidden();

 }

 

 // Security:

 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.

 if (preg_match('/\.\./',$fullpath_original_file) || preg_match('/[<>|]/',$fullpath_original_file))

 {

-	dol_syslog("Refused to deliver file ".$fullpath_original_file);

-	print "ErrorFileNameInvalid: ".$original_file;

-	exit;

+    dol_syslog("Refused to deliver file ".$fullpath_original_file);

+    print "ErrorFileNameInvalid: ".$original_file;

+    exit;

 }

 

 

Spacing +65 added lines, -65 removed lines

@@ -28,39 +28,39 @@ 
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

-if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');

-if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');

-if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');

-if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');

-if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');

+if (!defined('NOREQUIRESOC'))		define('NOREQUIRESOC', '1');

+if (!defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN', '1');

+if (!defined('NOCSRFCHECK'))		define('NOCSRFCHECK', '1');

+if (!defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL', '1');

+if (!defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');

+if (!defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');

+if (!defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');

 

 // Some value of modulepart can be used to get resources that are public so no login are required.

 // Note that only directory logo is free to access without login.

 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file']))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);

+	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.

+	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // For direct external download link, we don't need to load/check we are into a login session

-if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))

+if (isset($_GET["hashp"]) && !defined("NOLOGIN"))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);

+	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.

+	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // Some value of modulepart can be used to get resources that are public so no login are required.

 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (!defined("NOLOGIN"))		define("NOLOGIN", 1);

+	if (!defined("NOCSRFCHECK"))	define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.

+	if (!defined("NOIPCHECK"))		define("NOIPCHECK", 1); // Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 

 // For multicompany

-$entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));

+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));

 if (is_numeric($entity)) define("DOLENTITY", $entity);

 

 /**

@@ -80,20 +80,20 @@ 
 {

 }

 

-require 'main.inc.php';	// Load $user and permissions

+require 'main.inc.php'; // Load $user and permissions

 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';

 

-$action=GETPOST('action','alpha');

-$original_file=GETPOST('file','alpha');		// Do not use urldecode here ($_GET are already decoded by PHP).

-$hashp=GETPOST('hashp','aZ09');

-$modulepart=GETPOST('modulepart','alpha');

-$urlsource=GETPOST('urlsource','alpha');

-$entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;

+$action = GETPOST('action', 'alpha');

+$original_file = GETPOST('file', 'alpha'); // Do not use urldecode here ($_GET are already decoded by PHP).

+$hashp = GETPOST('hashp', 'aZ09');

+$modulepart = GETPOST('modulepart', 'alpha');

+$urlsource = GETPOST('urlsource', 'alpha');

+$entity = GETPOST('entity', 'int') ?GETPOST('entity', 'int') : $conf->entity;

 

 // Security check

-if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);

-if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);

-if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility

+if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart', 0, 0, 1);

+if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (original_file or hashp)', 0, 0, 1);

+if ($modulepart == 'fckeditor') $modulepart = 'medias'; // For backward compatibility

 

 

 

@@ -109,71 +109,71 @@ 
  * View

  */

 

-if (GETPOST("cache",'alpha'))

+if (GETPOST("cache", 'alpha'))

 {

     // Important: Following code is to avoid page request by browser and PHP CPU at

     // each Dolibarr page access.

     if (empty($dolibarr_nocache))

     {

         header('Cache-Control: max-age=3600, public, must-revalidate');

-        header('Pragma: cache');       // This is to avoid having Pragma: no-cache

+        header('Pragma: cache'); // This is to avoid having Pragma: no-cache

     }

     else header('Cache-Control: no-cache');

     //print $dolibarr_nocache; exit;

 }

 

 // If we have a hash public (hashp), we guess the original_file.

-if (! empty($hashp))

+if (!empty($hashp))

 {

 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmfiles.class.php';

-	$ecmfile=new EcmFiles($db);

+	$ecmfile = new EcmFiles($db);

 	$result = $ecmfile->fetch(0, '', '', '', $hashp);

 	if ($result > 0)

 	{

-		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory

+		$tmp = explode('/', $ecmfile->filepath, 2); // $ecmfile->filepath is relative to document directory

 		// filepath can be 'users/X' or 'X/propale/PR11111'

 		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

 		{

 			$tmp = explode('/', $tmp[1], 2);

 		}

-		$moduleparttocheck = $tmp[0];	// moduleparttocheck is first part of path

+		$moduleparttocheck = $tmp[0]; // moduleparttocheck is first part of path

 

 		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.

 		{

 			if ($moduleparttocheck == $modulepart)

 			{

 				// We remove first level of directory

-				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+				$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 				//var_dump($original_file); exit;

 			}

 			else

 			{

-				accessforbidden('Bad link. File is from another module part.',0,0,1);

+				accessforbidden('Bad link. File is from another module part.', 0, 0, 1);

 			}

 		}

 		else

 		{

 			$modulepart = $moduleparttocheck;

-			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir

 		}

 	}

 	else

 	{

 		$langs->load("errors");

-		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);

+		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);

 	}

 }

 

 // Define mime type

 $type = 'application/octet-stream';

-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');

-else $type=dol_mimetype($original_file);

+if (GETPOST('type', 'alpha')) $type = GETPOST('type', 'alpha');

+else $type = dol_mimetype($original_file);

 

 // Security: Delete string ../ into $original_file

-$original_file = str_replace("../","/", $original_file);

+$original_file = str_replace("../", "/", $original_file);

 

 // Find the subdirectory name as the reference

-$refname=basename(dirname($original_file)."/");

+$refname = basename(dirname($original_file)."/");

 

 // Security check

 if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');

@@ -181,11 +181,11 @@ 
 $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);

 $accessallowed              = $check_access['accessallowed'];

 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];

-$fullpath_original_file     = $check_access['original_file'];               // $fullpath_original_file is now a full path name

+$fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name

 

-if (! empty($hashp))

+if (!empty($hashp))

 {

-	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed

+	$accessallowed = 1; // When using hashp, link is public so we force $accessallowed

 	$sqlprotectagainstexternals = '';

 }

 else

@@ -198,14 +198,14 @@ 
 			$resql = $db->query($sqlprotectagainstexternals);

 			if ($resql)

 			{

-				$num=$db->num_rows($resql);

-				$i=0;

+				$num = $db->num_rows($resql);

+				$i = 0;

 				while ($i < $num)

 				{

 					$obj = $db->fetch_object($resql);

 					if ($user->societe_id != $obj->fk_soc)

 					{

-						$accessallowed=0;

+						$accessallowed = 0;

 						break;

 					}

 					$i++;

@@ -217,14 +217,14 @@ 
 

 // Security:

 // Limit access if permissions are wrong

-if (! $accessallowed)

+if (!$accessallowed)

 {

 	accessforbidden();

 }

 

 // Security:

 // On interdit les remontees de repertoire ainsi que les pipe dans les noms de fichiers.

-if (preg_match('/\.\./',$fullpath_original_file) || preg_match('/[<>|]/',$fullpath_original_file))

+if (preg_match('/\.\./', $fullpath_original_file) || preg_match('/[<>|]/', $fullpath_original_file))

 {

 	dol_syslog("Refused to deliver file ".$fullpath_original_file);

 	print "ErrorFileNameInvalid: ".$original_file;

@@ -235,10 +235,10 @@ 
 

 if ($modulepart == 'barcode')

 {

-    $generator=GETPOST("generator","alpha");

-    $code=GETPOST("code",'none');							// This can be rich content (qrcode, datamatrix, ...)

-    $encoding=GETPOST("encoding","alpha");

-    $readable=GETPOST("readable",'alpha')?GETPOST("readable","alpha"):"Y";

+    $generator = GETPOST("generator", "alpha");

+    $code = GETPOST("code", 'none'); // This can be rich content (qrcode, datamatrix, ...)

+    $encoding = GETPOST("encoding", "alpha");

+    $readable = GETPOST("readable", 'alpha') ?GETPOST("readable", "alpha") : "Y";

 

     if (empty($generator) || empty($encoding))

     {

@@ -246,19 +246,19 @@ 
         exit;

     }

 

-    $dirbarcode=array_merge(array("/core/modules/barcode/doc/"),$conf->modules_parts['barcode']);

+    $dirbarcode = array_merge(array("/core/modules/barcode/doc/"), $conf->modules_parts['barcode']);

 

-    $result=0;

+    $result = 0;

 

-    foreach($dirbarcode as $reldir)

+    foreach ($dirbarcode as $reldir)

     {

-        $dir=dol_buildpath($reldir,0);

-        $newdir=dol_osencode($dir);

+        $dir = dol_buildpath($reldir, 0);

+        $newdir = dol_osencode($dir);

 

         // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)

-        if (! is_dir($newdir)) continue;

+        if (!is_dir($newdir)) continue;

 

-        $result=@include_once $newdir.$generator.'.modules.php';

+        $result = @include_once $newdir.$generator.'.modules.php';

         if ($result) break;

     }

 

@@ -267,7 +267,7 @@ 
     $module = new $classname($db);

     if ($module->encodingIsSupported($encoding))

     {

-        $result=$module->buildBarCode($code,$encoding,$readable);

+        $result = $module->buildBarCode($code, $encoding, $readable);

     }

 }

 else					// Open and return file

@@ -280,10 +280,10 @@ 
     dol_syslog("viewimage.php return file $fullpath_original_file filename=$filename content-type=$type");

 

     // This test is to avoid error images when image is not available (for example thumbs).

-    if (! dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))

+    if (!dol_is_file($fullpath_original_file) && empty($_GET["noalt"]))

     {

         // $fullpath_original_file=DOL_DOCUMENT_ROOT.'/public/theme/common/nophoto.png';

-        $fullpath_original_file = DOL_BASE_URI . '/public/theme/common/nophoto.png';

+        $fullpath_original_file = DOL_BASE_URI.'/public/theme/common/nophoto.png';

         /*$error='Error: File '.$_GET["file"].' does not exists or filesystems permissions are not allowed';

         print $error;

         exit;*/

@@ -301,7 +301,7 @@ 
         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

     }

 

-    $fullpath_original_file_osencoded=dol_osencode($fullpath_original_file);

+    $fullpath_original_file_osencoded = dol_osencode($fullpath_original_file);

 

     readfile($fullpath_original_file_osencoded);

 }

Braces +102 added lines, -44 removed lines

@@ -28,40 +28,80 @@ 
 

 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language

 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language

-if (! defined('NOREQUIRESOC'))		define('NOREQUIRESOC','1');

-if (! defined('NOREQUIRETRAN'))		define('NOREQUIRETRAN','1');

-if (! defined('NOCSRFCHECK'))		define('NOCSRFCHECK','1');

-if (! defined('NOTOKENRENEWAL'))	define('NOTOKENRENEWAL','1');

-if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU','1');

-if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML','1');

-if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX','1');

+if (! defined('NOREQUIRESOC')) {
+    define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+    define('NOREQUIRETRAN','1');
+}
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK','1');
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL','1');
+}
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+    define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+    define('NOREQUIREAJAX','1');
+}
 

 // Some value of modulepart can be used to get resources that are public so no login are required.

 // Note that only directory logo is free to access without login.

 if (isset($_GET["modulepart"]) && $_GET["modulepart"] == 'mycompany' && preg_match('/^\/?logos\//', $_GET['file']))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // For direct external download link, we don't need to load/check we are into a login session

 if (isset($_GET["hashp"]) && ! defined("NOLOGIN"))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 // Some value of modulepart can be used to get resources that are public so no login are required.

 if ((isset($_GET["modulepart"]) && $_GET["modulepart"] == 'medias'))

 {

-	if (! defined("NOLOGIN"))		define("NOLOGIN",1);

-	if (! defined("NOCSRFCHECK"))	define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.

-	if (! defined("NOIPCHECK"))		define("NOIPCHECK",1);		// Do not check IP defined into conf $dolibarr_main_restrict_ip

+	if (! defined("NOLOGIN")) {
+	    define("NOLOGIN",1);
+	}
+	if (! defined("NOCSRFCHECK")) {
+	    define("NOCSRFCHECK",1);
+	}
+	// We accept to go on this page from external web site.

+	if (! defined("NOIPCHECK")) {
+	    define("NOIPCHECK",1);
+	}
+	// Do not check IP defined into conf $dolibarr_main_restrict_ip

 }

 

 // For multicompany

 $entity=(! empty($_GET['entity']) ? (int) $_GET['entity'] : (! empty($_POST['entity']) ? (int) $_POST['entity'] : 1));

-if (is_numeric($entity)) define("DOLENTITY", $entity);

+if (is_numeric($entity)) {
+    define("DOLENTITY", $entity);
+}
 

 /**

  * Header empty

@@ -91,9 +131,16 @@ 
 $entity=GETPOST('entity','int')?GETPOST('entity','int'):$conf->entity;

 

 // Security check

-if (empty($modulepart) && empty($hashp)) accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);

-if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);

-if ($modulepart == 'fckeditor') $modulepart='medias';   // For backward compatibility

+if (empty($modulepart) && empty($hashp)) {
+    accessforbidden('Bad link. Bad value for parameter modulepart',0,0,1);
+}
+if (empty($original_file) && empty($hashp) && $modulepart != 'barcode') {
+    accessforbidden('Bad link. Missing identification to find file (original_file or hashp)',0,0,1);
+}
+if ($modulepart == 'fckeditor') {
+    $modulepart='medias';
+}
+// For backward compatibility

 

 

 

@@ -117,8 +164,9 @@ 
     {

         header('Cache-Control: max-age=3600, public, must-revalidate');

         header('Pragma: cache');       // This is to avoid having Pragma: no-cache

-    }

-    else header('Cache-Control: no-cache');

+    } else {
+        header('Cache-Control: no-cache');
+    }
     //print $dolibarr_nocache; exit;

 }

 

@@ -132,32 +180,34 @@ 
 	{

 		$tmp = explode('/', $ecmfile->filepath, 2);		// $ecmfile->filepath is relative to document directory

 		// filepath can be 'users/X' or 'X/propale/PR11111'

-		if (is_numeric($tmp[0])) // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

+		if (is_numeric($tmp[0])) {
+		    // If first tmp is numeric, it is subdir of company for multicompany, we take next part.

 		{

-			$tmp = explode('/', $tmp[1], 2);

+			$tmp = explode('/', $tmp[1], 2);
+		}
 		}

 		$moduleparttocheck = $tmp[0];	// moduleparttocheck is first part of path

 

-		if ($modulepart)	// Not required, so often not defined, for link using public hashp parameter.

+		if ($modulepart) {
+		    // Not required, so often not defined, for link using public hashp parameter.

 		{

 			if ($moduleparttocheck == $modulepart)

 			{

 				// We remove first level of directory

-				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

+				$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);
+		}
+		// this is relative to module dir

 				//var_dump($original_file); exit;

-			}

-			else

+			} else

 			{

 				accessforbidden('Bad link. File is from another module part.',0,0,1);

 			}

-		}

-		else

+		} else

 		{

 			$modulepart = $moduleparttocheck;

 			$original_file = (($tmp[1]?$tmp[1].'/':'').$ecmfile->filename);		// this is relative to module dir

 		}

-	}

-	else

+	} else

 	{

 		$langs->load("errors");

 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"),0,0,1);

@@ -166,8 +216,11 @@ 
 

 // Define mime type

 $type = 'application/octet-stream';

-if (GETPOST('type','alpha')) $type=GETPOST('type','alpha');

-else $type=dol_mimetype($original_file);

+if (GETPOST('type','alpha')) {
+    $type=GETPOST('type','alpha');
+} else {
+    $type=dol_mimetype($original_file);
+}
 

 // Security: Delete string ../ into $original_file

 $original_file = str_replace("../","/", $original_file);

@@ -176,7 +229,9 @@ 
 $refname=basename(dirname($original_file)."/");

 

 // Security check

-if (empty($modulepart)) accessforbidden('Bad value for parameter modulepart');

+if (empty($modulepart)) {
+    accessforbidden('Bad value for parameter modulepart');
+}
 

 $check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);

 $accessallowed              = $check_access['accessallowed'];

@@ -187,8 +242,7 @@ 
 {

 	$accessallowed = 1;					// When using hashp, link is public so we force $accessallowed

 	$sqlprotectagainstexternals = '';

-}

-else

+} else

 {

 	// Basic protection (against external users only)

 	if ($user->societe_id > 0)

@@ -256,10 +310,14 @@ 
         $newdir=dol_osencode($dir);

 

         // Check if directory exists (we do not use dol_is_dir to avoid loading files.lib.php)

-        if (! is_dir($newdir)) continue;

+        if (! is_dir($newdir)) {
+            continue;
+        }
 

         $result=@include_once $newdir.$generator.'.modules.php';

-        if ($result) break;

+        if ($result) {
+            break;
+        }
     }

 

     // Load barcode class

@@ -269,8 +327,7 @@ 
     {

         $result=$module->buildBarCode($code,$encoding,$readable);

     }

-}

-else					// Open and return file

+} else					// Open and return file

 {

     clearstatcache();

 

@@ -294,8 +351,7 @@ 
     {

         top_httphead($type);

         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

-    }

-    else

+    } else

     {

         top_httphead('image/png');

         header('Content-Disposition: inline; filename="'.basename($fullpath_original_file).'"');

@@ -307,4 +363,6 @@ 
 }

 

 

-if (is_object($db)) $db->close();

+if (is_object($db)) {
+    $db->close();
+}