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

Fix block to generate donation document missing

Browse Source
This commit is contained in:
Laurent Destailleur 2018-03-02 11:57:39 +01:00
parent a815326a28
commit c478ab952f
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/html.formfile.class.php
View File

@ -692,7 +692,8 @@ class FormFile
$out.= '<!-- html.formfile::showdocuments -->'."\n"; $out.= '<!-- html.formfile::showdocuments -->'."\n";
// Show title of array if not already shown // Show title of array if not already shown
if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart)) && ! $headershown) if ((! empty($file_list) || ! empty($link_list) || preg_match('/^massfilesarea/', $modulepart))
&& ! $headershown)
{ {
$headershown=1; $headershown=1;
$out.= '<div class="titre">'.$titletoshow.'</div>'."\n"; $out.= '<div class="titre">'.$titletoshow.'</div>'."\n";

2
htdocs/don/admin/donation.php
View File

@ -209,7 +209,7 @@ print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
$head = donation_admin_prepare_head(); $head = donation_admin_prepare_head();
dol_fiche_head($head, 'general', $langs->trans("Donations"), 0, 'payment'); dol_fiche_head($head, 'general', $langs->trans("Donations"), -1, 'payment');
// Document templates // Document templates

2
htdocs/don/admin/donation_extrafields.php
View File

@ -67,7 +67,7 @@ print load_fiche_titre($langs->trans("DonationsSetup"),$linkback,'title_setup');
$head = donation_admin_prepare_head(); $head = donation_admin_prepare_head();
dol_fiche_head($head, 'attributes', $langs->trans("Donations"), 0, 'payment'); dol_fiche_head($head, 'attributes', $langs->trans("Donations"), -1, 'payment');
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php'; require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';

2
htdocs/don/card.php
View File

@ -764,7 +764,7 @@ if (! empty($id) && $action != 'edit')
$filename = dol_sanitizeFileName($object->id); $filename = dol_sanitizeFileName($object->id);
$filedir = $conf->don->dir_output . "/" . dol_sanitizeFileName($object->id); $filedir = $conf->don->dir_output . "/" . dol_sanitizeFileName($object->id);
$urlsource = $_SERVER['PHP_SELF'].'?rowid='.$object->id; $urlsource = $_SERVER['PHP_SELF'].'?rowid='.$object->id;
$genallowed = ($object->statut == 2 && ($object->paid == 0 || $user->admin) && $user->rights->don->lire); $genallowed = (($object->paid == 0 || $user->admin) && $user->rights->don->lire);
$delallowed = $user->rights->don->creer; $delallowed = $user->rights->don->creer;
print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf); print $formfile->showdocuments('donation',$filename,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf);