Menu
▾
▴
[Weberp-cvs] SF.net SVN: web-erp:[3593] trunk
|
From: <tim...@us...> - 2010-07-08 19:50:44
|
Revision: 3593
http://web-erp.svn.sourceforge.net/web-erp/?rev=3593&view=rev
Author: tim_schofield
Date: 2010-07-08 19:50:37 +0000 (Thu, 08 Jul 2010)
Log Message:
-----------
Layout improvements and sql fixes
Modified Paths:
--------------
trunk/GLProfit_Loss.php
trunk/doc/Change.log.html
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2010-07-08 19:50:19 UTC (rev 3592)
+++ trunk/GLProfit_Loss.php 2010-07-08 19:50:37 UTC (rev 3593)
@@ -36,9 +36,9 @@
$period=GetPeriod($FromDate, $db);
/*Show a form to allow input of criteria for profit and loss to show */
- echo '<p><table class="table"><tr><td>'._('Select Period From').":</td><td><select Name='FromPeriod'>";
+ echo '<p><table class="selection"><tr><td>'._('Select Period From').":</td><td><select Name='FromPeriod'>";
- $sql = 'SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC';
+ $sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
@@ -61,7 +61,7 @@
echo '</select></td></tr>';
if (!isset($_POST['ToPeriod']) OR $_POST['ToPeriod']==''){
$lastDate = date("Y-m-d",mktime(0,0,0,Date('m')+1,0,Date('Y')));
- $sql = "SELECT periodno FROM periods where lastdate_in_period = '$lastDate'";
+ $sql = "SELECT periodno FROM periods where lastdate_in_period = '" . $lastDate . "'";
$MaxPrd = DB_query($sql,$db);
$MaxPrdrow = DB_fetch_row($MaxPrd);
$DefaultToPeriod = (int) ($MaxPrdrow[0]);
@@ -124,17 +124,17 @@
$PeriodToDate = MonthAndYearFromSQLDate($myrow[0]);
- $SQL = 'SELECT accountgroups.sectioninaccounts,
+ $SQL = "SELECT accountgroups.sectioninaccounts,
accountgroups.groupname,
accountgroups.parentgroupname,
chartdetails.accountcode ,
chartmaster.accountname,
- Sum(CASE WHEN chartdetails.period=' . $_POST['FromPeriod'] . ' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['FromPeriod'] . ' THEN chartdetails.bfwdbudget ELSE 0 END) AS firstprdbudgetbfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['ToPeriod'] . ' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
- Sum(CASE WHEN chartdetails.period=' . ($_POST['FromPeriod'] - 12) . ' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
- Sum(CASE WHEN chartdetails.period=' . ($_POST['ToPeriod']-12) . ' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['ToPeriod'] . ' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
+ Sum(CASE WHEN chartdetails.period='" . $_POST['FromPeriod'] . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['FromPeriod'] . "' THEN chartdetails.bfwdbudget ELSE 0 END) AS firstprdbudgetbfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
FROM chartmaster INNER JOIN accountgroups
ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
ON chartmaster.accountcode= chartdetails.accountcode
@@ -148,7 +148,7 @@
ORDER BY accountgroups.sectioninaccounts,
accountgroups.sequenceintb,
accountgroups.groupname,
- chartdetails.accountcode';
+ chartdetails.accountcode";
$AccountsResult = DB_query($SQL,$db);
@@ -528,23 +528,23 @@
exit;
}
- $sql = 'SELECT lastdate_in_period FROM periods WHERE periodno=' . $_POST['ToPeriod'];
+ $sql = "SELECT lastdate_in_period FROM periods WHERE periodno='" . $_POST['ToPeriod'] . "'";
$PrdResult = DB_query($sql, $db);
$myrow = DB_fetch_row($PrdResult);
$PeriodToDate = MonthAndYearFromSQLDate($myrow[0]);
- $SQL = 'SELECT accountgroups.sectioninaccounts,
+ $SQL = "SELECT accountgroups.sectioninaccounts,
accountgroups.parentgroupname,
accountgroups.groupname,
chartdetails.accountcode,
chartmaster.accountname,
- Sum(CASE WHEN chartdetails.period=' . $_POST['FromPeriod'] . ' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['FromPeriod'] . ' THEN chartdetails.bfwdbudget ELSE 0 END) AS firstprdbudgetbfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['ToPeriod'] . ' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
- Sum(CASE WHEN chartdetails.period=' . ($_POST['FromPeriod'] - 12) . ' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
- Sum(CASE WHEN chartdetails.period=' . ($_POST['ToPeriod']-12) . ' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
- Sum(CASE WHEN chartdetails.period=' . $_POST['ToPeriod'] . ' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
+ Sum(CASE WHEN chartdetails.period='" . $_POST['FromPeriod'] . "' THEN chartdetails.bfwd ELSE 0 END) AS firstprdbfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['FromPeriod'] . "' THEN chartdetails.bfwdbudget ELSE 0 END) AS firstprdbudgetbfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lastprdcfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['FromPeriod'] - 12) . "' THEN chartdetails.bfwd ELSE 0 END) AS lyfirstprdbfwd,
+ Sum(CASE WHEN chartdetails.period='" . ($_POST['ToPeriod']-12) . "' THEN chartdetails.bfwd + chartdetails.actual ELSE 0 END) AS lylastprdcfwd,
+ Sum(CASE WHEN chartdetails.period='" . $_POST['ToPeriod'] . "' THEN chartdetails.bfwdbudget + chartdetails.budget ELSE 0 END) AS lastprdbudgetcfwd
FROM chartmaster INNER JOIN accountgroups
ON chartmaster.group_ = accountgroups.groupname INNER JOIN chartdetails
ON chartmaster.accountcode= chartdetails.accountcode
@@ -559,7 +559,7 @@
accountgroups.sequenceintb,
accountgroups.groupname,
accountgroups.sequenceintb,
- chartdetails.accountcode';
+ chartdetails.accountcode";
$AccountsResult = DB_query($SQL,$db,_('No general ledger accounts were returned by the SQL because'),_('The SQL that failed was'));
@@ -568,7 +568,7 @@
/*show a table of the accounts info returned by the SQL
Account Code , Account Name , Month Actual, Month Budget, Period Actual, Period Budget */
- echo '<table cellpadding=2>';
+ echo '<table cellpadding=2 class=selection>';
if ($_POST['Detail']=='Detailed'){
$TableHeader = "<tr>
@@ -843,7 +843,7 @@
$ActGrp = $myrow['groupname'];
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan=6><font size=2 color=BLUE><b>%s</b></font></td>
+ <th colspan=8><font size=3 color=BLUE><b>%s</b></font></th>
</tr>',
$myrow['groupname']);
echo $TableHeader;
@@ -1192,9 +1192,9 @@
</tr>';
echo '</table>';
- echo "<div class='centre'><input type=submit Name='SelectADifferentPeriod' Value='"._('Select A Different Period')."'></div>";
+ echo "<br><div class='centre'><input type=submit Name='SelectADifferentPeriod' Value='"._('Select A Different Period')."'></div>";
}
echo '</form>';
include('includes/footer.inc');
-?>
+?>
\ No newline at end of file
Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html 2010-07-08 19:50:19 UTC (rev 3592)
+++ trunk/doc/Change.log.html 2010-07-08 19:50:37 UTC (rev 3593)
@@ -1,5 +1,6 @@
<p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
<p></p>
+<p>08/07/10 Tim: GLProfit_Loss - Layout improvements and sql fixes</p>
<p>08/07/10 Tim: GLJournal - Layout improvements and sql fixes</p>
<p>08/07/10 Tim: GLBudgets - Bug fixes and layout improvements and sql fixes</p>
<p>08/07/10 Tim: index.php - Correct typo</p>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
