From: <tim...@us...> - 2010-10-27 21:00:34
|
Revision: 4119 http://web-erp.svn.sourceforge.net/web-erp/?rev=4119&view=rev Author: tim_schofield Date: 2010-10-27 21:00:28 +0000 (Wed, 27 Oct 2010) Log Message: ----------- SQL quoting corrections and layout changes and improvements Modified Paths: -------------- trunk/PcReportTab.php trunk/doc/Change.log.html Modified: trunk/PcReportTab.php =================================================================== --- trunk/PcReportTab.php 2010-10-27 20:52:06 UTC (rev 4118) +++ trunk/PcReportTab.php 2010-10-27 21:00:28 UTC (rev 4119) @@ -18,6 +18,10 @@ if ((! isset($_POST['FromDate']) AND ! isset($_POST['ToDate'])) OR isset($_POST['SelectDifferentDate'])){ include ('includes/header.inc'); + + echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Payment Entry') + . '" alt="">' . ' ' . $title . '</p>'; + echo '<form method="POST" action="' . $_SERVER['PHP_SELF'] . '?' . SID . '">'; echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />'; @@ -30,7 +34,7 @@ } /*Show a form to allow input of criteria for Tabs to show */ - echo '<table>'; + echo '<table class=selection>'; echo '<tr><td>' . _('Code Of Petty Cash Tab') . ":</td><td><select name='SelectedTabs'>"; if ($_SESSION['AccessLevel'] >= 15){ // superuser can supervise the supervisors @@ -82,7 +86,7 @@ $SQL_ToDate = FormatDateForSQL($_POST['ToDate']); $SQL = "SELECT * FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date >='" . $SQL_FromDate . "' AND date <= '" . $SQL_ToDate . "' ORDER BY date, counterindex ASC"; @@ -109,14 +113,14 @@ include('includes/PDFTabReportHeader.inc'); $SqlTabs = "SELECT * FROM pctabs - WHERE tabcode='$SelectedTabs'"; + WHERE tabcode='".$SelectedTabs."'"; $TabResult = DB_query($SqlTabs, $db, _('No Petty Cash tabs were returned by the SQL because'), _('The SQL that failed was:')); $Tabs=DB_fetch_array($TabResult); $SqlBalance = "SELECT SUM(amount) FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date<'".$SQL_FromDate."'"; $TabBalance = DB_query($SqlBalance, @@ -200,7 +204,7 @@ $sqlamount="SELECT sum(amount) FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date<='".$SQL_ToDate."'"; $ResultAmount = DB_query($sqlamount,$db); @@ -248,6 +252,8 @@ include('includes/header.inc'); + echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/money_add.png" title="' . _('Payment Entry') + . '" alt="">' . ' ' . $title . '</p>'; $SQL_FromDate = FormatDateForSQL($_POST['FromDate']); $SQL_ToDate = FormatDateForSQL($_POST['ToDate']); @@ -257,7 +263,7 @@ echo '<input type=hidden name="FromDate" VALUE="' . $_POST['FromDate'] . '"><input type=hidden name="ToDate" VALUE="' . $_POST['ToDate'] . '">'; $SqlTabs = "SELECT * FROM pctabs - WHERE tabcode='$SelectedTabs'"; + WHERE tabcode='".$SelectedTabs."'"; $TabResult = DB_query($SqlTabs, $db, @@ -266,7 +272,7 @@ $Tabs=DB_fetch_array($TabResult); - echo "<br><table >"; + echo "<br><table class=selection>"; echo '<tr><td>' . _('Tab Code') . '</td> <td>:</td> @@ -287,7 +293,7 @@ $SqlBalance = "SELECT SUM(amount) FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date<'".$SQL_FromDate."'"; $TabBalance = DB_query($SqlBalance, $db); @@ -302,7 +308,7 @@ $SqlBalanceNotAut = "SELECT SUM(amount) FROM pcashdetails - WHERE tabcode= '$SelectedTabs' + WHERE tabcode= '".$SelectedTabs."' AND authorized = '0000-00-00' AND date<'".$SQL_FromDate."'"; @@ -324,7 +330,7 @@ $SQL = "SELECT * FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date >='" . $SQL_FromDate . "' AND date <= '" . $SQL_ToDate . "' ORDER BY date, counterindex Asc"; @@ -334,7 +340,7 @@ _('No Petty Cash movements for this tab were returned by the SQL because'), _('The SQL that failed was:')); - echo '<br><table BORDER=1>'; + echo '<br><table class=selection>'; echo "<tr> <th>" . _('Date Of Expense') . "</th> <th>" . _('Expense Description') . "</th> @@ -401,7 +407,7 @@ $sqlamount="SELECT sum(amount) FROM pcashdetails - WHERE tabcode='$SelectedTabs' + WHERE tabcode='".$SelectedTabs."' AND date<='".$SQL_ToDate."'"; $ResultAmount = DB_query($sqlamount,$db); Modified: trunk/doc/Change.log.html =================================================================== --- trunk/doc/Change.log.html 2010-10-27 20:52:06 UTC (rev 4118) +++ trunk/doc/Change.log.html 2010-10-27 21:00:28 UTC (rev 4119) @@ -1,5 +1,6 @@ <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p> <p></p> +<p>27/10/10 Tim: PcReportTab.php - SQL quoting corrections and layout changes and improvements</p> <p>27/10/10 Tim: PcClaimExpensesFromTab.php - SQL quoting corrections and layout changes and improvements</p> <p>27/10/10 Tim: class.pdf.php - Fix bug in html_entity_decode() function call</p> <p>27/10/10 d.k shukla: ManualPurchaseOrdering.html - Improvements to purchase ordering manual</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |