From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 2 Nov 2010 09:12:26 +0000 (+0000)
Subject: Report Customer Details didn't show up correctly in Excel
X-Git-Tag: v2.4.2~19^2~522
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ae59a064f6f31a49867fb10589a7a29878bc2d7f;p=fa-stable.git

Report Customer Details didn't show up correctly in Excel
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3d7e3e42..833c406a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+02-Nov-2010 Joe Hunt
+# Report Customer Details didn't show up correctly in Excel
+$ /reporting/rep103.php
+
 30-Oct-2010 Janusz Dobrowolski
 ! Added group code in account groups list selector.
 $ /includes/ui/ui_lists.inc
diff --git a/reporting/rep103.php b/reporting/rep103.php
index 5ad7f265..a028c331 100644
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -190,6 +190,49 @@ function print_customer_details_listing()
 				$rep->NewLine();
 			}
 			$rep->NewLine();
+			// Here starts the new report lines 2010-11-02 Joe Hunt
+			$contacts = get_branch_contacts($myrow['branch_code']);
+			$rep->TextCol(0, 1,	$myrow['name']);
+			$rep->TextCol(1, 2,	_('Price List') . ": " . $myrow['sales_type']);
+			$rep->TextCol(2, 3,	$myrow['br_name']);
+			$rep->NewLine();
+			$adr = Explode("\n", $myrow['address']);
+			$adr2 = Explode("\n", $myrow['br_address']);
+			$count1 = count($adr);
+			$count2 = count($adr2);
+			$count1 = max($count1, $count2);
+			if (isset($adr[0]))
+				$rep->TextCol(0, 1, $adr[0]);
+			if ($more != 0.0 || $less != 0.0)
+				$rep->TextCol(1, 2,	_('Turnover') . ": " . number_format2($turnover, $dec));
+			if (isset($contacts[0]))
+				$rep->TextCol(2, 3, $contacts[0]['name']);
+			if (isset($adr2[0]))	
+				$rep->TextCol(3, 4, $adr2[0]);
+			$rep->NewLine();
+			if (isset($adr[1]))
+				$rep->TextCol(0, 1, $adr[1]);
+			if (isset($contacts[0]))
+				$rep->TextCol(2, 3, _('Ph') . ": " . $contacts[0]['phone']);
+			if (isset($adr2[1]))
+				$rep->TextCol(3, 4, $adr2[1]);
+			$rep->NewLine();
+			if (isset($adr[2]))
+				$rep->TextCol(0, 1, $adr[2]);
+			if (isset($contacts[0]))
+				$rep->TextCol(2, 3, _('Fax') . ": " . $contacts[0]['fax']);
+			if (isset($adr2[2]))
+				$rep->TextCol(3, 4, $adr2[2]);
+			for ($i = 3; $i < $count1; $i++)
+			{
+				$rep->NewLine();
+				if (isset($adr[$i]))
+					$rep->TextCol(0, 1, $adr[$i]);
+				if (isset($adr2[$i]))
+					$rep->TextCol(0, 1, $adr2[$i]);
+			}	
+			$rep->NewLine();
+			/*
 			$rep->TextCol(0, 1,	$myrow['name']);
 			$adr = Explode("\n", $myrow['address']);
 			$count1 = count($adr);
@@ -216,7 +259,8 @@ function print_customer_details_listing()
 			$count2++;
 			$count1 = Max($count1, $count2);
 			$count1 = Max($count1, 4);
-			$rep->NewLine($count1);
+			$rep->NewLine($count3);
+			*/
 			$rep->Line($rep->row + 8);
 			$rep->NewLine(0, 3);
 		}