Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: TCPDF error file not found in member card generation

Browse Source
This commit is contained in:
Laurent Destailleur 2014-05-12 10:07:57 +02:00
parent 3f08664eee
commit 5f0c4dbe48
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -24,6 +24,7 @@ Fix: Nb of notes and doc not visible onto tasks.
Fix: [ bug #1372 ] Margin calculation does not work in proposals.
Fix: [ bug #1381 ] PHP Warning when listing stock transactions page.
Fix: [ bug #1367 ] "Show invoice" link after a POS sell throws an error.
Fix: TCPDF error file not found in member card generation.
***** ChangeLog for 3.5.2 compared to 3.5.1 *****
Fix: Can't add user for a task.

9
htdocs/core/modules/member/doc/pdf_standard.class.php
View File

@ -161,9 +161,12 @@ class pdf_standard
// Define photo
$dir=$conf->adherent->dir_output;
$file=get_exdir($idmember,2).'photos/'.$photo;
$photo=$dir.'/'.$file;
if (empty($photo) || ! is_readable($photo)) $photo='';
if (! empty($photo))
{
$file=get_exdir($idmember,2).'photos/'.$photo;
$photo=$dir.'/'.$file;
if (! is_readable($photo)) $photo='';
}
// Define background image
$backgroundimage='';

6
htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
View File

@ -157,6 +157,12 @@ class pdf_standardlabel
}
}
// Define photo
if (! empty($photo))
{
if (! is_readable($photo)) $photo='';
}
// Define background image
$backgroundimage='';