";
}
else dol_print_error($db);
}
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ba1520e9a81..74ea44c84e7 100644
--- a/htdocs/core/class/html.formfile.class.php
+++ b/htdocs/core/class/html.formfile.class.php
@@ -586,7 +586,7 @@ class FormFile
}
}
- // Set headershown to avoit to have table opened a second time later
+ // Set headershown to avoid to have table opened a second time later
$headershown=1;
$buttonlabeltoshow=$buttonlabel;
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 3fc40ab8af6..8f2fb50b0dc 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -3800,7 +3800,8 @@ function print_barre_liste($titre, $page, $file, $options='', $sortfield='', $so
{
if ($totalnboflines) // If we know total nb of lines
{
- $maxnbofpage=(empty($conf->dol_optimize_smallscreen) ? 4 : 1); // page nb before and after selected page + ... + first or last
+ // 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;
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index e21db6a1dd1..f0e279bb848 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -265,6 +265,7 @@ if (! empty($conf->deplacement->enabled) && $user->rights->deplacement->lire)
$i = 0;
+ print '
';
}
else dol_print_error($db);
}
diff --git a/htdocs/langs/en_US/ecm.lang b/htdocs/langs/en_US/ecm.lang
index 95318155813..fe5600004ed 100644
--- a/htdocs/langs/en_US/ecm.lang
+++ b/htdocs/langs/en_US/ecm.lang
@@ -41,7 +41,7 @@ ConfirmDeleteSection=Can you confirm you want to delete the directory %s?
ECMDirectoryForFiles=Relative directory for files
CannotRemoveDirectoryContainsFiles=Removed not possible because it contains some files
ECMFileManager=File manager
-ECMSelectASection=Select a directory on left tree...
+ECMSelectASection=Select a directory in the tree...
DirNotSynchronizedSyncFirst=This directory seems to be created or modified outside ECM module. You must click on "Resync" button first to synchronize disk and database to get content of this directory.
ReSyncListOfDir=Resync list of directories
HashOfFileContent=Hash of file content
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index fb9b9672015..ebb2c0a421a 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -269,7 +269,6 @@ else
$sql.= ' p.fk_product_type, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,';
$sql.= ' p.tobatch, p.accountancy_code_sell, p.accountancy_code_buy,';
$sql.= ' p.datec as date_creation, p.tms as date_update, p.pmp,';
- //$sql.= ' pfp.ref_fourn as ref_supplier, ';
$sql.= ' MIN(pfp.unitprice) as minsellprice';
if (!empty($conf->variants->enabled) && $search_hidechildproducts && ($search_type === 0)) {
$sql .= ', pac.rowid prod_comb_id';
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 67abb030b09..a4b1b6eb8a7 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1018,13 +1018,13 @@ else
print '