From ccf809b14aca83272451863534d767dc80291df1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis.houssin@capnetworks.com>
Date: Mon, 22 Apr 2013 15:09:19 +0200
Subject: [PATCH] Fix: broken features
---
htdocs/compta/sociales/class/chargesociales.class.php | 2 +-
htdocs/compta/sociales/document.php | 4 ++--
htdocs/core/class/fileupload.class.php | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 6fbd0a23143..f62b2fcc594 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
*/
class ChargeSociales extends CommonObject
{
- public $element='rowid';
+ public $element='chargesociales';
public $table='chargesociales';
public $table_element='chargesociales';
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index dcb082b41d7..452de21285a 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -79,7 +79,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
if ($action == 'delete')
{
$file = $upload_dir . '/' . GETPOST("urlfile"); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
- $ret=dol_delete_file($file);
+ $ret=dol_delete_file($file,0,0,0,$object);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
}
@@ -172,7 +172,7 @@ if ($object->id)
// Affiche formulaire upload
$formfile=new FormFile($db);
- $formfile->form_attach_new_file(DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id,'',0,0,$user->rights->tax->charges->creer);
+ $formfile->form_attach_new_file(DOL_URL_ROOT.'/compta/sociales/document.php?id='.$object->id,'',0,0,$user->rights->tax->charges->creer,50,$object);
// List of document
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index a86073e6969..6bb5b9209d1 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -94,6 +94,10 @@ class FileUpload
elseif ($element == 'action') {
$pathname = 'comm/action'; $filename='actioncomm';
$dir_output=$conf->agenda->dir_output;
+ }
+ elseif ($element == 'chargesociales') {
+ $pathname = 'compta/sociales'; $filename='chargesociales';
+ $dir_output=$conf->tax->dir_output;
} else {
$dir_output=$conf->$element->dir_output;
}
--
GitLab