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

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

Revision: 6030
          http://sourceforge.net/p/web-erp/reponame/6030
Author:   daintree
Date:     2013-06-18 07:17:20 +0000 (Tue, 18 Jun 2013)
Log Message:
-----------
Paul Harness fix to GoodsReceived.php

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

Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php	2013-06-17 17:36:52 UTC (rev 6029)
+++ trunk/GLTransInquiry.php	2013-06-18 07:17:20 UTC (rev 6030)
@@ -89,14 +89,14 @@
 			}
 			if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] AND $AnalysisCompleted == 'Not Yet')	{
 					$URL = $RootPath . '/CustomerInquiry.php?CustomerID=';
-					$date = '&TransAfterDate=' . $TranDate;
+					$FromDate = '&TransAfterDate=' . $TranDate;
 
-					$DetailSQL = "SELECT debtortrans.debtorno,
+					$DetailSQL = "SELECT debtortrans.debtorno AS otherpartycode,
 										debtortrans.ovamount,
 										debtortrans.ovgst,
 										debtortrans.ovfreight,
 										debtortrans.rate,
-										debtorsmaster.name
+										debtorsmaster.name AS otherparty
 									FROM debtortrans INNER JOIN debtorsmaster
 									ON debtortrans.debtorno = debtorsmaster.debtorno
 									WHERE debtortrans.type = '" . $TransRow['type'] . "'
@@ -105,13 +105,13 @@
 					
 			} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] AND $AnalysisCompleted == 'Not Yet' )	{
 					$URL = $RootPath . '/SupplierInquiry.php?SupplierID=';
-					$date = '&FromDate=' . $TranDate;
+					$FromDate = '&FromDate=' . $TranDate;
 
-					$DetailSQL = "SELECT supptrans.supplierno,
+					$DetailSQL = "SELECT supptrans.supplierno AS otherpartycode,
 										supptrans.ovamount,
 										supptrans.ovgst,
 										supptrans.rate,
-										suppliers.suppname
+										suppliers.suppname AS otherparty
 									FROM supptrans INNER JOIN suppliers
 									ON supptrans.supplierno = suppliers.supplierid
 									WHERE supptrans.type = '" . $TransRow['type'] . "'
@@ -150,7 +150,7 @@
 							$Debit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']+ $DetailRow['ovfreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
 							$Credit = ' ';
 						} else {
-							$Debit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Debit = locale_number_format(-($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
 							$Credit = ' ';
 						}
 					} else {
@@ -158,7 +158,7 @@
 							$Credit = locale_number_format(-($DetailRow['ovamount'] + $DetailRow['ovgst'] + $DetailRow['ovfreight']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
 							$Debit = ' ';
 						} else {
-							$Credit = locale_number_format(-($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
+							$Credit = locale_number_format(($DetailRow['ovamount'] + $DetailRow['ovgst']) / $DetailRow['rate'],$_SESSION['CompanyRecord']['decimalplaces']);
 							$Debit = ' ';
 						}
 					}
@@ -172,7 +172,7 @@
 					}
 					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><a href="' . $URL . $DetailRow['otherpartycode'] . $FromDate . '">' . $TransRow['accountname']  . ' - ' . $DetailRow['otherparty'] . '</a></td>
 								<td class="number">' . $Debit . '</td>
 								<td class="number">' . $Credit . '</td>
 								<td>' . $TransRow['narrative'] . '</td>

Modified: trunk/GoodsReceived.php
===================================================================
--- trunk/GoodsReceived.php	2013-06-17 17:36:52 UTC (rev 6029)
+++ trunk/GoodsReceived.php	2013-06-18 07:17:20 UTC (rev 6030)
@@ -543,7 +543,7 @@
 							if (trim($Item->BundleRef) != ''){
 								if ($AlreadyExistsRow[0]>0){
 									if ($OrderLine->Serialised == 1) {
-										$SQL = "UPDATE stockserialitems SET quantity = '" . $Item->BundleQty . " ";
+										$SQL = "UPDATE stockserialitems SET quantity = '" . $Item->BundleQty . "'";
 									} else {
 										$SQL = "UPDATE stockserialitems SET quantity = quantity + '" . $Item->BundleQty . "'";
 									}

Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log	2013-06-17 17:36:52 UTC (rev 6029)
+++ trunk/doc/Change.log	2013-06-18 07:17:20 UTC (rev 6030)
@@ -1,5 +1,6 @@
 OwebERP Change Log
 
+17/6/13 Paul Harness: Fix sql query of goods received when a serial number is already present. GoodsReceived.php
 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