Skip to content
Snippets Groups Projects
Commit 59f86a12 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix delete of documents generated on project.

Fix missin translation
parent e5575025
No related branches found
No related tags found
No related merge requests found
......@@ -1195,9 +1195,9 @@ if (empty($reshook))
$file = $upload_dir . '/' . GETPOST('file');
$ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret)
setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs');
setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
else
setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors');
setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
$action = '';
}
}
......
......@@ -464,11 +464,13 @@ class FormProjets
$sql = "SELECT t.id as rowid, t.label as ref";
$projectkey="fk_project";
break;
case "expensereport_det":
case "expensereport":
return '';
case "expensereport_det":
/*$sql = "SELECT rowid, '' as ref"; // table is llx_expensereport_det
$projectkey="fk_projet";
break;*/
return '';
case "commande":
case "contrat":
case "fichinter":
......
......@@ -294,7 +294,7 @@ class pdf_beluga extends ModelePDFProjects
'lang'=>'interventions'),
'trip'=>array(
'name'=>"TripsAndExpenses",
'title'=>"ListTripAssociatedProject",
'title'=>"ListExpenseReportsAssociatedProject",
'class'=>'Deplacement',
'table'=>'deplacement',
'datefieldname'=>'dated',
......@@ -304,7 +304,7 @@ class pdf_beluga extends ModelePDFProjects
'lang'=>'trip'),
'expensereport'=>array(
'name'=>"ExpensesReports",
'title'=>"ListTripAssociatedProject",
'title'=>"ListExpenseReportsAssociatedProject",
'class'=>'ExpenseReport',
'table'=>'expensereport',
'datefieldname'=>'dated',
......
......@@ -307,17 +307,19 @@ if (empty($reshook))
// Delete file in doc form
if ($action == 'remove_file' && $user->rights->projet->creer)
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if ($object->id > 0)
{
require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$langs->load("other");
$upload_dir = $conf->projet->dir_output . "/";
$urlfile=GETPOST('urlfile','alpha');
$file = $upload_dir . '/' . $filetodelete;
$ret=dol_delete_file($file);
if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs');
else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors');
$upload_dir = $conf->projet->dir_output;
$file = $upload_dir . '/' . GETPOST('file');
$ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret)
setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
else
setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
$action = '';
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment