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

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

Revision: 3599
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3599&view=rev
Author:   tim_schofield
Date:     2010-07-09 21:54:44 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
Layout improvements changed period number to date and year and sql fixes

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

Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php	2010-07-09 12:41:47 UTC (rev 3598)
+++ trunk/GLTransInquiry.php	2010-07-09 21:54:44 UTC (rev 3599)
@@ -10,7 +10,6 @@
 include('includes/header.inc');
 
 // Page Border
-echo '<table border=1 width=100%><tr><td bgcolor="#FFFFFF"><div class="centre">';
 $menuUrl = '<a href="'. $rootpath . '/index.php?&Application=GL'. SID .'">' . _('General Ledger Menu') . '</a></div>';
 
 if ( !isset($_GET['TypeID']) OR !isset($_GET['TransNo']) )
@@ -18,10 +17,10 @@
 		prnMsg(_('This page requires a valid transaction type and number'),'warn');
 		echo $menuUrl;
 } else {
-		$typeSQL = 'SELECT typename,
+		$typeSQL = "SELECT typename,
 							typeno
 					FROM systypes
-					WHERE typeid = ' . $_GET['TypeID'];
+					WHERE typeid = '" . $_GET['TypeID'] . "'";
 
 		$TypeResult = DB_query($typeSQL,$db);
 
@@ -34,15 +33,14 @@
 				$TransName = $myrow[0];
 
 				// Context Navigation and Title
-				echo '<table width=100%>
-						<td width=40% align=left>' . $menuUrl. '</td>
-						<td align=left><font size=4 color=blue><u><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></u></font></td>
-				      </table><p>';
-
+				echo $menuUrl;
 				//
 				//========[ SHOW SYNOPSYS ]===========
 				//
-				echo '<table border=1>'; //Main table
+				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><font size=3 color=blue><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></font></th></tr>';
 				echo '<tr>
 						<th>' . _('Date') . '</th>
 						<th>' . _('Period') .'</th>
@@ -60,12 +58,15 @@
 							gltrans.narrative,
 							gltrans.amount,
 							gltrans.posted,
-							chartmaster.accountname
+							chartmaster.accountname,
+							periods.lastdate_in_period
 						FROM gltrans,
-							chartmaster
+							chartmaster,
+							periods
 						WHERE gltrans.account = chartmaster.accountcode
-						AND gltrans.type= " . $_GET['TypeID'] . "
-						AND gltrans.typeno = " . $_GET['TransNo'] . "
+						AND periods.periodno=gltrans.periodno
+						AND gltrans.type= '" . $_GET['TypeID'] . "'
+						AND gltrans.typeno = '" . $_GET['TransNo'] . "'
 						ORDER BY gltrans.counterindex";
 				$TransResult = DB_query($SQL,$db);
 
@@ -90,7 +91,7 @@
 							$URL = $rootpath . '/CustomerInquiry.php?' . SID . '&CustomerID=';
 							$date = '&TransAfterDate=' . $TranDate;
 
-							$DetailSQL = 'SELECT debtortrans.debtorno,
+							$DetailSQL = "SELECT debtortrans.debtorno,
 											debtortrans.ovamount,
 											debtortrans.ovgst,
 											debtortrans.rate,
@@ -98,14 +99,14 @@
 											FROM debtortrans,
 											debtorsmaster
 											WHERE debtortrans.debtorno = debtorsmaster.debtorno
-											AND debtortrans.type = ' . $TransRow['type'] . '
-											AND debtortrans.transno = ' . $_GET['TransNo'];
+											AND debtortrans.type = '" . $TransRow['type'] . "'
+											AND debtortrans.transno = '" . $_GET['TransNo']. "'";
 							$DetailResult = DB_query($DetailSQL,$db);
 					} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] )	{
 							$URL = $rootpath . '/SupplierInquiry.php?' . SID . '&SupplierID=';
 							$date = '&FromDate=' . $TranDate;
 
-							$DetailSQL = 'SELECT supptrans.supplierno,
+							$DetailSQL = "SELECT supptrans.supplierno,
 											supptrans.ovamount,
 											supptrans.ovgst,
 											supptrans.rate,
@@ -113,8 +114,8 @@
 											FROM supptrans,
 											suppliers
 											WHERE supptrans.supplierno = suppliers.supplierid
-											AND supptrans.type = ' . $TransRow['type'] . '
-											AND supptrans.transno = ' . $_GET['TransNo'];
+											AND supptrans.type = '" . $TransRow['type'] . "'
+											AND supptrans.transno = '" . $_GET['TransNo'] . "'";
 							$DetailResult = DB_query($DetailSQL,$db);
 					} else {
 							$URL = $rootpath . '/GLAccountInquiry.php?' . SID . '&Account=' . $TransRow['account'];
@@ -134,7 +135,7 @@
 								$j++;
 							}
 							echo	'<td>' . $TranDate . '</td>
-									<td class=number>' . $TransRow['periodno'] . '</td>
+									<td class=number>' . MonthAndYearFromSQLDate($TransRow['lastdate_in_period']) . '</td>
 									<td><a href="' . $URL . '">' . $TransRow['accountname'] . '</a></td>
 									<td class=number>' . $DebitAmount . '</td>
 									<td class=number>' . $CreditAmount . '</td>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-09 12:41:47 UTC (rev 3598)
+++ trunk/doc/Change.log.html	2010-07-09 21:54:44 UTC (rev 3599)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>09/07/10 Tim: GLTransInquiry.php - Layout improvements changed period number to date and year and sql fixes</p>
 <p>09/07/10 Tim: GLTags - Layout improvements and sql fixes</p>
 <p>09/07/10 Phil: includes/DateFunctions.inc added assumption for 2 digit years to d/m/Y m/d/Y and Y/m/d formats
 <p>09/07/10 Phil: Prices.php fixed error trapping to allow end dates of 0000-00-00 - the default no end date used by the logic


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