X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fpdf_report.inc;h=98bd06a240502d571a3b25073457f27117e799a2;hb=c944c47bce4750f3906857cf22a15b83a67572e3;hp=a3713a248a33bd5d6eda05fd70183fb90ab3e350;hpb=21ba0553185531c12f16efef9010033d5dd62cdc;p=fa-stable.git

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index a3713a24..98bd06a2 100644
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -403,6 +403,8 @@ class FrontReport extends Cpdf
 		}
 		$this->formData['doctype'] = $doctype;
 		if (count($contacts)) {
+			if (!is_array($contacts[0]))
+				$contacts = array($contacts); // change to array when single contact passed
 			$this->contactData = $contacts;
 			// as report is currently generated once despite number of email recipients
 			// we select language for the first recipient as report language
@@ -713,25 +715,6 @@ class FrontReport extends Cpdf
 		return $drawColor;
 	}
 	
-	function SetDrawColor($r, $g, $b)
-	{
-		parent::SetDrawColor($r, $g, $b);
-	}
-
-	function SetTextColor($r, $g, $b)
-	{
-		parent::SetTextColor($r, $g, $b);
-	}
-
-	/**
-     * Set the fill color for table cells.
-     * @see reporting/includes/TCPDF#SetFillColor($col1, $col2, $col3, $col4)
-     */
-	function SetFillColor($r, $g, $b)
-	{
-		parent::SetFillColor($r, $g, $b);
-	}
-
 	// Get current cell padding setting from TCPDF object
 	function GetCellPadding()
 	{
@@ -755,6 +738,8 @@ class FrontReport extends Cpdf
 
 	function TextWrap($xpos, $ypos, $len, $str, $align = 'left', $border = 0, $fill = 0, $link = NULL, $stretch = 1, $spacebreak=false)
 	{
+		$str = strtr($str, array("\r"=>''));
+
 		if ($this->fontSize != $this->oldFontSize)
 		{
 			$this->SetFontSize($this->fontSize);
@@ -809,7 +794,8 @@ class FrontReport extends Cpdf
 
 	function TextWrapLines($c, $width, $txt, $align='left', $border=0, $fill=0, $link=NULL, $stretch=0, $spacebreak=true)
 	{
-		$str = Explode("\n", $txt);
+		$str = explode("\n", $txt);
+
 		for ($i = 0; $i < count($str); $i++)
 		{
 			$l = $str[$i];
@@ -865,7 +851,7 @@ class FrontReport extends Cpdf
 		parent::line($from, $row, $to, $row2);
 	}
 
-	function Line($row, $height = 0)
+	function Line($row, $height = 0, $dummy1=null, $dummy2=null, $dummy3=null)
 	{
 		$oldLineWidth = $this->GetLineWidth();
 		$this->SetLineWidth($height + 1);
@@ -994,39 +980,41 @@ class FrontReport extends Cpdf
 					display_error(_("You have no email contact defined for this type of document"));
 				} else {
 					$sent = 0;
-				foreach($this->contactData as $contact) {
-					$emailtype = true;
-					$this->SetLang($contact['lang']);
-					include("includes/doctext.inc");
-
-					require_once($path_to_root . "/reporting/includes/class.mail.inc");
-    				$mail = new email(str_replace(",", "", $this->company['coy_name']), $this->company['email']);
-					$mail->charset = $this->encoding;
-					if (!isset($contact['email']) || $contact['email'] == '') 
-						$contact['email'] = isset($myrow['contact_email']) ? $myrow['contact_email'] : '';
-
-	    			$to = str_replace(",", "", $contact['name'].' '.$contact['name2'])." <" . $contact['email'] . ">";
-    				$msg = $doc_Dear_Sirs . " " . $myrow['DebtorName'] . ",\n\n" . $doc_AttachedFile . " " . $subject .
-    					"\n\n";
-					if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == ST_SALESINVOICE) // helper for payment links
-					{
-						if ($myrow['dimension_id'] == 1)
+					foreach($this->contactData as $contact) {
+						if (!isset($contact['email'])) 
+							continue;
+						$emailtype = true;
+						$this->SetLang($contact['lang']);
+						include("includes/doctext.inc");
+
+						require_once($path_to_root . "/reporting/includes/class.mail.inc");
+    					$mail = new email(str_replace(",", "", $this->company['coy_name']),
+    						$this->company['email']);
+						$mail->charset = $this->encoding;
+
+	    				$to = str_replace(",", "", $contact['name'].' '.$contact['name2'])
+	    					." <" . $contact['email'] . ">";
+    					$msg = $doc_Dear_Sirs . " " . $contact['name2'] . ",\n\n" 
+    						. $doc_AttachedFile . " " . $subject ."\n\n";
+						if (isset($myrow['dimension_id']) && $myrow['dimension_id'] > 0 && $doctype == ST_SALESINVOICE) // helper for payment links
 						{
-							$amt = number_format($myrow["ov_freight"] + $myrow["ov_gst"] +	$myrow["ov_amount"], user_price_dec());
-							$txt = $doc_Payment_Link . " PayPal: ";
-							$nn = urlencode($this->title . " " . $myrow['reference']);
-							$url = "https://www.paypal.com/xclick/business=" . $this->company['email'] . "&item_name=" .
-								$nn . "&amount=" . $amt . "&currency_code=" . $myrow['curr_code'];
-							$msg .= $txt . $url . "\n\n";
+							if ($myrow['dimension_id'] == 1)
+							{
+								$amt = number_format($myrow["ov_freight"] + $myrow["ov_gst"] +	$myrow["ov_amount"], user_price_dec());
+								$txt = $doc_Payment_Link . " PayPal: ";
+								$nn = urlencode($this->title . " " . $myrow['reference']);
+								$url = "https://www.paypal.com/xclick/business=" . $this->company['email'] . "&item_name=" .
+									$nn . "&amount=" . $amt . "&currency_code=" . $myrow['curr_code'];
+								$msg .= $txt . $url . "\n\n";
+							}
 						}
-					}
-    				$msg .= $doc_Kindest_regards . "\n\n";
-    				$sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
-    				$mail->to($to);
-    				$mail->subject($subject);
-    				$mail->text($msg . $sender);
-    				$mail->attachment($fname);
-    				if ($mail->send()) $sent++;
+	    				$msg .= $doc_Kindest_regards . "\n\n";
+    					$sender = $this->user . "\n" . $this->company['coy_name'] . "\n" . $this->company['postal_address'] . "\n" . $this->company['email'] . "\n" . $this->company['phone'];
+    					$mail->to($to);
+    					$mail->subject($subject);
+    					$mail->text($msg . $sender);
+    					$mail->attachment($fname);
+    					if ($mail->send()) $sent++;
 					} // foreach contact
 					unlink($fname);
 					$this->SetLang(user_language());