projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes up to 2.3.16 into unstable
[fa-stable.git]
/
reporting
/
includes
/
pdf_report.inc
diff --git
a/reporting/includes/pdf_report.inc
b/reporting/includes/pdf_report.inc
index 682b8af319c5a61e644677ce1600f97582cd9eed..2bda1d078572c052dc4888469ff2e9cf6b24bd11 100644
(file)
--- a/
reporting/includes/pdf_report.inc
+++ b/
reporting/includes/pdf_report.inc
@@
-528,7
+528,7
@@
class FrontReport extends Cpdf
// Width being zero means that the image will be scaled to the specified height
// keeping its aspect ratio intact.
if ($this->scaleLogoWidth)
// Width being zero means that the image will be scaled to the specified height
// keeping its aspect ratio intact.
if ($this->scaleLogoWidth)
- $this->AddImage($logo, $companyCol, $this->row, COMPANY_WIDTH, 0);
+ $this->AddImage($logo, $companyCol, $this->row
+ 15
, COMPANY_WIDTH, 0);
else
$this->AddImage($logo, $companyCol, $this->row - (LOGO_HEIGHT * LOGO_Y_POS_ADJ_FACTOR), 0, LOGO_HEIGHT);
}
else
$this->AddImage($logo, $companyCol, $this->row - (LOGO_HEIGHT * LOGO_Y_POS_ADJ_FACTOR), 0, LOGO_HEIGHT);
}
@@
-976,15
+976,21
@@
class FrontReport extends Cpdf
if ($email == 1)
{
if ($email == 1)
{
- if(!count($this->contactData)) {
+ $contactData = array();
+ if ($this->contactData)
+ foreach($this->contactData as $contact)
+ if (!empty($contact['email']))
+ $contactData[] = $contact;
+
+ if(!count($contactData)) {
$this->SetLang(user_language());
$this->SetLang(user_language());
- display_
error(_("You have no email contact defined for this type of document"
));
+ display_
warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']
));
} else {
$sent = $try = 0;
$emails = "";
if(!$subject)
$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
} else {
$sent = $try = 0;
$emails = "";
if(!$subject)
$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
- foreach($
this->
contactData as $contact) {
+ foreach($contactData as $contact) {
if (!isset($contact['email']))
continue;
$emailtype = true;
if (!isset($contact['email']))
continue;
$emailtype = true;
@@
-1026,9
+1032,9
@@
class FrontReport extends Cpdf
unlink($fname);
$this->SetLang(user_language());
if (!$try) {
unlink($fname);
$this->SetLang(user_language());
if (!$try) {
- display_
error(_("There is no contact email set for this document type."
));
+ display_
warning(sprintf(_("You have no email contact defined for this type of document for '%s'."), $this->formData['recipient_name']
));
} elseif (!$sent)
} elseif (!$sent)
- display_
error
($this->title . " " . $this->formData['document_number'] . ". "
+ display_
warning
($this->title . " " . $this->formData['document_number'] . ". "
. _("Sending document by email failed") . ". " . _("Email:") . $emails);
else
display_notification($this->title . " " . $this->formData['document_number'] . " "
. _("Sending document by email failed") . ". " . _("Email:") . $emails);
else
display_notification($this->title . " " . $this->formData['document_number'] . " "