From 59f86a12d216a007419eba0a0c0f8f3c65378ca6 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 1 Jul 2016 17:49:13 +0200
Subject: [PATCH] Fix delete of documents generated on project. Fix missin
translation
---
htdocs/commande/card.php | 4 ++--
htdocs/core/class/html.formprojet.class.php | 6 ++++--
.../project/doc/pdf_beluga.modules.php | 4 ++--
htdocs/projet/card.php | 20 ++++++++++---------
4 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e67b18a5989..f3240443a6e 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -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 = '';
}
}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index f160e4cd500..d2ad0a6f1ab 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -464,12 +464,14 @@ 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;*/
- case "commande":
+ return '';
+ case "commande":
case "contrat":
case "fichinter":
$sql = "SELECT t.rowid, t.ref";
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index 37c228607e1..2b58cd59c09 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -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',
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index ed3311a1b30..d3895b0000e 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -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)
{
- $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');
+ require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+ $langs->load("other");
+ $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 = '';
}
}
--
GitLab