X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=c02c0207efde3e210678e3110c834a464d5edda4;hb=e6d9f3706a42003ac003820c0532db20d5d50ff8;hp=ee79d43e2e4173304deb5f008c6e0774dbef46ec;hpb=7729c70dcdc39b2d776f27cd12bd4631c93251b7;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index ee79d43e..c02c0207 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -386,7 +386,7 @@ class FrontReport extends Cpdf
 			'DebtorName', 'supp_account_no', 'wo_ref', 'debtor_ref','type', 'trans_no', 
 			'StockItemName', 'tax_id', 'order_', 'delivery_date', 'units_issued',
 			'due_date', 'required_by', 'payment_terms', 'curr_code',
-			'ov_freight', 'ov_gst', 'ov_amount'),
+			'ov_freight', 'ov_gst', 'ov_amount', 'requisition_no', 'contact'),
 		'branch' => array('br_address', 'br_name', 'salesman', 'disable_branch'),
 		'sales_order' => array('deliver_to', 'delivery_address', 'customer_ref'),
 		'bankaccount' => array('bank_name', 'bank_account_number', 'payment_service')
@@ -429,7 +429,8 @@ class FrontReport extends Cpdf
 		$doctype = $this->formData['doctype'];
 		$header2type = true;
 
-		$this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang'] : $dflt_lang);
+		$this->SetLang(@$this->formData['rep_lang'] ? $this->formData['rep_lang']
+ 			: ($_SESSION["wa_current_user"]->prefs->language ? $_SESSION["wa_current_user"]->prefs->language : $dflt_lang));
 
  		 // leave layout files names without path to enable including
  		 // modified versions from company/x/reporting directory
@@ -527,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)
-				$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);
 		}
@@ -975,15 +976,21 @@ class FrontReport extends Cpdf
 
 			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());
-					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'];
-					foreach($this->contactData as $contact) {
+					foreach($contactData as $contact) {
 						if (!isset($contact['email'])) 
 							continue;
 						$emailtype = true;
@@ -1025,9 +1032,9 @@ class FrontReport extends Cpdf
 					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)
-						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'] . " "