Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5029] trunk
|
From: <vv...@us...> - 2012-03-06 00:44:10
|
Revision: 5029
http://web-erp.svn.sourceforge.net/web-erp/?rev=5029&view=rev
Author: vvs2012
Date: 2012-03-06 00:44:02 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BOMIndentedReverse.php
trunk/BOMInquiry.php
trunk/BOMListing.php
trunk/BOMs.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMExtendedQty.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -248,11 +248,10 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <form action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . ' method="post">
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -281,7 +280,9 @@
<div class="centre">
<br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ </div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndented.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -245,14 +245,13 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr>
<td>' . _('Part') . ':</td>
- <td><input type ="text" name="Part" size="20" />
+ <td><input type ="text" name="Part" size="20" /></td>
</tr>
<tr>
<td>' . _('Levels') . ':</td>
@@ -271,11 +270,12 @@
</td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMIndentedReverse.php
===================================================================
--- trunk/BOMIndentedReverse.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMIndentedReverse.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -233,11 +233,10 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <form action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . ' method="post">
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<table class="selection">
- <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
<td>' . _('Part') . ':</td>
<td><input type ="text" name="Part" size="20" /></td>
@@ -250,11 +249,12 @@
</select></td>
</tr>
</table>
- <p>
<div class="centre">
+ <br />
<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
</div>
- </p>';
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/BOMInquiry.php
===================================================================
--- trunk/BOMInquiry.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMInquiry.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -14,21 +14,19 @@
if (!isset($_POST['StockID'])) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
- <b>
+ <div>
<br />
- </b>
<div class="page_help_text">
'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to view the costed bill of materials') . '
- <br />
- <font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '</font>
+ <br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') . '
</div>
<br />
<table class="selection">
<tr>
- <td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="20" /></td>
</tr>
</table>
@@ -105,8 +103,6 @@
AND !isset($SelectedParent)) {
echo '<br />
- <hr>
- <br />
<table class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
@@ -133,7 +129,7 @@
$StockOnHand = locale_number_format($myrow['totalonhand'],2);
}
$tabindex=$j+4;
- printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s"</td>
+ printf('<td><input tabindex="' .$tabindex . '" type="submit" name="StockID" value="%s" /></td>
<td>%s</td>
<td class="number">%s</td>
<td>%s</td>
@@ -149,6 +145,10 @@
echo '</table><br />';
}
+if (!isset($_POST['StockID'])) {
+ echo '</div>
+ </form>';
+}
if (isset($StockID) and $StockID!=""){
@@ -191,7 +191,7 @@
echo '<table class="selection">';
echo '<tr>
<th colspan="5">
- <div class="centre"><font size="4"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b></font>
+ <div class="centre"><b>' . $myrow[0] . ' : ' . _('per') . ' ' . $myrow[1] . '</b>
</div></th>
</tr>';
$TableHeader = '<tr>
@@ -258,9 +258,7 @@
}
if (!isset($_POST['StockID']) or $_POST['StockID']=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
}
-
-echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BOMListing.php
===================================================================
--- trunk/BOMListing.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMListing.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,11 +112,12 @@
/*if $FromCriteria is not set then show a form to allow input */
- echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="POST">
- <table class="selection">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
+ <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
+ <table class="selection">';
- echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</font></td>
+ echo '<tr><td>' . _('From Inventory Part Code') . ':' . '</td>
<td><input tabindex="1" type="text" name="FromCriteria" size="20" maxlength="20" value="1" /></td>
</tr>';
@@ -126,10 +127,12 @@
echo '</table>
- <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
- echo '<script>defaultControl(document.forms[0].FromCriteria);</script>';
+ <br /><div class="centre"><input tabindex="3" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>
+ </div>
+ </form>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].FromCriteria);</script>';
}
- include('includes/footer.inc');;
+ include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/BOMs.php
===================================================================
--- trunk/BOMs.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BOMs.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -112,7 +112,7 @@
$DrillLink = '<div class="centre">'._('No lower levels').'</div>';
$DrillID='';
} else {
- $DrillText = '<a href="%s&Select=%s">' . _('Drill Down');
+ $DrillText = '<a href="%s&Select=%s">' . _('Drill Down') . '</a>';
$DrillLink = htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?';
$DrillID=$myrow['component'];
}
@@ -146,9 +146,9 @@
<td>%s</td>
<td>%s</td>
<td class="number">%s</td>
- <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
- <td>'.$DrillText.'</a></td>
- <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s">' . _('Edit') . '</a></td>
+ <td>'.$DrillText.'</td>
+ <td><a href="%s&Select=%s&SelectedComponent=%s&delete=1&ReSelect=%s" onclick="return confirm(\'' . _('Are you sure you wish to delete this component from the bill of material?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$Level1,
$myrow['component'],
@@ -419,7 +419,6 @@
}
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Select a Different BOM') . '</a></div><br />';
- echo '<table class="selection">';
// Display Manufatured Parent Items
$sql = "SELECT bom.parent,
stockmaster.description,
@@ -433,8 +432,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
$ix = 0;
- $reqnl = 0;
if( DB_num_rows($result) > 0 ) {
+ echo '<table class="selection">';
echo '<tr><td><div class="centre">'._('Manufactured parent items').' : ';
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -442,7 +441,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
- $reqnl = $ix;
+ echo '</table>';
}
// Display Assembly Parent Items
$sql = "SELECT bom.parent,
@@ -457,7 +456,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Assembly parent items').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Assembly parent items').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -465,6 +465,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Kit Sets
$sql = "SELECT bom.parent,
@@ -479,7 +480,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Kit sets').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Kit sets').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -487,6 +489,7 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
// Display Phantom/Ghosts
$sql = "SELECT bom.parent,
@@ -501,7 +504,8 @@
$DbgMsg = _('The SQL used to retrieve description of the parent part was');
$result=DB_query($sql,$db,$ErrMsg,$DbgMsg);
if( DB_num_rows($result) > 0 ) {
- echo (($reqnl)?'<br />':'').'<tr><td><div class="centre">'._('Phantom').' : ';
+ echo '<table class="selection">';
+ echo '<tr><td><div class="centre">'._('Phantom').' : ';
$ix = 0;
while ($myrow = DB_fetch_array($result)){
echo (($ix)?', ':'').'<a href="'.htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select='.$myrow['parent'].'">'.
@@ -509,12 +513,12 @@
$ix++;
} //end while loop
echo '</div></td></tr>';
+ echo '</table>';
}
- echo '</table>
- <br />
+ echo '<br />
<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </font></b></th>
+ <th colspan="13"><div class="centre"><b>' . $SelectedParent .' - ' . $myrow[0] . ' ('. $MBdesc. ') </b></div></th>
</tr>';
$BOMTree = array();
@@ -565,6 +569,7 @@
if (! isset($_GET['delete'])) {
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?Select=' . $SelectedParent .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_GET['SelectedComponent']) and $InputError !=1) {
@@ -596,7 +601,7 @@
echo '<input type="hidden" name="SelectedComponent" value="' . $SelectedComponent . '" />';
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>'. ('Edit Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>'. ('Edit Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component') . ':</td>
@@ -610,7 +615,7 @@
*/
echo '<table class="selection">';
echo '<tr>
- <th colspan="13"><div class="centre"><font color="blue" size="3"><b>' . _('New Component Details') .'</font></b></th>
+ <th colspan="13"><div class="centre"><b>' . _('New Component Details') .'</b></div></th>
</tr>';
echo '<tr>
<td>' . _('Component code') . ':</td>
@@ -707,7 +712,7 @@
</tr>
<tr>
<td>' . _('Quantity') . ': </td>
- <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" class="number" size="10" maxlength="8" value="';
+ <td><input ' . (in_array('Quantity',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="4" type="text" class="number" name="Quantity" size="10" maxlength="8" value="';
if (isset($_POST['Quantity'])){
echo $_POST['Quantity'];
} else {
@@ -757,9 +762,9 @@
echo '</table>
<br /><div class="centre"><input tabindex="8" type="submit" name="Submit" value="' . _('Enter Information') . '" />
-
- </form>
- </div>';
+ </div>
+ </div>
+ </form>';
} //end if record deleted no point displaying form to add record
@@ -831,13 +836,14 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">' .
- '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br /><font size="1">' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '</font>
+ '<div class="page_help_text">'. _('Select a manufactured part') . ' (' . _('or Assembly or Kit part') . ') ' . _('to maintain the bill of material for using the options below') . '<br />' . _('Parts must be defined in the stock item entry') . '/' . _('modification screen as manufactured') . ', ' . _('kits or assemblies to be available for construction of a bill of material') .'</div>'. '
+ <div>
<br />
- <table class="selection" cellpadding="3" colspan="4">
- <tr><td><font size="1">' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</font></td>
+ <table class="selection" cellpadding="3">
+ <tr><td>' . _('Enter text extracts in the') . ' <b>' . _('description') . '</b>:</td>
<td><input tabindex="1" type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter extract of the') . ' <b>' . _('Stock Code') . '</b>:</td>
<td><input tabindex="2" type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
</table>
@@ -849,7 +855,7 @@
AND !isset($SelectedParent)) {
echo '<br />
- <table cellpadding="2" colspan="7" class="selection">';
+ <table cellpadding="2" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
@@ -896,11 +902,11 @@
//end if results to show
if (!isset($SelectedParent) or $SelectedParent=='') {
- echo '<script>defaultControl(document.forms[0].StockCode);</script>';
+ echo '<script type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
} else {
- echo '<script>defaultControl(document.form.JournalProcessDate);</script>';
+ echo '<script type="text/javascript">defaultControl(document.form.JournalProcessDate);</script>';
}
-
+ echo '</div>';
echo '</form>';
} //end StockID already selected
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankAccounts.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -212,15 +212,15 @@
} elseif ($myrow['invoice']==2) {
$DefaultBankAccount=_('Currency Default');
}
- printf('<td>%s<br /><font size="2">%s</font></td>
+ printf('<td>%s<br />%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</td>
- <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%s?SelectedBankAccount=%s">' . _('Edit') . '</a></td>
+ <td><a href="%s?SelectedBankAccount=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this bank account?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['accountcode'],
$myrow['accountname'],
@@ -249,6 +249,7 @@
}
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 (isset($SelectedBankAccount) AND !isset($_GET['delete'])) {
@@ -298,9 +299,9 @@
$result = DB_query($sql,$db);
while ($myrow = DB_fetch_array($result)) {
if (isset($_POST['AccountCode']) and $myrow['accountcode']==$_POST['AccountCode']) {
- echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option selected="selected" value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} else {
- echo '<option value="'.$myrow['accountcode'] . '">' . $myrow['accountname'] . '</option>';
+ echo '<option value="'.$myrow['accountcode'] . '">' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
}
} //end while loop
@@ -336,7 +337,7 @@
</tr>
<tr>
<td>' . _('Bank Address') . ': </td>
- <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="Text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
+ <td><input tabindex="4" ' . (in_array('BankAddress',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="BankAddress" value="' . $_POST['BankAddress'] . '" size="40" maxlength="50" /></td>
</tr>
<tr>
<td>' . _('Currency Of Account') . ': </td>
@@ -358,6 +359,7 @@
} //end while loop
echo '</select></td>';
+echo '</tr>';
echo '<tr>
<td>' . _('Default for Invoices') . ': </td>
@@ -394,7 +396,7 @@
echo '</tr></table><br />
<div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'" /></div>';
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankMatching.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -86,6 +86,7 @@
echo '<div class="page_help_text">' . _('Use this screen to match webERP Receipts and Payments to your Bank Statement. Check your bank statement and click the check-box when you find the matching transaction.') . '</div><br />';
echo '<form action="'. htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="Type" value="' . $Type . '" />';
@@ -120,11 +121,12 @@
// Change to allow input of FROM DATE and then TO DATE, instead of previous back-to-front method, add datepicker
echo '<tr>
<td>' . _('Show') . ' ' . $TypeName . ' ' . _('from') . ':</td>
- <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
+ <td><input tabindex="3" type="text" name="AfterDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['AfterDate'] . '" /></td>
</tr>';
-echo '<td>' . _('to') . ':</td>
- <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onChange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
+echo '<tr>
+ <td>' . _('to') . ':</td>
+ <td><input tabindex="2" type="text" name="BeforeDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" size="12" maxlength="10" onchange="isDate(this, this.value, '."'".$_SESSION['DefaultDateFormat']."'".')" value="' . $_POST['BeforeDate'] . '" /></td>
</tr>';
echo '<tr>
<td colspan="3">' . _('Choose outstanding') . ' ' . $TypeName . ' ' . _('only or all') . ' ' . $TypeName . ' ' . _('in the date range') . ':</td>
@@ -338,6 +340,7 @@
<input type="submit" name="Update" value="' . _('Update Matching') . '" />
</div>';
}
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-03-05 12:50:35 UTC (rev 5028)
+++ trunk/BankReconciliation.php 2012-03-06 00:44:02 UTC (rev 5029)
@@ -9,6 +9,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/money_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
@@ -129,11 +130,10 @@
include ('includes/GLPostings.inc');
echo '</table>
- <p>
+ <br />
<div class="centre">
<input type="submit" tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '" />
</div>
- </p>
<br />';
@@ -196,7 +196,7 @@
AND amount < 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The unpresented cheques could not be retrieved by the SQL because');
$UPChequesResult = DB_query($SQL, $db, $ErrMsg);
@@ -253,7 +253,9 @@
}
//end of while loop
- echo '<tr></tr>
+ echo '<tr>
+ <td><br /></td>
+ </tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all unpresented cheques') . '</td>
<td class="number">' . locale_number_format($TotalUnpresentedCheques,$CurrencyRow['currdecimalplaces']) . '</td>
@@ -272,7 +274,7 @@
AND amount > 0
AND ABS((amount/exrate)-amountcleared)>0.009 ORDER BY transdate";
- echo '<tr></tr>'; /*Bang in a blank line */
+ echo '<tr><td><br /></td></tr>'; /*Bang in a blank line */
$ErrMsg = _('The uncleared deposits could not be retrieved by the SQL because');
@@ -328,6 +330,7 @@
}
//end of while loop
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6">' . _('Total of all uncleared deposits') . '</td>
@@ -335,6 +338,7 @@
</tr>';
$FXStatementBalance = ($Balance*$CurrencyRow['rate'] - $TotalUnpresentedCheques -$TotalUnclearedDeposits);
echo '<tr>
+ <td><br /></td>
</tr>
<tr class="EvenTableRows">
<td colspan="6"><b>' . _('Bank statement balance should be') . ' (' . $CurrencyRow['currcode'] . ')</b></td>
@@ -374,10 +378,10 @@
if (isset($_POST['BankAccount'])) {
echo '<div class="centre">
<p>
- <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
+ <a tabindex="4" href="' . $rootpath . '/BankMatching.php?Type=Payments&Account='.$_POST['BankAccount'].'">' . _('Match off cleared payments') . '</a>
</p>
<br />
- <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
+ <a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts&Account='.$_POST['BankAccount'].'">' . _('Match off cleared deposits') . '</a>
</div>';
} else {
echo '<div class="centre">
@@ -388,7 +392,7 @@
<a tabindex="5" href="' . $rootpath . '/BankMatching.php?Type=Receipts">' . _('Match off cleared deposits') . '</a>
</div>';
}
-
+echo '</div>';
echo '</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
