X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=55c9f9634e377c371a8934133698bf6566be5557;hb=107a22ab168c1102f3f534a22cd5b8290331f17d;hp=9e405431746e1fe1c2860bd1fd2a7ff7d75c39b1;hpb=565a41e2d7fd4b4a32848e4829c11dbbcb5881d1;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 9e405431..55c9f963 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -255,10 +255,10 @@ class FrontReport extends Cpdf
 	{
 		global $app_title, $version, $power_by, $power_url;
 
-		$this->addinfo('Title', $this->title);
-		$this->addinfo('Subject', $this->title);
-		$this->addinfo('Author', $app_title . ' ' . $version);
-		$this->addinfo('Creator',$power_by . ' - ' . $power_url);
+		$this->addInfo('Title', $this->title);
+		$this->addInfo('Subject', $this->title);
+		$this->addInfo('Author', $app_title . ' ' . $version);
+		$this->addInfo('Creator',$power_by . ' - ' . $power_url);
 		$year = get_current_fiscalyear();
 		if ($year['closed'] == 0)
 			$how = _("Active");
@@ -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
@@ -519,15 +520,14 @@ class FrontReport extends Cpdf
 		$this->fontSize = HEADER1_FONT_SIZE;
 
 		// Print company logo if present and requested, or else just print company name
-		if ($this->companyLogoEnable && ($this->company['coy_logo'] != ''))
+		// Build a string specifying the location of the company logo file
+		$logo = company_path() . "/images/" . $this->company['coy_logo'];
+		if ($this->companyLogoEnable && ($this->company['coy_logo'] != '') && file_exists($logo))
 		{
-			// Build a string specifying the location of the company logo file
-			$logo = company_path() . "/images/" . $this->company['coy_logo'];
-
 			// 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);
 		}
@@ -945,7 +945,7 @@ class FrontReport extends Cpdf
 			$this->{$this->headerTmpl}();
 	}
 
-	function End($email=0)
+	function End($email=0, $subject='')
 	{
 		global $pdf_debug, $path_to_root;
 
@@ -975,13 +975,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;
-					$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
-					foreach($this->contactData as $contact) {
+					$emails = "";
+					if(!$subject)
+						$subject = $this->formData['document_name'] . ' '. $this->formData['document_number'];
+					foreach($contactData as $contact) {
 						if (!isset($contact['email'])) 
 							continue;
 						$emailtype = true;
@@ -1017,17 +1025,19 @@ class FrontReport extends Cpdf
     					$mail->subject($subject);
     					$mail->text($msg . $sender);
     					$mail->attachment($fname);
+    					$emails .= " " . $contact['email'];
     					if ($mail->send()) $sent++;
 					} // foreach contact
 					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(_("Sending document by email failed"));
+						display_warning($this->title . " " . $this->formData['document_number'] . ". "
+							. _("Sending document by email failed") . ". " . _("Email:") . $emails);
 					else
 						display_notification($this->title . " " . $this->formData['document_number'] . " " 
-							. _("has been sent by email to destination."));
+							. _("has been sent by email to destination.") . " " . _("Email:") . $emails);
 				}
 			}
 			else