diff --git a/ChangeLog b/ChangeLog index 5f2520ec3f3..95585a1153d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ English Dolibarr ChangeLog ***** ChangeLog for 3.0 compared to 2.9 ***** For users: +- New: Task #10553 : Can attach files on members card. - New: Can filter on payment type and bank account in payment lists. - New: When sending supplier orders by mail, a text is predefined. - New: Upgrade process works with Postgresql. diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 7ab25dd2f20..d065a4fa833 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -63,7 +63,6 @@ if ($user->rights->adherent->cotisation->creer && $_POST["action"] == 'cotisatio { $langs->load("banks"); - $adh->id = $rowid; $result=$adh->fetch($rowid); $result=$adht->fetch($adh->typeid); diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php new file mode 100644 index 00000000000..8da7a68ad09 --- /dev/null +++ b/htdocs/adherents/document.php @@ -0,0 +1,224 @@ + + * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2005-2007 Regis Houssin + * Copyright (C) 2010 Juanjo Menent + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** + * \file htdocs/adherents/document.php + * \brief Tab for documents linked to third party + * \ingroup societe + * \version $Id$ + */ + +require("../main.inc.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/member.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); +require_once(DOL_DOCUMENT_ROOT."/core/class/html.formfile.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); + +$langs->load("companies"); +$langs->load('other'); + +$mesg = ""; + +// Security check +$id = GETPOST('id'); +if ($user->societe_id > 0) +{ + $id = $user->societe_id; +} +//$result = restrictedArea($user, 'societe', $id); + +// Get parameters +$page=$_GET["page"]; +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; + +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="name"; +if ($page == -1) { $page = 0 ; } +$offset = $conf->liste_limit * $page ; +$pageprev = $page - 1; +$pagenext = $page + 1; + +$sortorder=$_GET["sortorder"]; +$sortfield=$_GET["sortfield"]; +if (! $sortorder) $sortorder="ASC"; +if (! $sortfield) $sortfield="name"; + +$upload_dir = $conf->adherent->dir_output . "/" . get_exdir($id,2,0,1); + + + +/* + * Actions + */ + +// Envoie fichier +if ( $_POST["sendit"] && ! empty($conf->global->MAIN_UPLOAD_DOC)) +{ + require_once(DOL_DOCUMENT_ROOT."/lib/files.lib.php"); + + if (create_exdir($upload_dir) >= 0) + { + $resupload=dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . $_FILES['userfile']['name'],0,0,$_FILES['userfile']['error']); + if (is_numeric($resupload) && $resupload > 0) + { + $mesg = '
'.$langs->trans("FileTransferComplete").'
'; + } + else + { + $langs->load("errors"); + if ($resupload < 0) // Unknown error + { + $mesg = '
'.$langs->trans("ErrorFileNotUploaded").'
'; + } + else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) // Files infected by a virus + { + $mesg = '
'.$langs->trans("ErrorFileIsInfectedWithAVirus").'
'; + } + else // Known error + { + $mesg = '
'.$langs->trans($resupload).'
'; + } + } + } +} + +// Suppression fichier +if ($_REQUEST['action'] == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes') +{ + $file = $upload_dir . "/" . $_GET['urlfile']; // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). + dol_delete_file($file); + $mesg = '
'.$langs->trans("FileWasRemoved").'
'; +} + + +/* + * View + */ + +$form = new Form($db); +$member=new Adherent($db); +$membert=new AdherentType($db); + +llxHeader(); + +if ($id > 0) +{ + $result=$member->fetch($id); + $result=$membert->fetch($member->typeid); + if ($result > 0) + { + /* + * Affichage onglets + */ + if ($conf->notification->enabled) $langs->load("mails"); + $head = member_prepare_head($member); + + $html=new Form($db); + + dol_fiche_head($head, 'document', $langs->trans("Member"),0,'user'); + + + // Construit liste des fichiers + $filearray=dol_dir_list($upload_dir,"files",0,'','\.meta$',$sortfield,(strtolower($sortorder)=='desc'?SORT_ASC:SORT_DESC),1); + $totalsize=0; + foreach($filearray as $key => $file) + { + $totalsize+=$file['size']; + } + + + print ''; + + // Ref + print ''; + print ''; + + // Nom + print ''; + print ''; + + // Prenom + print ''; + print ''; + + // Login + print ''; + + // Type + print '\n"; + + // Status + print ''; + + // Nbre fichiers + print ''; + + //Total taille + print ''; + + print '
'.$langs->trans("Ref").''; + print $html->showrefnav($member,'rowid'); + print '
'.$langs->trans("Lastname").''.$member->nom.' 
'.$langs->trans("Firstname").''.$member->prenom.' 
'.$langs->trans("Login").''.$member->login.' 
'.$langs->trans("Type").''.$membert->getNomUrl(1)."
'.$langs->trans("Status").''.$member->getLibStatut(4).'
'.$langs->trans("NbOfAttachedFiles").''.sizeof($filearray).'
'.$langs->trans("TotalSizeOfAttachedFiles").''.$totalsize.' '.$langs->trans("bytes").'
'; + + print ''; + + if ($mesg) { print "$mesg
"; } + + /* + * Confirmation suppression fichier + */ + if ($_GET['action'] == 'delete') + { + $ret=$html->form_confirm($_SERVER["PHP_SELF"].'?id='.$_GET["id"].'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', 0, 1); + if ($ret == 'html') print '
'; + } + + + // Affiche formulaire upload + $formfile=new FormFile($db); + $formfile->form_attach_new_file(DOL_URL_ROOT.'/adherents/document.php?id='.$id,'',0,0,$user->rights->adherent->creer); + + + // List of document + $param='&socid='.$societe->id; + $formfile->list_of_documents($filearray,$member,'member',$param); + + print "

"; + } + else + { + dol_print_error($db); + } +} +else +{ + $langs->load("errors"); + print $langs->trans("ErrorRecordNotFound"); +} + +$db->close(); + + +llxFooter('$Date$ - $Revision$'); + +?> diff --git a/htdocs/adherents/fiche.php b/htdocs/adherents/fiche.php index 5736dfa240a..989593987de 100644 --- a/htdocs/adherents/fiche.php +++ b/htdocs/adherents/fiche.php @@ -289,7 +289,7 @@ if ($_REQUEST["action"] == 'update' && ! $_POST["cancel"] && $user->rights->adhe { if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) { - $dir= $conf->adherent->dir_output . '/' . get_exdir($adh->id,2,0,1); + $dir= $conf->adherent->dir_output . '/' . get_exdir($adh->id,2,0,1).'/photos/'; create_exdir($dir); diff --git a/htdocs/adherents/note.php b/htdocs/adherents/note.php index d05fbc63563..161c258fc77 100644 --- a/htdocs/adherents/note.php +++ b/htdocs/adherents/note.php @@ -27,6 +27,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT.'/lib/member.lib.php'); require_once(DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php'); +require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent_type.class.php"); $action=isset($_GET["action"])?$_GET["action"]:(isset($_POST["action"])?$_POST["action"]:""); $id=isset($_GET["id"])?$_GET["id"]:(isset($_POST["id"])?$_POST["id"]:""); @@ -39,8 +40,12 @@ if (!$user->rights->adherent->lire) accessforbidden(); $adh = new Adherent($db); -$adh->id = $id; -$adh->fetch($id); +$result=$adh->fetch($id); +if ($result > 0) +{ + $adht = new AdherentType($db); + $result=$adht->fetch($adh->typeid); +} /******************************************************************************/ @@ -103,7 +108,13 @@ if ($id) // Login print ''.$langs->trans("Login").''.$adh->login.' '; - // Note + // Type + print ''.$langs->trans("Type").''.$adht->getNomUrl(1)."\n"; + + // Status + print ''.$langs->trans("Status").''.$adh->getLibStatut(4).''; + + // Note print ''.$langs->trans("Note").''; print ''; if ($action == 'edit' && $user->rights->adherent->creer) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index a38f534dca2..c407281be35 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -3143,7 +3143,7 @@ class Form if ($modulepart=='memberphoto') { $dir=$conf->adherent->dir_output; - $file=get_exdir($object->id,2).$object->photo; + $file=get_exdir($object->id,2).'photos/'.$object->photo; $altfile=$object->id.".jpg"; // For backward compatibility $email=$object->email; } diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 62809091b9b..74223873f45 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -2746,12 +2746,13 @@ function yn($yesno, $case=1, $color=0) /** - * \brief Return a path to class a directory according to an id - * \param $num Id to develop - * \param $level Level of development (1, 2 or 3 level) - * \param $alpha Use alpha ref - * \remarks Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/" - * \remarks Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/" + * \brief Return a path to have a directory according to an id + * \param $num Id to develop + * \param $level Level of development (1, 2 or 3 level) + * \param $alpha Use alpha ref + * \param withoutslash 0=With slash at end, 1=without slash at end + * \remarks Examples: '001' with level 3->"0/0/1/", '015' with level 3->"0/1/5/" + * \remarks Examples: 'ABC-1' with level 3 ->"0/0/1/", '015' with level 1->"5/" */ function get_exdir($num,$level=3,$alpha=0,$withoutslash=0) { diff --git a/htdocs/lib/member.lib.php b/htdocs/lib/member.lib.php index f28d631a7c7..78385948733 100644 --- a/htdocs/lib/member.lib.php +++ b/htdocs/lib/member.lib.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2006-2010 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,7 +69,12 @@ function member_prepare_head($member) $head[$h][2] = 'note'; $h++; - $head[$h][0] = DOL_URL_ROOT.'/adherents/info.php?id='.$member->id; + $head[$h][0] = DOL_URL_ROOT.'/adherents/document.php?id='.$member->id; + $head[$h][1] = $langs->trans("Documents"); + $head[$h][2] = 'document'; + $h++; + + $head[$h][0] = DOL_URL_ROOT.'/adherents/info.php?id='.$member->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; $h++;