[Web-erp-svn] SF.net SVN: web-erp:[6018] trunk

[<dai...@us...>]

Revision: 6018
          http://sourceforge.net/p/web-erp/reponame/6018
Author:   daintree
Date:     2013-06-13 10:00:40 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
Tomglare: improved selection of single supplier

Modified Paths:
--------------
    trunk/GLTransInquiry.php
    trunk/PO_Items.php
    trunk/SelectSupplier.php
    trunk/doc/Change.log

Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php	2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/GLTransInquiry.php	2013-06-13 10:00:40 UTC (rev 6018)
@@ -32,8 +32,8 @@
 		//
 		//========[ SHOW SYNOPSYS ]===========
 		//
-		echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/magnifier.png" title="'
-			. _('Print') . '" alt="" />' . ' ' . $Title . '</p>';
+		echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$theme.'/images/magnifier.png" title="'
+			. _('Print') . '" alt="" />' . ' ' . $title . '</p>';
 		echo '<table class="selection">'; //Main table
 		echo '<tr>
 				<th colspan="7"><h2><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></h2></th>
@@ -59,7 +59,7 @@
 						periods.lastdate_in_period
 					FROM gltrans INNER JOIN chartmaster
 					ON gltrans.account = chartmaster.accountcode
-					INNER JOIN periods
+					INNER JOIN periods 
 					ON periods.periodno=gltrans.periodno
 					WHERE gltrans.type= '" . $_GET['TypeID'] . "'
 					AND gltrans.typeno = '" . $_GET['TransNo'] . "'
@@ -74,9 +74,6 @@
 			$TranDate = ConvertSQLDate($TransRow['trandate']);
 			$DetailResult = false;
 
-			$AccountName = $TransRow['accountname'];
-			$URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
-
 			if ( $TransRow['amount'] > 0) {
 					$DebitAmount = locale_number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
 					$DebitTotal += $TransRow['amount'];
@@ -90,54 +87,96 @@
 				$Posted = _('No');
 			}
 			if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] )	{
-				$DetailSQL = "SELECT debtortrans.debtorno,
-									debtorsmaster.name
-								FROM debtortrans INNER JOIN debtorsmaster
-								ON debtortrans.debtorno = debtorsmaster.debtorno
-								WHERE debtortrans.type = '" . $TransRow['type'] . "'
-								AND debtortrans.transno = '" . $_GET['TransNo']. "'";
-				$DetailResult = DB_query($DetailSQL,$db);
+					$URL = $RootPath . '/CustomerInquiry.php?CustomerID=';
+					$date = '&amp;TransAfterDate=' . $TranDate;
+
+					$DetailSQL = "SELECT debtortrans.debtorno,
+										debtortrans.ovamount,
+										debtortrans.ovgst,
+										debtortrans.ovfreight,
+										debtortrans.rate,
+										debtorsmaster.name
+									FROM debtortrans INNER JOIN debtorsmaster
+									ON debtortrans.debtorno = debtorsmaster.debtorno
+									WHERE debtortrans.type = '" . $TransRow['type'] . "'
+									AND debtortrans.transno = '" . $_GET['TransNo']. "'";
+					$DetailResult = DB_query($DetailSQL,$db);
 			} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] )	{
-				$DetailSQL = "SELECT supptrans.supplierno,
-									suppliers.suppname
-								FROM supptrans INNER JOIN suppliers
-								ON supptrans.supplierno = suppliers.supplierid
-								WHERE supptrans.type = '" . $TransRow['type'] . "'
-								AND supptrans.transno = '" . $_GET['TransNo'] . "'";
-				$DetailResult = DB_query($DetailSQL,$db);
+					$URL = $RootPath . '/SupplierInquiry.php?SupplierID=';
+					$date = '&amp;FromDate=' . $TranDate;
+
+					$DetailSQL = "SELECT supptrans.supplierno,
+										supptrans.ovamount,
+										supptrans.ovgst,
+										supptrans.rate,
+										suppliers.suppname
+									FROM supptrans INNER JOIN suppliers
+									ON supptrans.supplierno = suppliers.supplierid
+									WHERE supptrans.type = '" . $TransRow['type'] . "'
+									AND supptrans.transno = '" . $_GET['TransNo'] . "'";
+					$DetailResult = DB_query($DetailSQL,$db);
+			} else {
+					$URL = $RootPath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
+
+					if( mb_strlen($TransRow['narrative'])==0 ) {
+						$TransRow['narrative'] = '&nbsp;';
+					}
+					
+					if ($j==1) {
+						echo '<tr class="OddTableRows">';
+						$j=0;
+					} else {
+						echo '<tr class="EvenTableRows">';
+						$j++;
+					}
+					echo	'<td>' . $TranDate . '</td>
+								<td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
+								<td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
+								<td class="number">' . $DebitAmount . '</td>
+								<td class="number">' . $CreditAmount . '</td>
+								<td>' . $TransRow['narrative'] . '</td>
+								<td>' . $Posted . '</td>
+							</tr>';
 			}
+
 			if ($DetailResult) {
-				$DetailRow = DB_fetch_array($DetailResult);// there can be only one
-				if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
-					$URL = $RootPath . '/CustomerInquiry.php?CustomerID=' . $DetailRow['debtorno'] . '&amp;TransAfterDate=' . $TranDate;
-					$AccountName .= ' ' . $DetailRow['name'];
-				} else { //its a supplier trans
-					$URL = $RootPath . '/SupplierInquiry.php?SupplierID=' . $DetailRow['supplierno'] . '&amp;FromDate=' . $TranDate;
-					$AccountName .= ' ' . $DetailRow['suppname'];
+				while ( $DetailRow = DB_fetch_array($DetailResult) ) {
+					if ( $TransRow['amount'] > 0){
+						if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
+							$Debit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']+ $DetailRow['ovreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Credit = '&nbsp;';
+						} else {
+							$Debit = locale_number_format((-$DetailRow['ovamount'] - $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Credit = '&nbsp;';
+						}
+					} else {
+						if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
+							$Credit = locale_number_format(-($DetailRow['ovamount'] + $DetailRow['ovgst'] + $DetailRow['ovfreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Debit = '&nbsp;';
+						} else {
+							$Credit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Debit = '&nbsp;';
+						}
+					}
+
+					if ($j==1) {
+						echo '<tr class="OddTableRows">';
+						$j=0;
+					} else {
+						echo '<tr class="EvenTableRows">';
+						$j++;
+					}
+					echo	'<td>' . $TranDate . '</td>
+								<td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
+								<td><a href="' . $URL . $DetailRow[0] . $date . '">' . $TransRow['accountname']  . ' - ' . $DetailRow[5] . '</a></td>
+								<td class="number">' . $Debit . '</td>
+								<td class="number">' . $Credit . '</td>
+								<td>' . $TransRow['narrative'] . '</td>
+								<td>' . $Posted . '</td>
+							</tr>';
 				}
 				DB_free_result($DetailResult);
 			}
-
-
-			if( mb_strlen($TransRow['narrative'])==0 ) {
-				$TransRow['narrative'] = '&nbsp;';
-			}
-
-			if ($j==1) {
-				echo '<tr class="OddTableRows">';
-				$j=0;
-			} else {
-				echo '<tr class="EvenTableRows">';
-				$j++;
-			}
-			echo	'<td>' . $TranDate . '</td>
-						<td>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
-						<td><a href="' . $URL . '">' . $AccountName . '</a></td>
-						<td class="number">' . $DebitAmount . '</td>
-						<td class="number">' . $CreditAmount . '</td>
-						<td>' . $TransRow['narrative'] . '</td>
-						<td>' . $Posted . '</td>
-					</tr>';
 		}
 		DB_free_result($TransResult);
 
@@ -152,7 +191,5 @@
 
 }
 
-
 include('includes/footer.inc');
-
 ?>
\ No newline at end of file

Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php	2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/PO_Items.php	2013-06-13 10:00:40 UTC (rev 6018)
@@ -498,6 +498,8 @@
 	if ($AllowUpdate == true){
 	//adding the non-stock item
 
+	//adding the non-stock item
+
 		$_SESSION['PO'.$identifier]->add_to_order($_SESSION['PO'.$identifier]->LinesOnOrder+1,
 												'',
 												0, /*Serialised */

Modified: trunk/SelectSupplier.php
===================================================================
--- trunk/SelectSupplier.php	2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/SelectSupplier.php	2013-06-13 10:00:40 UTC (rev 6018)
@@ -135,12 +135,16 @@
 		$myrow = DB_fetch_row($result);
 		$SingleSupplierReturned = $myrow[0];
 	}
+	if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
+ 	   $_SESSION['SupplierID'] = $SingleSupplierReturned;
+	   unset($_POST['Keywords']);
+	   unset($_POST['SupplierCode']);
+	   unset($_POST['Search']);
+        } else {
+               unset($_SESSION['SupplierID']);
+        }
 } //end of if search
-if (isset($SingleSupplierReturned)) { /*there was only one supplier returned */
-	$_SESSION['SupplierID'] = $SingleSupplierReturned;
-	unset($_POST['Keywords']);
-	unset($_POST['SupplierCode']);
-}
+
 if (isset($_SESSION['SupplierID'])) {
 	$SupplierName = '';
 	$SQL = "SELECT suppliers.suppname

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-06-11 21:23:50 UTC (rev 6017)
+++ trunk/doc/Change.log	2013-06-13 10:00:40 UTC (rev 6018)
@@ -1,5 +1,6 @@
 OwebERP Change Log
 
+12/6/13 tomglare: SelectSupplier - improve handling if single supplier selected
 25/5/13 Phil: CountriesArray.php now uses the index as the ISO 2 character code for the country.
 25/5/13 Phil: Currencies.php now takes advantage of Rafael's new CurrenciesArray - to ensure correct ISO 3 letter abbreviation is selected - also allows for translation of currency names
 25/5/13 Rafael Chacón: New include/CurrenciesArray.php listing all ISO currencies and their code