diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php index e67b18a598982f7b87cfc2c14a314132357202fa..f3240443a6eae462152b37cbffba0eebb583aadf 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 f160e4cd5007701f59c4aebb6811704be96eec4f..d2ad0a6f1ab307ba3d0b17e66c68328ca1b77d9e 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 37c228607e15c63595768fa904cf0f6115bb4272..2b58cd59c09a30abddd91734cb825b5686e7ac4d 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 ed3311a1b3042429b22eb35f1648a72233b36011..d3895b0000ede1cf157871db70efb44202249d58 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 = ''; } }