From bb5df3beebb905ef6e31b537a02f2f78ab6dab6e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 7 Nov 2016 04:02:16 +0100 Subject: [PATCH] Fix missing tab --- htdocs/core/lib/donation.lib.php | 9 +++ htdocs/don/document.php | 2 +- htdocs/don/note.php | 99 ++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 htdocs/don/note.php diff --git a/htdocs/core/lib/donation.lib.php b/htdocs/core/lib/donation.lib.php index 5ff91fb1286..51f6858eafd 100644 --- a/htdocs/core/lib/donation.lib.php +++ b/htdocs/core/lib/donation.lib.php @@ -89,6 +89,15 @@ function donation_prepare_head($object) $head[$h][2] = 'documents'; $h++; + $nbNote = 0; + if(!empty($object->note_private)) $nbNote++; + if(!empty($object->note_public)) $nbNote++; + $head[$h][0] = DOL_URL_ROOT.'/don/note.php?id='.$object->id; + $head[$h][1] = $langs->trans("Notes"); + if ($nbNote > 0) $head[$h][1].= ' '.$nbNote.''; + $head[$h][2] = 'note'; + $h++; + $head[$h][0] = DOL_URL_ROOT . '/don/info.php?id=' . $object->id; $head[$h][1] = $langs->trans("Info"); $head[$h][2] = 'info'; diff --git a/htdocs/don/document.php b/htdocs/don/document.php index 4992e5dbbc8..1321bd76cc2 100644 --- a/htdocs/don/document.php +++ b/htdocs/don/document.php @@ -104,7 +104,7 @@ if ($object->id) print ''; - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; // Ref print '
'.$langs->trans("Ref").''; diff --git a/htdocs/don/note.php b/htdocs/don/note.php new file mode 100644 index 00000000000..22d02fddb01 --- /dev/null +++ b/htdocs/don/note.php @@ -0,0 +1,99 @@ + + * Copyright (C) 2004-2008 Laurent Destailleur + * Copyright (C) 2005-2012 Regis Houssin + * Copyright (C) 2013 Florian Henry + * + * 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 3 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, see . + */ + +/** + * \file htdocs/compta/facture/note.php + * \ingroup facture + * \brief Fiche de notes sur une facture + */ + +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; + +$langs->load("companies"); +$langs->load("bills"); +$langs->load("donations"); + +$id=(GETPOST('id','int')?GETPOST('id','int'):GETPOST('facid','int')); // For backward compatibility +$ref=GETPOST('ref','alpha'); +$action=GETPOST('action','alpha'); + +// Security check +$socid=0; +if ($user->societe_id) $socid=$user->societe_id; +$result=restrictedArea($user,'don',$id,''); + +$object = new Don($db); +$object->fetch($id); + +$permissionnote=$user->rights->don->creer; // Used by the include of actions_setnotes.inc.php + + +/* + * Actions + */ + +include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not includ_once + + + +/* + * View + */ + +$title = $langs->trans('Donation') . " - " . $langs->trans('Notes'); +$helpurl = ""; +llxHeader('', $title, $helpurl); + +$form = new Form($db); + +if ($id > 0 || ! empty($ref)) +{ + $object = new Don($db); + $object->fetch($id,$ref); + + $head = donation_prepare_head($object); + + dol_fiche_head($head, 'note', $langs->trans("Donation"), 0, 'generic'); + + $linkback = ''.$langs->trans("BackToList").''; + + print ''; + + // Ref + print ''; + + print "
'.$langs->trans("Ref").''; + print $form->showrefnav($object, 'id', $linkback, 1, 'rowid', 'ref', ''); + print '
"; + + print '
'; + + include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php'; + + dol_fiche_end(); +} + + +llxFooter(); + +$db->close();