lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix delete of documents generated on project.

Browse Source 
Fix missin translation
This commit is contained in:
Laurent Destailleur 2016-07-01 17:49:13 +02:00
parent e557502504
commit 59f86a12d2
4 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/commande/card.php
View File

@ -1195,9 +1195,9 @@ if (empty($reshook))
$file = $upload_dir . '/' . GETPOST('file'); $file = $upload_dir . '/' . GETPOST('file');
$ret = dol_delete_file($file, 0, 0, 0, $object); $ret = dol_delete_file($file, 0, 0, 0, $object);
if ($ret) if ($ret)
setEventMessages($langs->trans("FileWasRemoved", GETPOST('urlfile')), null, 'mesgs'); setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
else else
setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), null, 'errors'); setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
$action = ''; $action = '';
} }
} }

6
htdocs/core/class/html.formprojet.class.php
View File

@ -464,12 +464,14 @@ class FormProjets
$sql = "SELECT t.id as rowid, t.label as ref"; $sql = "SELECT t.id as rowid, t.label as ref";
$projectkey="fk_project"; $projectkey="fk_project";
break; break;
case "expensereport_det": case "expensereport":
return ''; return '';
case "expensereport_det":
/*$sql = "SELECT rowid, '' as ref"; // table is llx_expensereport_det /*$sql = "SELECT rowid, '' as ref"; // table is llx_expensereport_det
$projectkey="fk_projet"; $projectkey="fk_projet";
break;*/ break;*/
case "commande": return '';
case "commande":
case "contrat": case "contrat":
case "fichinter": case "fichinter":
$sql = "SELECT t.rowid, t.ref"; $sql = "SELECT t.rowid, t.ref";

4
htdocs/core/modules/project/doc/pdf_beluga.modules.php
View File

@ -294,7 +294,7 @@ class pdf_beluga extends ModelePDFProjects
'lang'=>'interventions'), 'lang'=>'interventions'),
'trip'=>array( 'trip'=>array(
'name'=>"TripsAndExpenses", 'name'=>"TripsAndExpenses",
'title'=>"ListTripAssociatedProject", 'title'=>"ListExpenseReportsAssociatedProject",
'class'=>'Deplacement', 'class'=>'Deplacement',
'table'=>'deplacement', 'table'=>'deplacement',
'datefieldname'=>'dated', 'datefieldname'=>'dated',
@ -304,7 +304,7 @@ class pdf_beluga extends ModelePDFProjects
'lang'=>'trip'), 'lang'=>'trip'),
'expensereport'=>array( 'expensereport'=>array(
'name'=>"ExpensesReports", 'name'=>"ExpensesReports",
'title'=>"ListTripAssociatedProject", 'title'=>"ListExpenseReportsAssociatedProject",
'class'=>'ExpenseReport', 'class'=>'ExpenseReport',
'table'=>'expensereport', 'table'=>'expensereport',
'datefieldname'=>'dated', 'datefieldname'=>'dated',

20
htdocs/projet/card.php
View File

@ -307,17 +307,19 @@ if (empty($reshook))
// Delete file in doc form // Delete file in doc form
if ($action == 'remove_file' && $user->rights->projet->creer) if ($action == 'remove_file' && $user->rights->projet->creer)
{ {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
if ($object->id > 0) if ($object->id > 0)
{ {
$langs->load("other"); require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$upload_dir = $conf->projet->dir_output . "/";
$urlfile=GETPOST('urlfile','alpha'); $langs->load("other");
$file = $upload_dir . '/' . $filetodelete; $upload_dir = $conf->projet->dir_output;
$ret=dol_delete_file($file); $file = $upload_dir . '/' . GETPOST('file');
if ($ret) setEventMessages($langs->trans("FileWasRemoved", $urlfile), null, 'mesgs'); $ret = dol_delete_file($file, 0, 0, 0, $object);
else setEventMessages($langs->trans("ErrorFailToDeleteFile", $urlfile), null, 'errors'); if ($ret)
setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
else
setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('file')), null, 'errors');
$action = '';
} }
} }