diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index a9140c46dd0..4b024175423 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -259,8 +259,7 @@ if (! empty($conf->margin->enabled))
/* Init field buying_price and fournprice */
$.post('/fourn/ajax/getSupplierPrices.php', {'idprod': fk_product?$line->fk_product:0; ?>}, function(data) {
- console.log(data);
- if (data && data.length > 0) {
+ if (data && data.length > 0) {
var options = '';
var trouve=false;
$(data).each(function() {
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index f5d67b13517..c350fb003e6 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -282,7 +282,7 @@ print "\n";
// FILTRES
print '
';
print '
';
-print '';
+print '';
print '
';
// DATE CREATE
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index ec66ef973f5..5f2d3eba8c6 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -339,7 +339,7 @@ MinLength=Minimum length
LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
ExamplesWithCurrentSetup=Examples with current running setup
ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.
Put here full path of directories. Add a carriage return between eah directory. To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt.
+ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.
Put here full path of directories. Add a carriage return between eah directory. To add a directory of the GED module, add here DOL_DATA_ROOT/ecm/yourdirectoryname.
Files in those directories must end with .odt or .ods.
NumberOfModelFilesFound=Number of ODT/ODS templates files found in those directories
ExampleOfDirectoriesForModelGen=Examples of syntax: c:\mydir /home/mydir DOL_DATA_ROOT/ecm/ecmdir
FollowingSubstitutionKeysCanBeUsed= To know how to create your odt document templates, before storing them in those directories, read wiki documentation:
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 49923afa2ea..24968839960 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -310,10 +310,11 @@ if (empty($reshook))
{
$langs->load("other");
$upload_dir = $conf->projet->dir_output . "/";
- $file = $upload_dir . '/' . GETPOST('file');
+ $urlfile=GETPOST('urlfile','alpha');
+ $file = $upload_dir . '/' . $filetodelete;
$ret=dol_delete_file($file);
- if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
- else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
+ if ($ret) setEventMessage($langs->trans("FileWasRemoved", $urlfile));
+ else setEventMessage($langs->trans("ErrorFailToDeleteFile", $urlfile), 'errors');
}
}