Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5185] trunk
|
From: <vv...@us...> - 2012-04-01 02:42:55
|
Revision: 5185
http://web-erp.svn.sourceforge.net/web-erp/?rev=5185&view=rev
Author: vvs2012
Date: 2012-04-01 02:42:45 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/GLAccountCSV.php
trunk/GLAccountInquiry.php
trunk/GLAccountReport.php
trunk/GLAccounts.php
trunk/GLBalanceSheet.php
trunk/GLBudgets.php
trunk/GLCodesInquiry.php
trunk/GLJournal.php
trunk/GLProfit_Loss.php
trunk/GLTagProfit_Loss.php
trunk/GLTags.php
trunk/GLTransInquiry.php
trunk/GLTrialBalance.php
trunk/GeocodeSetup.php
trunk/GoodsReceived.php
trunk/GoodsReceivedControlled.php
trunk/Labels.php
trunk/MRP.php
trunk/PDFCustomerList.php
trunk/PDFPriceList.php
trunk/PDFPrintLabel.php
trunk/PDFRemittanceAdvice.php
trunk/PDFStockCheckComparison.php
trunk/PO_SelectOSPurchOrder.php
trunk/PcAuthorizeExpenses.php
trunk/PcReportTab.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/PrintCustStatements.php
trunk/SalesGraph.php
trunk/SecurityTokens.php
trunk/SelectCustomer.php
trunk/SelectSupplier.php
trunk/SelectWorkOrder.php
trunk/StockSerialItemResearch.php
trunk/WhereUsedInquiry.php
trunk/WorkCentres.php
trunk/WorkOrderEntry.php
trunk/WorkOrderIssue.php
trunk/Z_RePostGLFromPeriod.php
trunk/Z_UpdateChartDetailsBFwd.php
trunk/doc/Manual/ManualContents.php
trunk/includes/InputSerialItemsExisting.php
Modified: trunk/GLAccountCSV.php
===================================================================
--- trunk/GLAccountCSV.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountCSV.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -18,7 +18,8 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />';
-echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -28,22 +29,22 @@
echo '<table>
<tr>
<td>'._('Selected Accounts') . ':</td>
- <td><select name="Account[]" multiple>';
+ <td><select name="Account[]" size="12" multiple="multiple">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$AccountsResult = DB_query($sql,$db);
$i=0;
while ($myrow=DB_fetch_array($AccountsResult,$db)){
if(isset($_POST['Account'][$i]) AND $myrow['accountcode'] == $_POST['Account'][$i]){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
$i++;
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'] . '</option>';
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
}
echo '</select></td>';
echo '<td>'._('For Period range').':</td>
- <td><select name="Period[]" multiple>';
+ <td><select name="Period[]" size="12" multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
@@ -67,7 +68,7 @@
ORDER BY tagref";
$result=DB_query($SQL,$db);
-echo '<option value="0">0 - '._('All tags');
+echo '<option value="0">0 - ' . _('All tags') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
@@ -78,8 +79,9 @@
echo '</select></td></tr>';
// End select tag
-echo '</table><p>
+echo '</table><br />
<div class="centre"><input type="submit" name="MakeCSV" value="'._('Make CSV File').'" /></div>
+ </div>
</form>';
/* End of the Form rest of script is what happens if the show button is hit*/
Modified: trunk/GLAccountInquiry.php
===================================================================
--- trunk/GLAccountInquiry.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountInquiry.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -23,7 +23,8 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple periods') . '</div><br />';
-echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -35,9 +36,9 @@
$Account = DB_query($sql,$db);
while ($myrow=DB_fetch_array($Account,$db)){
if($myrow['accountcode'] == $SelectedAccount){
- echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'];
+ echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} else {
- echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . $myrow['accountname'];
+ echo '<option value="' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
}
echo '</select></td></tr>';
@@ -51,30 +52,32 @@
ORDER BY tagref";
$result=DB_query($SQL,$db);
-echo '<option value="0">0 - '._('All tags');
+echo '<option value="0">0 - '._('All tags') . '</option>';
while ($myrow=DB_fetch_array($result)){
if (isset($_POST['tag']) and $_POST['tag']==$myrow['tagref']){
- echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option selected="selected" value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
} else {
- echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'];
+ echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
echo '</select></td></tr>';
// End select tag
-echo '<tr> <td>'._('For Period range').':</td><td><select name=Period[] multiple>';
+echo '<tr> <td>'._('For Period range').':</td><td><select name="Period[]" size="12" multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
while ($myrow=DB_fetch_array($Periods,$db)){
if(isset($SelectedPeriod[$id]) and $myrow['periodno'] == $SelectedPeriod[$id]){
- echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period']));
+ echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
$id++;
} else {
- echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period']));
+ echo '<option value="' . $myrow['periodno'] . '">' . _(MonthAndYearFromSQLDate($myrow['lastdate_in_period'])) . '</option>';
}
}
-echo '</select></td></tr><table>';
-echo '<p><div class="centre"><input type="submit" name="Show" value="'._('Show Account Transactions').'" /></div></form>';
+echo '</select></td></tr></table>';
+echo '<br /><div class="centre"><input type="submit" name="Show" value="'._('Show Account Transactions').'" /></div>
+ </div>
+ </form>';
/* End of the Form rest of script is what happens if the show button is hit*/
Modified: trunk/GLAccountReport.php
===================================================================
--- trunk/GLAccountReport.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccountReport.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -221,7 +221,7 @@
echo '<div class="page_help_text">' . _('Use the keyboard Shift key to select multiple accounts and periods') . '</div><br />';
- echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Dates in SQL format for the last day of last month*/
@@ -231,7 +231,7 @@
echo '<table>
<tr>
<td>'._('Selected Accounts') . ':</td>
- <td><select name="Account[]" multiple>';
+ <td><select name="Account[]" multiple="multiple">';
$sql = "SELECT accountcode, accountname FROM chartmaster ORDER BY accountcode";
$AccountsResult = DB_query($sql,$db);
$i=0;
@@ -246,7 +246,7 @@
echo '</select></td>';
echo '<td>'._('For Period range').':</td>
- <td><select Name=Period[] multiple>';
+ <td><select Name=Period[] multiple="multiple">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$Periods = DB_query($sql,$db);
$id=0;
Modified: trunk/GLAccounts.php
===================================================================
--- trunk/GLAccounts.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLAccounts.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -207,7 +207,8 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" name="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" id="GLAccounts" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($SelectedAccount)) {
@@ -240,7 +241,7 @@
$sql = 'SELECT groupname FROM accountgroups ORDER BY sequenceintb';
$result = DB_query($sql, $db);
- echo '<tr><td>' . _('Account Group') . ':</td><td><select name=Group>';
+ echo '<tr><td>' . _('Account Group') . ':</td><td><select name="Group">';
while ($myrow = DB_fetch_array($result)){
if (isset($_POST['Group']) and $myrow[0]==$_POST['Group']){
@@ -250,17 +251,16 @@
}
echo $myrow[0] . '">' . $myrow[0] . '</option>';
}
+ echo '</select></td></tr></table>';
if (!isset($_GET['SelectedAccount']) or $_GET['SelectedAccount']=='') {
- echo '<script>defaultControl(document.GLAccounts.AccountCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountCode);</script>';
} else {
- echo '<script>defaultControl(document.GLAccounts.AccountName);</script>';
+ echo '<script type="text/javascript">defaultControl(document.GLAccounts.AccountName);</script>';
}
- echo '</select></td></tr></table>';
-
echo '<br /><div class="centre"><input type="submit" name="submit" value="'. _('Enter Information') . '" /></div>';
-
+ echo '</div>';
echo '</form>';
} //end if record deleted no point displaying form to add record
@@ -309,11 +309,11 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href=\"%s&SelectedAccount=%s\">" . _('Edit') . "</td>
- <td><a href=\"%s&SelectedAccount=%s&delete=1\" onclick=\"return confirm('" . _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</td>
+ <td><a href=\"%s&SelectedAccount=%s\">" . _('Edit') . "</a></td>
+ <td><a href=\"%s&SelectedAccount=%s&delete=1\" onclick=\"return confirm('" . _('Are you sure you wish to delete this account? Additional checks will be performed in any event to ensure data integrity is not compromised.') . "');\">" . _('Delete') . "</a></td>
</tr>",
$myrow[0],
- $myrow[1],
+ htmlspecialchars($myrow[1],ENT_QUOTES,'UTF-8'),
$myrow[2],
$myrow[3],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
@@ -328,13 +328,11 @@
//end of ifs and buts!
-echo '<p>';
+echo '<br />';
if (isset($SelectedAccount)) {
echo '<div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Accounts') . '</a></div>';
}
-echo '<p />';
-
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GLBalanceSheet.php
===================================================================
--- trunk/GLBalanceSheet.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLBalanceSheet.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -367,16 +367,16 @@
<table class="selection">
<tr>
<th colspan="6">
- <div class="centre"><font size="4" color="blue"><b>' .
- _('Balance Sheet as at') . ' ' . $BalanceDate .'</b></font>
+ <div class="centre"><h1>' .
+ _('Balance Sheet as at') . ' ' . $BalanceDate .'</h1>
</div>
</th>
</tr>';
if ($_POST['Detail']=='Detailed'){
$TableHeader = '<tr>
- <th>'._('Account').'</td>
- <th>'._('Account Name').'</td>
+ <th>'._('Account').'</th>
+ <th>'._('Account Name').'</th>
<th colspan="2">' . $BalanceDate . '</th>
<th colspan="2">'._('Last Year').'</th>
</tr>';
@@ -428,10 +428,11 @@
<td></td>
</tr>';
}
- printf('<td colspan="2"><I>%s</I></td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2"><I>%s</I></td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -453,10 +454,11 @@
</tr>';
}
- printf('<td colspan="2">%s</td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2">%s</td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -489,7 +491,7 @@
}
printf('<tr>
- <td colspan="3"><font size="4">%s</font></td>
+ <td colspan="3"><h2>%s</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -506,7 +508,7 @@
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h1>%s</h1></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -521,7 +523,7 @@
if ($_POST['Detail']=='Detailed'){
$ActGrp = $myrow['groupname'];
printf('<tr>
- <td colspan="6"><font size="2" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h3>%s</h3></td>
</tr>',
$myrow['groupname']);
echo $TableHeader;
@@ -546,14 +548,14 @@
if ($_POST['Detail']=='Detailed'){
if ($k==1){
- echo '<tr class="EvenTableRows">';
+ echo '<tr class="OddTableRows">';
$k=0;
} else {
echo '<tr class="EvenTableRows">';
$k++;
}
- $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
+ $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['BalancePeriodEnd'] . '&Account=' . $myrow['accountcode'] . '">' . $myrow['accountcode'] . '</a>';
printf('<td>%s</td>
<td>%s</td>
@@ -563,7 +565,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'),
locale_number_format($AccountBalance,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYAccountBalance,$_SESSION['CompanyRecord']['decimalplaces']));
$j++;
@@ -581,10 +583,11 @@
<td></td>
</tr>';
}
- printf('<td colspan="2"><I>%s</I></td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
+ printf('<tr>
+ <td colspan="2"><I>%s</I></td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -602,11 +605,12 @@
</tr>';
}
- printf('<td colspan="2">%s</td>
- <td class="number">%s</td>
- <td></td>
- <td class="number">%s</td>
- </tr>',
+ printf('<tr>
+ <td colspan="2">%s</td>
+ <td class="number">%s</td>
+ <td></td>
+ <td class="number">%s</td>
+ </tr>',
$ParentGroups[$Level],
locale_number_format($GroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($LYGroupTotal[$Level],$_SESSION['CompanyRecord']['decimalplaces'])
@@ -630,7 +634,7 @@
}
printf('<tr>
- <td colspan="3">%s</td>
+ <td colspan="3"><h2>%s</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -643,7 +647,7 @@
if (isset($myrow['sectioninaccounts']) and $_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h1>%s</h1></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -656,7 +660,7 @@
</tr>';
printf('<tr>
- <td colspan="3">'._('Check Total').'</font></td>
+ <td colspan="3"><h2>'._('Check Total').'</h2></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -672,6 +676,7 @@
</tr>';
echo '</table>';
+ echo '</div>';
echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Balance Date').'" /></div>';
echo '</div></form>';
}
Modified: trunk/GLBudgets.php
===================================================================
--- trunk/GLBudgets.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLBudgets.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -28,11 +28,11 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
</p>';
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="selectaccount">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="selectaccount">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo '<table>';
-
-echo '<br />
+echo '<br />';
+echo '<table>
<tr>
<td>'. _('Select GL Account'). ':</td>
<td><select name="SelectedAccount" onchange="ReloadForm(selectaccount.Select)">';
@@ -49,7 +49,7 @@
prnMsg(_('No General ledger accounts have been set up yet') . ' - ' . _('budgets cannot be allocated until the GL accounts are set up'),'warn');
} else {
while ($myrow=DB_fetch_array($result)){
- $Account = $myrow['accountcode'] . ' - ' . $myrow['accountname'];
+ $Account = $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8');
if (isset($SelectedAccount) AND isset($LastCode) AND $SelectedAccount==$myrow['accountcode']){
echo '<option selected="selected" value="' . $myrow['accountcode'] . '">' . $Account . '</option>';
$PrevCode=$LastCode;
@@ -68,9 +68,10 @@
if (!isset($PrevCode)) {$PrevCode='';}
if (!isset($NextCode)) {$NextCode='';}
+echo '</table>';
echo '<input type="hidden" name="PrevAccount" value="'.$PrevCode.'" />';
echo '<input type="hidden" name="NextAccount" value="'.$NextCode.'" />';
-echo '</table>';
+
echo '<br />
<table>
<tr>
@@ -80,6 +81,7 @@
</tr>
</table>
<br />
+ </div>
</form>';
// End of account selection
@@ -157,7 +159,8 @@
// Table Headers
- echo '<form name="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<form id="form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<table class="selection">
@@ -217,8 +220,8 @@
<tr>
<td colspan="2">'._('Annual Budget').'</td>
<td><input class="number" type="text" size="14" name="AnnualAmountLY" value="0.00" /></td>
- </td><td>
<td></td>
+ <td></td>
<td><input class="number" type="text" size="14" name="AnnualAmountTY" value="0.00" /></td>
<td></td>
<td><input onchange="numberFormat(this,2)" class="number" type="text" size="14" name="AnnualAmount" value="0.00" /></td>
@@ -228,12 +231,12 @@
echo '<input type="hidden" name="SelectedAccount" value="'.$SelectedAccount.'" />';
- echo '<script>defaultControl(document.form.1next);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.1next);</script>';
echo '<br />
<div class="centre">
- <input type="submit" name=update value="' . _('Update') . '" />
+ <input type="submit" name="update" value="' . _('Update') . '" />
</div>
-
+ </div>
</form>';
$SQL="SELECT MIN(periodno) FROM periods";
Modified: trunk/GLCodesInquiry.php
===================================================================
--- trunk/GLCodesInquiry.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLCodesInquiry.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -20,11 +20,11 @@
/*show a table of the orders returned by the SQL */
-echo '<table cellpadding="2" colspan="2">
+echo '<table cellpadding="2">
<tr>
- <th>' . _('Group') . '</font></th>
- <th>' . _('Code') . '</font></th>
- <th>' . _('Account Name') . '</font></th>
+ <th><h3>' . _('Group') . '</h3></th>
+ <th><h3>' . _('Code') . '</h3></th>
+ <th><h3>' . _('Account Name') . '</h3></th>
</tr>';
$j = 1;
@@ -42,20 +42,20 @@
if ($myrow['group_']== $ActGrp){
printf('<td></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- </tr>',
- $myrow['accountcode'],
- $myrow['accountname']);
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['accountcode'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
} else {
$ActGrp = $myrow['group_'];
- printf('<td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- <td><font size="2">%s</font></td>
- </tr>',
- $myrow['group_'],
- $myrow['accountcode'],
- $myrow['accountname']);
+ printf('<td><b>%s</b></td>
+ <td>%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['group_'],
+ $myrow['accountcode'],
+ htmlspecialchars($myrow['accountname'],ENT_QUOTES,'UTF-8'));
}
}
//end of while loop
Modified: trunk/GLJournal.php
===================================================================
--- trunk/GLJournal.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLJournal.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -239,7 +239,8 @@
}
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
@@ -254,8 +255,8 @@
}
echo '<table>
- <tr>
- <td colspan="5"><table class="selection">
+ <tr>
+ <td colspan="5"><table class="selection">
<tr>
<td>'._('Date to Process Journal') . ':</td>
<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" name="JournalProcessDate" maxlength="10" size="11" value="' . $_SESSION['JournalDetail']->JnlDate . '" /></td>
@@ -281,7 +282,7 @@
echo '<tr>
<th colspan="3">
- <div class="centre"><font size="3" color="blue"><b>' . _('Journal Line Entry') . '</b></font></div>
+ <div class="centre"><h2>' . _('Journal Line Entry') . '</h2></div>
</th>
</tr>';
@@ -350,11 +351,11 @@
echo '</tr>
<tr>
<th>' . _('Debit') . '</th>
- <td><input type="text" class="number" name = "Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name="Debit" onchange="eitherOr(this, '.'Credit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Debit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<th>' . _('Credit') . '</th>
- <td><input type="text" class="number" Name = "Credit" onchange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
+ <td><input type="text" class="number" name="Credit" onchange="eitherOr(this, '.'Debit'.')" maxlength="12" size="10" value="' . locale_number_format($_POST['Credit'],$_SESSION['CompanyRecord']['decimalplaces']) . '" /></td>
</tr>
<tr>
<td></td>
@@ -376,7 +377,7 @@
echo '<table class="selection" width="85%">
<tr>
- <th colspan="6"><div class="centre"><font size="3" color="blue"><b>' . _('Journal Summary') . '</b></font></div></th>
+ <th colspan="6"><div class="centre"><h2>' . _('Journal Summary') . '</h2></div></th>
</tr>
<tr>
<th>'._('GL Tag').'</th>
@@ -432,7 +433,7 @@
<td class="number"><b>' . locale_number_format($CreditTotal,$_SESSION['CompanyRecord']['decimalplaces']) . '</b></td>
</tr>';
if ($DebitTotal!=$CreditTotal) {
- echo '<td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
+ echo '<tr><td align="center" style="background-color: #fddbdb"><b>' . _('Required to balance') .' - </b>' .
locale_number_format(abs($DebitTotal-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']);
}
if ($DebitTotal>$CreditTotal) {
@@ -440,7 +441,10 @@
} else if ($DebitTotal<$CreditTotal) {
echo ' ' . _('Debit') . '</td></tr>';
}
-echo '</table>';
+echo '</table>
+ </td>
+ </tr>
+ </table>';
if (abs($_SESSION['JournalDetail']->JournalTotal)<0.001 AND $_SESSION['JournalDetail']->GLItemCounter > 0){
echo '<br />
@@ -455,11 +459,11 @@
}
if (!isset($_GET['NewJournal']) or $_GET['NewJournal']=='') {
- echo '<script>defaultControl(document.form.GLManualCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.GLManualCode);</script>';
} else {
- echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GLProfit_Loss.php
===================================================================
--- trunk/GLProfit_Loss.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLProfit_Loss.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -21,13 +21,14 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . _('Print Profit and Loss Report') . '
</p>';
- echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
+ echo '<div class="page_help_text">' . _('Profit and loss statement (P&L), also called an Income Statment, or Statement of Operations, this is the statement that indicates how the revenue (money received from the sale of products and services before expenses are taken out, also known as the "top line") is transformed into the net income (the result after all revenues and expenses have been accounted for, also known as the "bottom line").') .
'<br />'
. _('The purpose of the income statement is to show whether the company made or lost money during the period being reported.') . '<br />'
- . _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
+ . _('The P&L represents a period of time. This contrasts with the Balance Sheet, which represents a single moment in time.') . '<br />'
. _('webERP is an "accrual" based system (not a "cash based" system). Accrual systems include items when they are invoiced to the customer, and when expenses are owed based on the supplier invoice date.') . '</div>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (Date('m') > $_SESSION['YearEnd']){
@@ -41,7 +42,7 @@
$period=GetPeriod($FromDate, $db);
/*Show a form to allow input of criteria for profit and loss to show */
- echo '<p><table class="selection">
+ echo '<br /><table class="selection">
<tr><td>' . _('Select Period From') . ':</td>
<td><select name="FromPeriod">';
@@ -92,7 +93,7 @@
if($myrow['periodno']==$DefaultToPeriod){
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
} else {
- echo '<option value =' . $myrow['periodno'] . '>' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ echo '<option value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
}
}
echo '</select></td></tr>';
@@ -550,6 +551,7 @@
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<input type="hidden" name="FromPeriod" value="' . $_POST['FromPeriod'] . '" />
<input type="hidden" name="ToPeriod" value="' . $_POST['ToPeriod'] . '" />';
@@ -661,7 +663,7 @@
}
if ($Section ==1){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s</i></font></td>
+ <td colspan="2"><h4><i>%s</i></h4></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -675,7 +677,7 @@
locale_number_format(-$GrpPrdLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -707,7 +709,7 @@
if ($Section ==1){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -721,7 +723,7 @@
locale_number_format(-$GrpPrdLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -782,7 +784,7 @@
<td><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">%s</font></td>
+ <td colspan="2"><h2>%s</h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -801,7 +803,7 @@
<td colspan="6"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">'._('Gross Profit').'</font></td>
+ <td colspan="2"><h2>'._('Gross Profit').'</h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -833,7 +835,7 @@
<td colspan="6"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="2"><i>'._('Gross Profit Percent').'</i></font></td>
+ <td colspan="2"><h4><i>'._('Gross Profit Percent').'</i></h4></td>
<td></td>
<td class="number"><i>%s</i></td>
<td></td>
@@ -855,7 +857,7 @@
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color=BLUE><b>%s</b></font></td>
+ <td colspan="6"><h2><b>%s</b></h2></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -911,7 +913,7 @@
$k++;
}
- $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes">' . $myrow['accountcode'] . '</a>';
+ $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes">' . $myrow['accountcode'] . '</a>';
if ($Section ==1){
printf('<td>%s</td>
@@ -924,7 +926,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format(-$AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
@@ -939,7 +941,7 @@
<td></td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodBudget,$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodLY,$_SESSION['CompanyRecord']['decimalplaces']));
@@ -965,7 +967,7 @@
}
if ($Section ==1){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -979,7 +981,7 @@
locale_number_format(-$GrpPrdLY[$Level]),$_SESSION['CompanyRecord']['decimalplaces']);
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -1011,7 +1013,7 @@
if ($Section ==1){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -1025,7 +1027,7 @@
locale_number_format(-$GrpPrdLY[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
<td class="number">%s</td>
@@ -1060,7 +1062,7 @@
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">%s</font></td>
+ <td colspan="2"><h2>%s</h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -1085,7 +1087,7 @@
<td><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">%s</font></td>
+ <td colspan="2"><h2>%s</h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -1104,7 +1106,7 @@
<td colspan="6"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">'._('Gross Profit').'</font></td>
+ <td colspan="2"><h2>'._('Gross Profit').'</h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -1136,7 +1138,7 @@
<td colspan="6"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="2"><i>'._('Gross Profit Percent').'</i></font></td>
+ <td colspan="2"><h4><i>'._('Gross Profit Percent').'</i></h4></td>
<td></td>
<td class="number"><i>%s</i></td>
<td></td>
@@ -1158,7 +1160,7 @@
if ($_POST['Detail']=='Detailed' and isset($Sections[$myrow['sectioninaccounts']])){
printf('<tr>
- <td colspan="6"><font size="4" color=BLUE><b>%s</b></font></td>
+ <td colspan="6"><h2><b>%s</b></h2></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -1172,7 +1174,7 @@
</tr>';
printf('<tr style="background-color:#ffffff">
- <td colspan="2"><font size="4" color="blue"><b>'._('Profit').' - '._('Loss').'</b></font></td>
+ <td colspan="2"><h2><b>'._('Profit').' - '._('Loss').'</b></h2></td>
<td></td>
<td class="number">%s</td>
<td></td>
@@ -1205,7 +1207,7 @@
</tr>';
printf('<tr>
- <td colspan="2"><font size="2"><i>'._('Net Profit Percent').'</i></font></td>
+ <td colspan="2"><h4><i>'._('Net Profit Percent').'</i></h4></td>
<td></td>
<td class="number"><i>%s</i></td>
<td></td>
@@ -1226,6 +1228,7 @@
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="SelectADifferentPeriod" value="' . _('Select A Different Period') . '" /></div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/GLTagProfit_Loss.php
===================================================================
--- trunk/GLTagProfit_Loss.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLTagProfit_Loss.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -17,6 +17,7 @@
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/printer.png" title="' . _('Print') . '" alt="" />' . ' ' . $title . '
@@ -85,7 +86,7 @@
if($myrow['periodno']==$DefaultToPeriod){
echo '<option selected="selected" value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
} else {
- echo '<option value =' . $myrow['periodno'] . '>' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
+ echo '<option value="' . $myrow['periodno'] . '">' . MonthAndYearFromSQLDate($myrow['lastdate_in_period']) . '</option>';
}
}
echo '</select></td></tr>';
@@ -108,7 +109,7 @@
echo '<option value="' . $myrow['tagref'] . '">' . $myrow['tagref'].' - ' .$myrow['tagdescription'] . '</option>';
}
}
- echo '</select></td>';
+ echo '</select></td></tr>';
// End select tag
echo '<tr>
@@ -464,6 +465,7 @@
include('includes/header.inc');
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<input type="hidden" name="FromPeriod" value="' . $_POST['FromPeriod'] . '" />
<input type="hidden" name="ToPeriod" value="' . $_POST['ToPeriod'] . '" />';
@@ -522,7 +524,7 @@
echo '<tr>
<th colspan="9">
<div class="centre">
- <font size="3" color="blue"><b>' . _('Statement of Income and Expenditure for Tag'). ' ' . $myrow[0]._('during the'). ' ' . $NumberOfMonths . ' ' . _('months to'). ' ' . $PeriodToDate . '</b></font>
+ <h2><b>' . _('Statement of Income and Expenditure for Tag'). ' ' . $myrow[0]._('during the'). ' ' . $NumberOfMonths . ' ' . _('months to'). ' ' . $PeriodToDate . '</b></h2>
</div>
</th>
</tr>';
@@ -581,7 +583,7 @@
if ($Section ==3){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -589,7 +591,7 @@
locale_number_format($GrpPrdActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
</tr>',
@@ -615,7 +617,7 @@
if ($Section ==4){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -623,7 +625,7 @@
locale_number_format(-$GrpPrdActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s</i></font></td>
+ <td colspan="2"><h4><i>%s</i></h4></td>
<td class="number">%s</td>
<td></td>
</tr>',
@@ -649,7 +651,7 @@
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">%s</font></td>
+ <td colspan="2"><h2>%s</h2></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -662,7 +664,7 @@
<td colspan="2"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">%s</font></td>
+ <td colspan="2"><h2>%s</h2></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -679,7 +681,7 @@
<td colspan="5"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="4">'._('Gross Profit').'</font></td>
+ <td colspan="2"><h2>'._('Gross Profit').'</h2></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -695,7 +697,7 @@
<td colspan="6"><hr /></td>
</tr>';
printf('<tr>
- <td colspan="2"><font size="2"><i>'._('Gross Profit Percent').'</i></font></td>
+ <td colspan="2"><h4><i>'._('Gross Profit Percent').'</i></h4></td>
<td></td>
<td class="number"><i>%s</i></td>
</tr><tr><td colspan="6"> </td></tr>',
@@ -709,7 +711,7 @@
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h2><b>%s</b></h2></td>
</tr>',
$Sections[$myrow['sectioninaccounts']]);
}
@@ -727,7 +729,7 @@
$ActGrp = $myrow['groupname'];
if ($_POST['Detail']=='Detailed'){
printf('<tr>
- <td colspan="6"><font size="2" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h4><b>%s</b></h4></td>
</tr>',
$myrow['groupname']);
@@ -758,7 +760,7 @@
$k++;
}
- $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['account'] . '&Show=Yes">' . $myrow['account'] . '</a>';
+ $ActEnquiryURL = '<a href="' . $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['account'] . '&Show=Yes">' . $myrow['account'] . '</a>';
if ($Section ==4){
printf('<td>%s</td>
@@ -767,7 +769,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
} else {
printf('<td>%s</td>
@@ -775,7 +777,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
locale_number_format(-$AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']));
}
@@ -799,13 +801,13 @@
}
if ($Section ==4){ /*Income */
echo '<tr>
- <td colspan="2"><font size="2"><i>' . $ActGrpLabel . '</i></font></td>
+ <td colspan="2"><h4><i>' . $ActGrpLabel . '</i></h4></td>
<td></td>
<td class="number">' . locale_number_format(-$GrpPrdActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
} else { /*Costs */
echo '<tr>
- <td colspan="2"><font size="2"><i>' . $ActGrpLabel . '</i></font></td>
+ <td colspan="2"><h4><i>' . $ActGrpLabel . '</i></h4></td>
<td class="number">' . locale_number_format($GrpPrdActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
}
@@ -826,7 +828,7 @@
if ($Section ==4){ /*Income */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s</i></font></td>
+ <td colspan="2"><h4><i>%s</i></h4></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -834,7 +836,7 @@
locale_number_format(-$GrpPrdActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']));
} else { /*Costs */
printf('<tr>
- <td colspan="2"><font size="2"><i>%s </i></font></td>
+ <td colspan="2"><h4><i>%s </i></h4></td>
<td class="number">%s</td>
<td></td>
</tr>',
@@ -856,7 +858,7 @@
<td colspan="2"><hr /></td>
</tr>
<tr>
- <td colspan="2"><font size="4">' . $Sections[$Section] . '</font></td>
+ <td colspan="2"><h2>' . $Sections[$Section] . '</h2></td>
<td></td>
<td class="number">' . locale_number_format($SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
@@ -867,7 +869,7 @@
<td colspan="2"><hr /></td>
</tr>
<tr>
- <td colspan="2"><font size="4">' . $Sections[$Section] . '</font></td>
+ <td colspan="2"><h2>' . $Sections[$Section] . '</h2></td>
<td></td>
<td class="number">' . locale_number_format(-$SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
@@ -878,7 +880,7 @@
<td colspan="2"><hr /></td>
</tr>
<tr>
- <td colspan="2"><font size="4">'._('Gross Profit').'</font></td>
+ <td colspan="2"><h2>'._('Gross Profit').'</h2></td>
<td></td>
<td class="number">' . locale_number_format($TotalIncome - $SectionPrdActual,$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
</tr>';
@@ -893,7 +895,7 @@
<td colspan="2"><hr /></td>
</tr>
<tr>
- <td colspan="2"><font size="2"><i>'._('Gross Profit Percent').'</i></font></td>
+ <td colspan="2"><h4><i>'._('Gross Profit Percent').'</i></h4></td>
<td></td>
<td class="number"><i>' . locale_number_format($PrdGPPercent,1) . '%</i></td>
<td></td>
@@ -908,7 +910,7 @@
if ($_POST['Detail']=='Detailed' AND isset($Sections[$myrow['sectioninaccounts']])){
echo '<tr>
- <td colspan="6"><font size="4" color="blue"><b>' . $Sections[$myrow['sectioninaccounts']] . '</b></font></td>
+ <td colspan="6"><h2><b>' . $Sections[$myrow['sectioninaccounts']] . '</b></h2></td>
</tr>';
}
$j++;
@@ -921,7 +923,7 @@
</tr>';
printf('<tr style="background-color:#ffffff">
- <td colspan="2"><font size="4" color="blue"><b>'._('Surplus').' - '._('Deficit').'</b></font></td>
+ <td colspan="2"><h2><b>'._('Surplus').' - '._('Deficit').'</b></h2></td>
<td></td>
<td class="number">%s</td>
</tr>',
@@ -936,6 +938,7 @@
<input type="submit" name="SelectADifferentPeriod" value="'._('Select A Different Period').'" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/GLTags.php
===================================================================
--- trunk/GLTags.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLTags.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -51,7 +51,8 @@
_('Print') . '" alt="" />' . ' ' . $title . '
</p>';
-echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" name="form">';
+echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" id="form">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br />
<table>
@@ -69,7 +70,8 @@
echo '</td>
</tr>
</table>
- <p />
+ <br />
+ </div>
</form>
<table class="selection">
<tr>
@@ -88,14 +90,14 @@
echo '<tr>
<td>' . $myrow['tagref'] . '</td>
<td>' . $myrow['tagdescription'] . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTag=' . $myrow['tagref'] . '&Action=edit">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTag=' . $myrow['tagref'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this GL tag?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTag=' . $myrow['tagref'] . '&Action=edit">' . _('Edit') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedTag=' . $myrow['tagref'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this GL tag?') . '\');">' . _('Delete') . '</a></td>
</tr>';
}
echo '</table>';
-echo '<script>defaultControl(document.form.Description);</script>';
+echo '<script type="text/javascript">defaultControl(document.form.Description);</script>';
include('includes/footer.inc');
Modified: trunk/GLTransInquiry.php
===================================================================
--- trunk/GLTransInquiry.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLTransInquiry.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -6,7 +6,7 @@
$title = _('General Ledger Transaction Inquiry');
include('includes/header.inc');
-$MenuURL = '<a href="'. $rootpath . '/index.php?&Application=GL">' . _('General Ledger Menu') . '</a></div>';
+$MenuURL = '<div><a href="'. $rootpath . '/index.php?&Application=GL">' . _('General Ledger Menu') . '</a></div>';
if ( !isset($_GET['TypeID']) OR !isset($_GET['TransNo']) ) {
prnMsg(_('This page requires a valid transaction type and number'),'warn');
@@ -36,7 +36,7 @@
. _('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>
+ <th colspan="7"><h2><b>' . $TransName . ' ' . $_GET['TransNo'] . '</b></h2></th>
</tr>
<tr>
<th>' . _('Date') . '</th>
@@ -76,18 +76,18 @@
if ( $TransRow['amount'] > 0) {
$DebitAmount = locale_number_format($TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$DebitTotal += $TransRow['amount'];
- $CreditAmount = ' ';
+ $CreditAmount = ' ';
} else {
$CreditAmount = locale_number_format(-$TransRow['amount'],$_SESSION['CompanyRecord']['decimalplaces']);
$CreditTotal += $TransRow['amount'];
- $DebitAmount = ' ';
+ $DebitAmount = ' ';
}
if ( $TransRow['posted']==0 ){
$Posted = _('No');
}
if ( $TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact'] ) {
$URL = $rootpath . '/CustomerInquiry.php?CustomerID=';
- $date = '&TransAfterDate=' . $TranDate;
+ $date = '&TransAfterDate=' . $TranDate;
$DetailSQL = "SELECT debtortrans.debtorno,
debtortrans.ovamount,
@@ -101,7 +101,7 @@
$DetailResult = DB_query($DetailSQL,$db);
} elseif ( $TransRow['account'] == $_SESSION['CompanyRecord']['creditorsact'] ) {
$URL = $rootpath . '/SupplierInquiry.php?SupplierID=';
- $date = '&FromDate=' . $TranDate;
+ $date = '&FromDate=' . $TranDate;
$DetailSQL = "SELECT supptrans.supplierno,
supptrans.ovamount,
@@ -117,7 +117,7 @@
$URL = $rootpath . '/GLAccountInquiry.php?Account=' . $TransRow['account'];
if( mb_strlen($TransRow['narrative'])==0 ) {
- $TransRow['narrative'] = ' ';
+ $TransRow['narrative'] = ' ';
}
if ($j==1) {
@@ -142,18 +142,18 @@
if ( $TransRow['amount'] > 0){
if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
$Debit = locale_number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Credit = ' ';
+ $Credit = ' ';
} else {
$Debit = locale_number_format((-$DetailRow[1] - $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Credit = ' ';
+ $Credit = ' ';
}
} else {
if ($TransRow['account'] == $_SESSION['CompanyRecord']['debtorsact']) {
$Credit = locale_number_format(-($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Debit = ' ';
+ $Debit = ' ';
} else {
$Credit = locale_number_format(($DetailRow[1] + $DetailRow[2]) / $DetailRow[3],$_SESSION['CompanyRecord']['decimalplaces']);
- $Debit = ' ';
+ $Debit = ' ';
}
}
@@ -182,17 +182,14 @@
<td class="number" colspan="3"><b>' . _('Total') . '</b></td>
<td class="number">' . locale_number_format(($DebitTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
<td class="number">' . locale_number_format((-$CreditTotal),$_SESSION['CompanyRecord']['decimalplaces']) . '</td>
- <td colspan="2"> </td>
+ <td colspan="2"> </td>
</tr>';
- echo '</table><p>';
+ echo '</table>';
}
}
-echo '</td>
- </tr>
- </table>';
-
+
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/GLTrialBalance.php
===================================================================
--- trunk/GLTrialBalance.php 2012-03-31 14:49:04 UTC (rev 5184)
+++ trunk/GLTrialBalance.php 2012-04-01 02:42:45 UTC (rev 5185)
@@ -29,7 +29,8 @@
echo '<p class="page_title_text">
<img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Trial Balance') . '" alt="" />' . ' ' . $title . '
</p>';
- echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (Date('m') > $_SESSION['YearEnd']){
@@ -47,7 +48,7 @@
echo '<table class="selection">
<tr>
<td>' . _('Select Period From:') . '</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
$NextYear = date('Y-m-d',strtotime('+1 Year'));
$sql = "SELECT periodno,
lastdate_in_period
@@ -83,7 +84,7 @@
echo '<tr>
<td>' . _('Select Period To:') .'</td>
- <td><select Name="ToPeriod">';
+ <td><select name="ToPeriod">';
$RetResult = DB_data_seek($Periods,0);
@@ -101,7 +102,7 @@
<br />';
echo '<div class="centre">
- <input type="submit" Name="ShowTB" value="' . _('Show Trial Balance') .'" />
+ <input type="submit" name="ShowTB" value="' . _('Show Trial Balance') .'" />
<input type="submit" name="PrintPDF" value="'._('PrintPDF').'" />
</div>';
@@ -383,7 +384,8 @@
} else {
include('includes/header.inc');
- echo '<form method="POST" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="FromPeriod" value="' . $_POST['FromPeriod'] . '" />
<input type="hidden" name="ToPeriod" value="' . $_POST['ToPeriod'] . '" />';
@@ -482,11 +484,11 @@
$ParentGroups[$Level]='';
} elseif ($ParentGroups[$Level]==$myrow['parentgroupname']) {
printf('<tr>
- <td colspan="2"><I>%s ' . _('Total') . ' </I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
+ <td colspan="2"><i>%s ' . _('Total') . ' </i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GrpActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -502,11 +504,11 @@
} else {
do {
printf('<tr>
- <td colspan="2"><I>%s ' . _('Total') . ' </I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
+ <td colspan="2"><i>%s ' . _('Total') . ' </i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GrpActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -526,11 +528,11 @@
if ($Level>0){
printf('<tr>
- <td colspan="2"><I>%s ' . _('Total') . ' </I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
+ <td colspan="2"><i>%s ' . _('Total') . ' </i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GrpActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -551,7 +553,7 @@
$ParentGroups[$Level]=$myrow['groupname'];
$ActGrp = $myrow['groupname'];
printf('<tr>
- <td colspan="6"><font size="4" color="blue"><b>%s</b></font></td>
+ <td colspan="6"><h2>%s</h2></td>
</tr>',
$myrow['groupname']);
echo $TableHeader;
@@ -611,7 +613,7 @@
$CheckPeriodActual += $AccountPeriodActual;
$CheckPeriodBudget += $AccountPeriodBudget;
- $ActEnquiryURL = '<a href="'. $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes">' . $myrow['accountcode'] . '<a>';
+ $ActEnquiryURL = '<a href="'. $rootpath . '/GLAccountInquiry.php?Period=' . $_POST['ToPeriod'] . '&Account=' . $myrow['accountcode'] . '&Show=Yes">' . $myrow['accountcode'] . '</a>';
printf('<td>%s</td>
<td>%s</td>
@@ -621,7 +623,7 @@
<td class="number">%s</td>
</tr>',
$ActEnquiryURL,
- $myrow['accountname'],
+ htmlspecialchars($myrow['accountname'], ENT_QUOTES,'UTF-8'),
locale_number_format($myrow['monthactual'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($myrow['monthbudget'],$_SESSION['CompanyRecord']['decimalplaces']),
locale_number_format($AccountPeriodActual,$_SESSION['CompanyRecord']['decimalplaces']),
@@ -638,11 +640,11 @@
$ParentGroups[$Level]=$myrow['groupname'];
} elseif ($ParentGroups[$Level]==$myrow['parentgroupname']) {
printf('<tr>
- <td colspan="2"><I>%s ' . _('Total') . ' </I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></td>
+ <td colspan="2"><i>%s ' . _('Total') . ' </i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
+ <td class="number"><i>%s</i></td>
</tr>',
$ParentGroups[$Level],
locale_number_format($GrpActual[$Level],$_SESSION['CompanyRecord']['decimalplaces']),
@@ -658,11 +660,11 @@
} else {
do {
printf('<tr>
- <td colspan="2"><I>%s ' . _('Total') . ' </I></td>
- <td class="number"><I>%s</I></td>
- <td class="number"><I>%s</I></...
[truncated message content] |
