Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5238] trunk
|
From: <vv...@us...> - 2012-04-10 22:06:06
|
Revision: 5238
http://web-erp.svn.sourceforge.net/web-erp/?rev=5238&view=rev
Author: vvs2012
Date: 2012-04-10 22:05:59 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/SalesAnalReptCols.php
trunk/SalesAnalRepts.php
trunk/SalesByTypePeriodInquiry.php
trunk/SalesCategories.php
trunk/SalesCategoryPeriodInquiry.php
trunk/SalesGLPostings.php
trunk/SalesGraph.php
trunk/SalesInquiry.php
trunk/SalesPeople.php
trunk/SalesTopItemsInquiry.php
trunk/SalesTypes.php
trunk/SecurityTokens.php
trunk/SelectAsset.php
trunk/SelectCompletedOrder.php
trunk/SelectContract.php
trunk/SelectCreditItems.php
Modified: trunk/SalesAnalReptCols.php
===================================================================
--- trunk/SalesAnalReptCols.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalReptCols.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -258,8 +258,8 @@
<th>' . _('Prd From') . '</th>
<th>' . _('Prd To') . '</th>
<th>' . _('Data') . '</th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Numerator') . '</font></th>
- <th>' . _('Col') . ' #<br /><font size="1">' . _('Denominator') . '</font></th>
+ <th>' . _('Col') . ' #<br />' . _('Numerator') . '</th>
+ <th>' . _('Col') . ' #<br />' . _('Denominator') . '</th>
<th>' . _('Operator') . '</th>
<th>' . _('Budget') . '<br />' . _('Or Actual') . '</th>
</tr>';
@@ -285,7 +285,7 @@
$BudOrAct = _('N/A');
}
- printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
+ printf('<td><a href=\'%sReportID=%s&SelectedCol=%s\'>%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -296,7 +296,7 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</td></tr>',
+ <td><a href="%sReportID=%s&SelectedCol=%s&delete=1">' . _('Delete') . '</a></td></tr>',
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$ReportID,
$myrow[1],
@@ -319,8 +319,7 @@
//END WHILE LIST LOOP
}
-echo '</table>
- <br />
+echo '</table><br />
<div class="centre">
<a href="' . $rootpath . '/SalesAnalRepts.php">' . _('Maintain Report Headers') . '</a>
</div>';
@@ -335,6 +334,7 @@
$myrow=DB_fetch_array($result);
$ReportHeading=$myrow['reportheading'];
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="ReportHeading" value="'.$ReportHeading.'" />';
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
@@ -386,13 +386,13 @@
echo '<table class="selection">';
} else {
- echo '<table class="selection">';
+ echo '<br /><table class="selection">';
if (!isset($_POST['ColID'])) {
$_POST['ColID']=1;
}
echo '<tr>
<td>' . _('Column Number') . ':</td>
- <td><input type="text" class="number" name=ColID size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> <font size="1" />(' . _('A number between 1 and 10 is expected') . ')</font></td>
+ <td><input type="text" class="number" name="ColID" size="3" maxlength="3" value="' . $_POST['ColID'] . '" /> (' . _('A number between 1 and 10 is expected') . ')</td>
</tr>';
}
if (!isset($_POST['Heading1'])) {
@@ -429,7 +429,7 @@
echo '<tr>
<td>' . _('From Period') . ':</td>
- <td><select name="PeriodFrom"';
+ <td><select name="PeriodFrom">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -445,7 +445,7 @@
echo '<tr>
<td>' . _('ToPeriod') . ':</td>
- <td><select name="PeriodTo"';
+ <td><select name="PeriodTo">';
$sql = "SELECT periodno, lastdate_in_period FROM periods ORDER BY periodno DESC";
$ErrMsg = _('Could not load periods table');
$result = DB_query($sql,$db,$ErrMsg);
@@ -475,14 +475,14 @@
echo '<option value="0">' . _('Budget') . '</option>';
echo '<option selected="selected" value="1">' . _('Actual') . '</option>';
}
- echo '</select></td>
- </tr>';
+ echo '</select>';
echo '<input type="hidden" name="ValFormat" value="N" />
<input type="hidden" name="ColNumerator" value="0" />
<input type="hidden" name="ColDenominator" value="0" />
<input type="hidden" name="CalcOperator" value="" />
<input type="hidden" name="Constant" value="0" />';
-
+ echo '</td>
+ </tr>';
} else { /*it IS a calculated column */
echo '<tr>
@@ -551,6 +551,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesAnalRepts.php
===================================================================
--- trunk/SalesAnalRepts.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesAnalRepts.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -57,7 +57,7 @@
/* end of function */
-echo '<p>';
+echo '<br />';
if (isset($_GET['SelectedReport'])) {
$SelectedReport = $_GET['SelectedReport'];
@@ -280,7 +280,8 @@
echo '<table class="selection">';
echo '<tr>
<th>' . _('Report No') . '</th>
- <th>' . _('Report Title') . '</th>';
+ <th>' . _('Report Title') . '</th>
+ </tr>';
$k=0; //row colour counter
@@ -296,11 +297,11 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
+ <td><a href="%s&SelectedReport=%s">' . _('Design') . '</a></td>
<td><a href="%s/SalesAnalReptCols.php?ReportID=%s">' . _('Define Columns') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
- <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
- <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\"' . _('Are you sure you wish to remove this report design?') . '\");">' . _('Delete') . '</td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProducePDF=True">' . _('Make PDF Report') . '</a></td>
+ <td><a href="%s/SalesAnalysis_UserDefined.php?ReportID=%s&ProduceCVSFile=True">' . _('Make CSV File') . '</a></td>
+ <td><a href="%s&SelectedReport=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to remove this report design?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow[0],
$myrow[1],
@@ -317,7 +318,7 @@
}
//END WHILE LIST LOOP
- echo '</table><p>';
+ echo '</table><br />';
}
//end of ifs and buts!
@@ -328,11 +329,12 @@
echo '<a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Show All Defined Reports') . '</a>';
}
-echo '<p />';
+echo '<br />';
if (!isset($_GET['delete'])) {
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($SelectedReport)) {
@@ -385,12 +387,12 @@
echo '<input type="hidden" name="ReportID" value="' . $ReportID . '" />';
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Edit The Selected Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Edit The Selected Report') . '</h3></th>
</tr>';
} else {
echo '<table width="98%" class="selection">
<tr>
- <th colspan="8"><font size="3" color="blue">' . _('Define A New Report') . '</font></th>
+ <th colspan="8"><h3>' . _('Define A New Report') . '</h3></th>
</tr>';
}
@@ -513,6 +515,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesByTypePeriodInquiry.php
===================================================================
--- trunk/SalesByTypePeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesByTypePeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -19,11 +19,12 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="Form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="2" class="selection">
- <tr><td valign=top>
+ <tr><td valign="top">
<table>';
echo '<tr><th colspan="2" class="centre">' . _('Date Selection') . '</th>
@@ -32,7 +33,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)"/></td>
</tr>
@@ -40,7 +41,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -48,7 +49,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -56,7 +57,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -84,7 +85,7 @@
<td>' . _('Daily') . ':</td>
<td><input type="radio" name="DisplayData" value="Daily" ';
if ($_POST['DisplayData']=='Daily'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -92,7 +93,7 @@
<td>' . _('Weekly') . ':</td>
<td><input type="radio" name="DisplayData" value="Weekly" ';
if ($_POST['DisplayData']=='Weekly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -100,7 +101,7 @@
<td>' . _('Monthly') . ':</td>
<td><input type="radio" name="DisplayData" value="Monthly" ';
if ($_POST['DisplayData']=='Monthly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>
@@ -108,7 +109,7 @@
<td>' . _('Quarterly') . ':</td>
<td><input type="radio" name="DisplayData" value="Quarterly" ';
if ($_POST['DisplayData']=='Quarterly'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(Form1.ShowSales)" /></td>
</tr>';
@@ -121,6 +122,7 @@
<div class="centre">
<input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />
</div>
+ </div>
</form>
<br />';
Modified: trunk/SalesCategories.php
===================================================================
--- trunk/SalesCategories.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategories.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -194,7 +194,7 @@
$CategoryPath = $CategoryPath.$TempPath;
-echo '<p><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </b></div></p>';
+echo '<br /><div class="centre"><i>' . _('Selected Sales Category Path') . '</i> : '. $CategoryPath . ' * </div>';
// END Calculate Path for navigation
// ----------------------------------------------------------------------------------------
@@ -216,7 +216,7 @@
$result = DB_query($sql,$db);
-echo '<p>';
+echo '<br />';
if (DB_num_rows($result) == 0) {
prnMsg(_('There are no categories defined at this level.'));
} else {
@@ -271,7 +271,6 @@
//END WHILE LIST LOOP
echo '</table>';
}
-echo '</p>';
// END display Categories
// ----------------------------------------------------------------------------------------
@@ -281,7 +280,8 @@
// ----------------------------------------------------------------------------------------
// Show New or Edit Category
-echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
// This array will contain the stockids in use for this category
@@ -328,7 +328,8 @@
echo '</table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Submit Information') . '" /></div>';
-echo '</form></p>';
+echo '</div>
+ </form>';
// END Show New or Edit Category
// ----------------------------------------------------------------------------------------
@@ -366,7 +367,8 @@
$result = DB_query($sql,$db);
if($result && DB_num_rows($result)) {
// continue id stock id in the stockid array
- echo '<p><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<br /><form enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if( isset($SelectedCategory) ) { // If we selected a category we need to keep it selected
echo '<input type="hidden" name="SelectedCategory" value="' . $SelectedCategory . '" />';
@@ -391,8 +393,8 @@
echo '</select>';
echo '</td></tr></table>';
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Add Inventory Item') . '" /></div>';
- echo '';
- echo '</form></p>';
+ echo '</div>
+ </form>';
} else {
echo '<p>';
echo prnMsg( _('No more Inventory items to add') );
@@ -407,7 +409,7 @@
// ----------------------------------------------------------------------------------------
// Always Show Stock In Category
-echo '<p>';
+echo '<br />';
$sql = "SELECT scp.stockid, sm.description FROM salescatprod scp
LEFT JOIN stockmaster sm ON sm.stockid = scp.stockid
WHERE scp.salescatid". (isset($ParentCategory)?('='.$ParentCategory):' is NULL') . "
@@ -442,7 +444,6 @@
}
DB_free_result($result);
}
-echo '</p>';
// ----------------------------------------------------------------------------------------
// END Always Show Stock In Category
Modified: trunk/SalesCategoryPeriodInquiry.php
===================================================================
--- trunk/SalesCategoryPeriodInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesCategoryPeriodInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="2" class="selection">';
@@ -25,7 +26,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -33,7 +34,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -41,7 +42,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -49,7 +50,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>';
@@ -72,7 +73,9 @@
echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />';
-echo '</form></div>';
+echo '</div>';
+echo '</div>
+ </form>';
echo '<br />';
Modified: trunk/SalesGLPostings.php
===================================================================
--- trunk/SalesGLPostings.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGLPostings.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -129,12 +129,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -242,12 +242,12 @@
<td>%s</td>
<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</td></tr>',
+ <td><a href="%sSelectedSalesPostingID=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedSalesPostingID=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales GL posting record?') . '\');">'. _('Delete') . '</a></td></tr>',
$myrow[1],
$myrow[2],
$myrow[3],
- $myrow[4],
+ htmlspecialchars($myrow[4],ENT_QUOTES,'UTF-8'),
$myrow[5],
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?',
$myrow[0],
@@ -269,6 +269,7 @@
if (!isset($_GET['delete'])) {
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($SelectedSalesPostingID)) {
@@ -389,13 +390,13 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} //end while loop
DB_data_seek($result,0);
- echo '</td></tr>
+ echo '</select></td></tr>
<tr><td>' . _('Post Discount to GL Account') . ':</td>
<td><select name="DiscountGLCode">';
@@ -405,7 +406,7 @@
} else {
echo '<option value="';
}
- echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['accountname'] . '</option>';
+ echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . htmlspecialchars($myrow['accountname'], ENT_QUOTES, 'UTF-8') . '</option>';
} //end while loop
@@ -415,7 +416,8 @@
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesGraph.php
===================================================================
--- trunk/SalesGraph.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesGraph.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -29,13 +29,14 @@
OR $SelectADifferentPeriod==_('Select A Different Period')){
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/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
echo '<table class="selection">
<tr><td>' . _('Select Period From:') . '</td>
- <td><select Name="FromPeriod">';
+ <td><select name="FromPeriod">';
if (Date('m') > $_SESSION['YearEnd']){
/*Dates in SQL format */
@@ -114,7 +115,7 @@
}
echo '<tr>
<td>' . _('For Stock Category:') .'</td>
- <td><select Name="CategoryID">';
+ <td><select name="CategoryID">';
if($_POST['CategoryID']=='All'){
echo '<option selected="selected" value="All">' . _('All') . '</option>';
} else {
@@ -176,20 +177,22 @@
$_POST['ValueTo']='';
}
echo '<tr><td>' . _('Graph On:') . '</td><td>
- <input type="radio"" name="GraphOn" value="All" CHECKED />' . _('All') . '<br />
- <input type="radio"" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
- <input type="radio"" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
+ <input type="radio" name="GraphOn" value="All" checked="checked" />' . _('All') . '<br />
+ <input type="radio" name="GraphOn" value="Customer" />' . _('Customer') . '<br />
+ <input type="radio" name="GraphOn" value="StockID" />' . _('Item Code') . '</td></tr>';
echo '<tr><td>' . _('From:') . ' <input type="text" name="ValueFrom" value="' . $_POST['ValueFrom'] . '" /></td>
<td>' . _('To:') . ' <input type="text" name="ValueTo" value="' . $_POST['ValueTo'] . '" /></td></tr>';
echo '<tr><td>' . _('Graph Value:') . '</td><td>
- <input type="radio"" name="GraphValue" value="Net" CHECKED />' . _('Net Sales Value') . '<br />
- <input type="radio"" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
- <input type="radio"" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
+ <input type="radio" name="GraphValue" value="Net" checked="checked" />' . _('Net Sales Value') . '<br />
+ <input type="radio" name="GraphValue" value="GP" />' . _('Gross Profit') . '<br />
+ <input type="radio" name="GraphValue" value="Quantity" />' . _('Quantity') . '</td></tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" Name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="ShowGraph" value="' . _('Show Sales Graph') .'" /></div>';
+ echo '</div>
+ </form>';
include('includes/footer.inc');
} else {
Modified: trunk/SalesInquiry.php
===================================================================
--- trunk/SalesInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -1038,6 +1038,7 @@
// the page is called.
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">
+ <div>
<br/>
<br/>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -1050,7 +1051,7 @@
<option selected="selected" value="Detail">' . _('Detail') . '</option>
<option value="Summary">' . _('Summary') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
@@ -1060,7 +1061,7 @@
<option selected="selected" value="0">' . _('Sales Order') . '</option>
<option value="1">' . _('Quotation') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1069,7 +1070,7 @@
<option selected="selected" value="Order">' . _('Order Date') . '</option>
<option value="Invoice">' . _('Invoice Date') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1079,7 +1080,7 @@
<option value="10">' . _('Sales Invoice') . '</option>
<option value="11">' . _('Credit Note') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Only Applies To Invoice Date Type') . '</td>
</tr>';
@@ -1098,7 +1099,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="PartNumber" size="20" maxlength="20" value="'. $_POST['PartNumber'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorNo'])){
@@ -1110,7 +1111,7 @@
<option selected="selected" value="Equals">' . _('Equals') . '</option>
<option value="LIKE">' . _('Begins With') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorNo" size="10" maxlength="10" value="' . $_POST['DebtorNo'] . '" /></td>
</tr>';
if (!isset($_POST['DebtorName'])){
@@ -1122,7 +1123,7 @@
<option selected="selected" value="LIKE">' . _('Begins With') . '</option>
<option value="Equals">' . _('Equals') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="DebtorName" size="30" maxlength="30" value="' . $_POST['DebtorName'] .'" /></td>
</tr>';
if (!isset($_POST['OrderNo'])){
@@ -1131,7 +1132,7 @@
echo '<tr>
<td>' . _('Order Number') . ':</td>
<td>' . _('Equals') . '</td>
- <td> </td>
+ <td> </td>
<td><input type="text" name="OrderNo" size="10" maxlength="10" value="' . $_POST['OrderNo'] . '" /></td>
</tr>';
@@ -1142,7 +1143,7 @@
<option value="Completed">' . _('Completed') . '</option>
<option value="Open">' . _('Not Completed') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
</tr>';
echo '<tr>
@@ -1178,7 +1179,7 @@
}
echo '</select></td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr>
<td>' . _('Sort By') . ':</td>
<td><select name="SortBy">
@@ -1188,15 +1189,15 @@
<option value="debtorsmaster.name,debtorsmaster.debtorno,salesorderdetails.orderno">' . _('Customer Name') . '</option>
<option value="tempstockmoves.transno,salesorderdetails.stkcode">' . _('Transaction Number') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number sort only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>';
- echo '<tr><td> </td></tr>';
+ echo '<tr><td> </td></tr>';
echo '<tr><td>' . _('Summary Type') . ':</td>
<td><select name="SummaryType">
<option selected="selected" value="orderno">' . _('Order Number') . '</option>
@@ -1210,20 +1211,21 @@
<option value="salesman">' . _('Salesman') . '</option>
<option value="area">' . _('Sales Area') . '</option>
</select></td>
- <td> </td>
+ <td> </td>
<td>' . _('Transaction Number summary only valid for Invoice Date Type') . '</td>
</tr>';
- echo '<tr><td> </td></tr>
- <tr><td> </td></tr>
- <tr><td> </td></tr>
+ echo '<tr><td> </td></tr>
+ <tr><td> </td></tr>
+ <tr><td> </td></tr>
<tr>
- <td> </td>
+ <td> </td>
<td><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></td>
</tr>
</table>
<br />';
- echo '</form>';
+ echo '</div>
+ </form>';
} // End of function display()
Modified: trunk/SalesPeople.php
===================================================================
--- trunk/SalesPeople.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesPeople.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -230,7 +230,7 @@
<td class="number">%s</td>
<td>%s</td>
<td><a href="%sSelectedSalesPerson=%s">'. _('Edit') . '</a></td>
- <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
+ <td><a href="%sSelectedSalesPerson=%s&delete=1" onclick="return confirm(\'' . _('Are you sure you wish to delete this sales person?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow['salesmancode'],
$myrow['salesmanname'],
@@ -256,6 +256,7 @@
if (! isset($_GET['delete'])) {
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($SelectedSalesPerson)) {
@@ -368,6 +369,7 @@
<div class="centre">
<input type="submit" name="submit" value="' . _('Enter Information') . '" />
</div>
+ </div>
</form>';
} //end if record deleted no point displaying form to add record
Modified: trunk/SalesTopItemsInquiry.php
===================================================================
--- trunk/SalesTopItemsInquiry.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesTopItemsInquiry.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -14,7 +14,8 @@
$_POST['DateRange']='ThisMonth';
}
-echo '<form name="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<form id="form1" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table cellpadding="2" class="selection">
@@ -28,7 +29,7 @@
<td>' . _('Custom Range') . ':</td>
<td><input type="radio" name="DateRange" value="Custom" ';
if ($_POST['DateRange']=='Custom'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -36,7 +37,7 @@
<td>' . _('This Week') . ':</td>
<td><input type="radio" name="DateRange" value="ThisWeek" ';
if ($_POST['DateRange']=='ThisWeek'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -44,7 +45,7 @@
<td>' . _('This Month') . ':</td>
<td><input type="radio" name="DateRange" value="ThisMonth" ';
if ($_POST['DateRange']=='ThisMonth'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>
@@ -52,7 +53,7 @@
<td>' . _('This Quarter') . ':</td>
<td><input type="radio" name="DateRange" value="ThisQuarter" ';
if ($_POST['DateRange']=='ThisQuarter'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' onchange="ReloadForm(form1.ShowSales)" /></td>
</tr>';
@@ -72,7 +73,7 @@
</tr>';
}
echo '</table></td>
- <td valign=top>
+ <td valign="top">
<table>'; //new sub table to set parameters for order of display
@@ -85,7 +86,7 @@
<td>' . _('Order By Net Sales') . ':</td>
<td><input type="radio" name="OrderBy" value="NetSales" ';
if ($_POST['OrderBy']=='NetSales'){
- echo 'checked';
+ echo 'checked="checked"';
}
echo ' /></td>
</tr>
@@ -93,7 +94,7 @@
<td>' . _('Order By Quantity') . ':</td>
<td><input type="radio" name="OrderBy" value="Quantity" ';
if ($_POST['OrderBy']=='Quantity'){
- echo 'checked';
+ echo 'checked="checked"';
}
if (!isset($_POST['NoToDisplay'])){
$_POST['NoToDisplay']=20;
@@ -102,7 +103,7 @@
</tr>
<tr>
<td>' . _('Number to Display') . ':</td>
- <td><input type="text class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td>
+ <td><input type="text" class="number" name="NoToDisplay" size="4" maxlength="4" value="' . $_POST['NoToDisplay'] .'" /></td>
</tr>
</table>
</td></tr>
@@ -110,8 +111,10 @@
echo '<br /><div class="centre"><input tabindex="4" type="submit" name="ShowSales" value="' . _('Show Sales') . '" />';
-echo '</form></div>';
+echo '</div>';
echo '<br />';
+echo '</div>
+ </form>';
if (isset($_POST['ShowSales'])){
$InputError=0; //assume no input errors now test for errors
Modified: trunk/SalesTypes.php
===================================================================
--- trunk/SalesTypes.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SalesTypes.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -203,8 +203,8 @@
printf('<td>%s</td>
<td>%s</td>
- <td><a href="%sSelectedType=%s">' . _('Edit') . '</td>
- <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</td>
+ <td><a href="%sSelectedType=%s">' . _('Edit') . '</a></td>
+ <td><a href="%sSelectedType=%s&delete=yes" onclick="return confirm(\'' . _('Are you sure you wish to delete this price list and all the prices it may have set up?') . '\');">' . _('Delete') . '</a></td>
</tr>',
$myrow[0],
$myrow[1],
@@ -218,13 +218,14 @@
//end of ifs and buts!
if (isset($SelectedType)) {
- echo '<p><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div></p>';
+ echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">' . _('Show All Sales Types Defined') . '</a></div>';
}
if (! isset($_GET['delete'])) {
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><table class="selection">'; //Main table
+ echo '<br />';
// The user wish to EDIT an existing type
@@ -268,11 +269,12 @@
echo '<tr><td>' . _('Sales Type Name') . ':</td>
<td><input type="text" name="Sales_Type" value="' . $_POST['Sales_Type'] . '" /></td></tr>';
- echo '</td></tr></table>'; // close main table
+ echo '</table>'; // close main table
- echo '<p><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" /><input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
- echo '</form>';
+ echo '</div>
+ </form>';
} // end if user wish to delete
Modified: trunk/SecurityTokens.php
===================================================================
--- trunk/SecurityTokens.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SecurityTokens.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -84,7 +84,8 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' .
_('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>
@@ -108,9 +109,10 @@
echo '</td>
</tr>
</table>
- <p></p>';
+ <br />';
-echo '</form>';
+echo '</div>
+ </form>';
echo '<table class="selection">';
echo '<tr>
@@ -124,13 +126,13 @@
while ($myrow = DB_fetch_array($Result,$db)){
echo '<tr>
<td>'.$myrow['tokenid'].'</td>
- <td>'.$myrow['tokenname'].'</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td>
+ <td>'.htmlspecialchars($myrow['tokenname'],ENT_QUOTES,'UTF-8').'</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=edit">' . _('Edit') . '</a></td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?SelectedToken=' . $myrow['tokenid'] . '&Action=delete" onclick="return confirm(\'' . _('Are you sure you wish to delete this security token?') . '\');">' . _('Delete') . '</a></td>
</tr>';
}
-echo '</table><p></p>';
+echo '</table><br />';
echo '<script type="text/javascript">defaultControl(document.form.TokenDescription);</script>';
Modified: trunk/SelectAsset.php
===================================================================
--- trunk/SelectAsset.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SelectAsset.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -41,6 +41,7 @@
// end of showing search facilities
echo '<form action="SelectAsset.php?' . SID . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>';
echo '<table class="selection"><tr>';
@@ -63,13 +64,13 @@
echo '<option value="' . $myrow['categoryid'] . '">' . $myrow['categorydescription'] . '</option>';
}
}
-echo '</select>';
+echo '</select></td>';
-echo '<td>' . _('Enter partial description') . '</b>:</td><td>';
+echo '<td>' . _('Enter partial description') . ':</td><td>';
if (isset($_POST['Keywords'])) {
echo '<input type="text" name="Keywords" value="' . $_POST['Keywords'] . '" size="20" maxlength="25" />';
} else {
- echo '<input type="text" name="Keywords" size="20" maxlength="25" /> /';
+ echo '<input type="text" name="Keywords" size="20" maxlength="25" />';
}
echo '</td>
</tr>
@@ -96,7 +97,7 @@
}
echo '</select>';
-echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . '</b>:</td>';
+echo ' </td><td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial asset code') . ':</td>';
echo '<td>';
if (isset($_POST['AssetCode'])) {
echo '<input type="text" class="number" name="AssetCode" value="' . $_POST['AssetCode'] . '" size="15" maxlength="13" />';
@@ -108,6 +109,7 @@
<input type="submit" name="Search" value="' . _('Search Now') . '" />
</div>
<br />
+ </div>
</form>';
echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
@@ -209,6 +211,7 @@
/* display list if there is more than one record */
if (isset($searchresult) AND !isset($_POST['Select'])) {
echo '<form action="FixedAssetItems.php" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$ListCount = DB_num_rows($searchresult);
if ($ListCount > 0) {
@@ -244,7 +247,7 @@
<input type="submit" name="Previous" value="' . _('Previous') . '" />
<input type="submit" name="Next" value="' . _('Next') . '" />';
- echo '<p></div>';
+ echo '<br /></div>';
}
echo '<table class="selection">';
$tableheader = '<tr>
@@ -282,8 +285,10 @@
//end of page full new headings if
}
//end of while loop
- echo '</table></form>';
+ echo '</table>';
} // there were records to list
+ echo '</div>
+ </form>';
}
/* end display list if there is more than one record */
include ('includes/footer.inc');
Modified: trunk/SelectCompletedOrder.php
===================================================================
--- trunk/SelectCompletedOrder.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SelectCompletedOrder.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -12,6 +12,7 @@
' . ' ' . _('Search Sales Orders') . '</p>';
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
if (isset($_POST['completed'])) {
@@ -520,7 +521,7 @@
}
}
- echo '</select>
+ echo '</select></td>
<td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
</tr>
@@ -653,7 +654,8 @@
echo '</table>';
}
-echo '</form>';
+echo '</div>
+ </form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SelectContract.php
===================================================================
--- trunk/SelectContract.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SelectContract.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -9,6 +9,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/contract.png" title="' . _('Contracts') . '" alt="" />' . ' ' . _('Select A Contract') . '</p> ';
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 '<br /><div class="centre">';
@@ -62,7 +63,7 @@
echo '</select> ';
}
echo '<input type="submit" name="SearchContracts" value="' . _('Search') . '" />';
-echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div></p>';
+echo ' <a href="' . $rootpath . '/Contracts.php">' . _('New Contract') . '</a></div><br />';
//figure out the SQL required from the inputs available
@@ -194,6 +195,9 @@
}
//end of while loop
-echo '</table></form><br />';
+echo '</table>
+ </div>
+ </form>
+ <br />';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-04-09 11:36:02 UTC (rev 5237)
+++ trunk/SelectCreditItems.php 2012-04-10 22:05:59 UTC (rev 5238)
@@ -210,17 +210,18 @@
OR $_SESSION['CreditItems'.$identifier]->DebtorNo=='' ) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
+ echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' .
_('Search') . '" alt="" />' . ' ' . _('Select Customer For Credit Note').'</p>';
echo '<table cellpadding="3" class="selection">';
- echo '<tr><th colspan="5"><font size="3" color="navy"><b> ' . _('Customer Selection') .'</b></font></th></tr>';
+ echo '<tr><th colspan="5"><h3> ' . _('Customer Selection') .'</h3></th></tr>';
echo '<tr>
- <td><font size="1">' . _('Enter text in the customer name') . ':</font></td>
+ <td>' . _('Enter text in the customer name') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
- <td><font size="3"><b>' . _('OR') . '</b></font></td>
- <td><font size="1">' . _('Enter text extract in the customer code') . ':</font></td>
+ <td><b>' . _('OR') . '</b></td>
+ <td>' . _('Enter text extract in the customer code') . ':</td>
<td><input type="text" name="CustCode" size="15" maxlength="18" /></td>
</tr>';
echo '</table>
@@ -231,10 +232,9 @@
if (isset($result_CustSelect)) {
- echo '<table cellpadding="2">';
+ echo '<br /><table cellpadding="2">';
- $TableHeader = '<br />
- <tr>
+ $TableHeader = '<tr>
<th>' . _('Customer') . '</th>
<th>' . _('Branch') . '</th>
<th>' . _('Contact') . '</th>
@@ -261,9 +261,9 @@
} else {
echo '<td></td>';
}
- echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" /></td>
+ echo '<td><input tabindex="'.($j+5).'" type="submit" name="SubmitCustomerSelection' . $j .'" value="' . htmlspecialchars($myrow['brname'], ENT_QUOTES,'UTF-8'). '" />
<input type="hidden" name="SelectedCustomer' . $j .'" value="'.$myrow['debtorno'].'" />
- <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" />
+ <input type="hidden" name="SelectedBranch' . $j .'" value="'. $myrow['branchcode'].'" /></td>
<td>'.$myrow['contactname'].'</td>
<td>'.$myrow['phoneno'].'</td>
<td>'.$myrow['faxno'].'</td>
@@ -272,10 +272,11 @@
$j++;
//end of page full new headings if
} //end of while loop
- echo '<input type="hidden" name="JustSelectedACustomer" value="Yes" />';
- echo '</table></form>';
+ echo '</table><input type="hidden" name="JustSelectedACustomer" value="Yes" />';
+ }//end if results to show
+ echo '</div>
+ </form>';
- }//end if results to show
//end if RequireCustomerSelection
} else {
@@ -398,8 +399,9 @@
/*Always do the stuff below if not looking for a customerid
Set up the form for the credit note display and entry*/
- echo '<form name="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
- echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<form id="MainForm" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?identifier='.$identifier . '" method="post">';
+ echo '<div>';
+ echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
/*Process Quick Entry */
@@ -712,7 +714,7 @@
echo '<td><input type="text" class="number" name="Quantity_' . $LineItem->LineNumber . '" maxlength="6" size="6" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
} else {
echo '<td class="number"><a href="' . $rootpath . '/CreditItemsControlled.php?LineNo=' . $LineItem->LineNumber . '">' . locale_number_format($LineItem->Quantity,$LineItem->DecimalPlaces) . '</a>
- <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
+ <input type="hidden" name="Quantity_' . $LineItem->LineNumber . '" value="' . locale_number_format(round($LineItem->Quantity,$LineItem->DecimalPlaces),$LineItem->DecimalPlaces) . '" /></td>';
}
echo '<td>' . $LineItem->Units . '</td>
@@ -969,7 +971,7 @@
echo '<td>' . _('Enter text extracts in the description') . ': </td>';
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>';
echo '<tr><td></td>';
- echo '<td><font size="3"><b>' ._('OR') . '</b></font> ' . _('Enter extract of the Stock Code') . ': </td>';
+ echo '<td><b>' ._('OR') . '</b> ' . _('Enter extract of the Stock Code') . ': </td>';
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>';
echo '</tr>';
echo '</table>
@@ -1003,18 +1005,18 @@
$k++;
}
if(file_exists($_SESSION['part_pics_dir'] . '/' .mb_strtoupper($myrow['stockid']).'.jpg') ) {
- printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td>
- <td><font size="1">%s</font></td>
- <td><font size="1">%s</font></td>
+ printf('<td><input type="submit" name="NewItem" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
<td><img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=%s&text=&width=120&height=120" /></td></tr>',
$myrow['stockid'],
$myrow['description'],
$myrow['units'],
$myrow['stockid']);
} else { //don't try to show the image
- printf('<td><font size="1"><input type="submit" name="NewItem" value="%s" /></font></td>
- <td><font size="1">%s</font></td>
- <td><font size="1">%s</font></td>
+ printf('<td><input type="submit" name="NewItem" value="%s" /></td>
+ <td>%s</td>
+ <td>%s</td>
<td>' . _('No Image') . '</td></tr>',
$myrow['stockid'],
$myrow['description'],
@@ -1029,7 +1031,7 @@
/*FORM VARIABLES TO POST TO THE CREDIT NOTE 10 AT A TIME WITH PART CODE AND QUANTITY */
echo '<table class="selection">';
- echo '<tr><th colspan="2"><font size="3" color="navy"><b>' . _('Quick Entry') . '</th></tr>';
+ echo '<tr><th colspan="2"><h3>' . _('Quick Entry') . '</h3></th></tr>';
echo '<tr>
<th>' . _('Part Code') . '</th>
<th>' . _('Quantity') . '</th>
@@ -1052,6 +1054,8 @@
}
+ echo '</div>
+ </form>';
} //end of else not selecting a customer
if (isset($_POST['ProcessCredit']) AND $OKToProcess==true){
@@ -1968,6 +1972,5 @@
} /*end of process credit note */
-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.
|
