[Weberp-cvs] SF.net SVN: web-erp:[3468] trunk

[<tim...@us...>]

Revision: 3468
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3468&view=rev
Author:   tim_schofield
Date:     2010-05-26 07:23:52 +0000 (Wed, 26 May 2010)

Log Message:
-----------
Tim: Corrections to SelectCustomer.php and Customers.php

Modified Paths:
--------------
    trunk/Customers.php
    trunk/SelectCustomer.php
    trunk/doc/Change.log.html

Modified: trunk/Customers.php
===================================================================
--- trunk/Customers.php	2010-05-24 18:11:14 UTC (rev 3467)
+++ trunk/Customers.php	2010-05-26 07:23:52 UTC (rev 3468)
@@ -628,7 +628,7 @@
 	echo '<table border=2 cellspacing=4><tr><td><table>';
 
 	if (!isset($_POST['New'])) {
-		$sql = "SELECT debtorno,
+		$sql = "SELECT debtorsmaster.debtorno,
 				name,
 				address1,
 				address2,
@@ -636,9 +636,9 @@
 				address4,
 				address5,
 				address6,
-				telephone,
-				fax,
-				email,
+				custbranch.phoneno,
+				custbranch.faxno,
+				custbranch.email,
 				currcode,
 				salestype,
 				clientsince,
@@ -653,7 +653,9 @@
 				customerpoline,
 				typeid
 				FROM debtorsmaster
-			WHERE debtorno = '" . $DebtorNo . "'";
+				LEFT JOIN custbranch
+				ON debtorsmaster.debtorno=custbranch.debtorno
+			WHERE debtorsmaster.debtorno = '" . $DebtorNo . "'";
 
 		$ErrMsg = _('The customer details could not be retrieved because');
 		$result = DB_query($sql,$db,$ErrMsg);

Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php	2010-05-24 18:11:14 UTC (rev 3467)
+++ trunk/SelectCustomer.php	2010-05-26 07:23:52 UTC (rev 3468)
@@ -23,6 +23,7 @@
 	$myrow = DB_fetch_array($result);
 	$sql = "SELECT debtorsmaster.debtorno,
 					debtorsmaster.name,
+					custbranch.branchcode,
 					custbranch.brname,
 					custbranch.lat,
 					custbranch.lng
@@ -102,6 +103,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+				custbranch.branchcode,
 				custbranch.brname,
 				custbranch.contactname,
 				debtortype.typename,
@@ -121,6 +123,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+				custbranch.branchcode,
 				custbranch.brname,
 				custbranch.contactname,
 				debtortype.typename,
@@ -138,6 +141,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+				custbranch.branchcode,
 				custbranch.brname,
 				custbranch.contactname,
 				debtortype.typename,
@@ -154,6 +158,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+				custbranch.branchcode,
 				custbranch.brname,
 				custbranch.contactname,
 				debtortype.typename,
@@ -172,6 +177,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+				custbranch.branchcode,
 				custbranch.brname,
 				custbranch.contactname,
 				debtortype.typename,
@@ -190,6 +196,7 @@
 								debtorsmaster.address2,
 								debtorsmaster.address3,
 								debtorsmaster.address4,
+								custbranch.branchcode,
 								custbranch.brname,
 								custbranch.contactname,
 								debtortype.typename,
@@ -219,10 +226,11 @@
 if (!isset($_POST['Select'])) {
 	$_POST['Select'] = "";
 }
+$Debtor=explode('-', $_POST['Select']);
 if ($_POST['Select'] != "" or ($_SESSION['CustomerID'] != "" and !isset($_POST['Keywords']) and !isset($_POST['CustCode']) and !isset($_POST['CustType']) and !isset($_POST['CustPhone']))) {
 	if ($_POST['Select'] != "") {
-		$SQL = "SELECT brname, phoneno FROM custbranch WHERE debtorno='" . $_POST['Select'] . "'";
-		$_SESSION['CustomerID'] = $_POST['Select'];
+		$SQL = "SELECT brname, phoneno FROM custbranch WHERE debtorno='" . $Debtor[0] . "'";
+		$_SESSION['CustomerID'] = $Debtor[0];
 	} else {
 		$SQL = "SELECT debtorsmaster.name, custbranch.phoneno FROM
 		debtorsmaster, custbranch WHERE
@@ -425,7 +433,7 @@
 				echo '<tr class="OddTableRows">';
 				$k = 1;
 			}
-			echo "<td><font size=1><input type=submit name='Select' value='" . $myrow['debtorno'] . "'</font></td>
+			echo "<td><font size=1><input type=submit name='Select' value='" . $myrow['debtorno'].'-'.$myrow['branchcode'] . "'></font></td>
 				<td><font size=1>" . $myrow['name'] . "</font></td>
 				<td><font size=1>" . $myrow['brname'] . "</font></td>
 				<td><font size=1>" . $myrow['contactname'] . "</font></td>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-05-24 18:11:14 UTC (rev 3467)
+++ trunk/doc/Change.log.html	2010-05-26 07:23:52 UTC (rev 3468)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<P>26/05/10 Tim: Corrections to SelectCustomer.php and Customers.php</p>
 <P>24/05/10 Simon Peter Otandeka: Added telephone, email and fax fields to Suppliers and Customers Pages. Ability to add/edit the records.</p>
 <P>16/05/10 Phil: javascripts/MiscFunctions.js - not my field ... but could not resist adding some indentation - I struggle at the best of times with javascript but this was a shocker to read!! Hope I didnt mess up anything</p>
 <P>16/05/10 Phil: reworked PDFRemittanceAdvices.php - somehow missed from tcpdf work to print utf-8 pdfs</p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.