X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep103.php;h=3a5fa14493a632f9e2dc20a1c0b7dee8dfd04129;hb=f2e7911580d86e0c75edeabc3ce5b106c9f23151;hp=5ad7f26526375555e90d5ca2faa6442b8eab2974;hpb=8d83034325c15a6304b37998c855d71d7ee4859c;p=fa-stable.git

diff --git a/reporting/rep103.php b/reporting/rep103.php
index 5ad7f265..3a5fa144 100644
--- a/reporting/rep103.php
+++ b/reporting/rep103.php
@@ -78,7 +78,7 @@ function getTransactions($debtorno, $branchcode, $date)
 		WHERE debtor_no=".db_escape($debtorno)."
 		AND branch_code=".db_escape($branchcode)."
 		AND (type=".ST_SALESINVOICE." OR type=".ST_CUSTCREDIT.")
-		AND trandate >='$date'";
+		AND tran_date >='$date'";
 
     $result = db_query($sql,"No transactions were returned");
 
@@ -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);
 		}