Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[5263] trunk
|
From: <vv...@us...> - 2012-04-18 22:10:03
|
Revision: 5263
http://web-erp.svn.sourceforge.net/web-erp/?rev=5263&view=rev
Author: vvs2012
Date: 2012-04-18 22:09:56 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
xhtml
Modified Paths:
--------------
trunk/StockMovements.php
trunk/StockQties_csv.php
trunk/StockQuantityByDate.php
trunk/StockReorderLevel.php
trunk/StockSerialItemResearch.php
trunk/Stocks.php
Modified: trunk/StockMovements.php
===================================================================
--- trunk/StockMovements.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockMovements.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -19,6 +19,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/inventory.png" title="' . _('Inventory') . '" alt="" /><b>' . ' ' . $StockID . ' - ' . $myrow['0'] . ' : ' . _('in units of') . ' : ' . $myrow[1] . '</b></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['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
@@ -120,7 +121,7 @@
if ($myrow['type']==10){ /*its a sales invoice allow link to show invoice it was sold on*/
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Invoice">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -146,7 +147,7 @@
} elseif ($myrow['type']==11){
- printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</td>
+ printf('<td><a target="_blank" href="%s/PrintCustTrans.php?FromTransNo=%s&InvOrCredit=Credit">%s</a></td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -199,11 +200,13 @@
echo '</table>';
echo '<div class="centre"><br /><a href="' . $rootpath . '/StockStatus.php?StockID=' . $StockID . '">' . _('Show Stock Status') . '</a>';
-echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Show Stock Usage') . '</a>';
-echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Search Outstanding Sales Orders') . '</a>';
+echo '<br /><a href="' . $rootpath . '/StockUsage.php?StockID=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Show Stock Usage') . '</a>';
+echo '<br /><a href="' . $rootpath . '/SelectSalesOrder.php?SelectedStockItem=' . $StockID . '&StockLocation=' . $_POST['StockLocation'] . '">' . _('Search Outstanding Sales Orders') . '</a>';
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
-echo '</form></div>';
+echo '</div>
+ </div>
+ </form>';
include('includes/footer.inc');
Modified: trunk/StockQties_csv.php
===================================================================
--- trunk/StockQties_csv.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQties_csv.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -11,7 +11,7 @@
return str_replace(',', '', $str);
}
-echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities');
+echo '<div class="centre">' . _('Making a comma separated values file of the current stock quantities') . '</div>';
$ErrMsg = _('The SQL to get the stock quantities failed with the message');
Modified: trunk/StockQuantityByDate.php
===================================================================
--- trunk/StockQuantityByDate.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockQuantityByDate.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -12,6 +12,7 @@
</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'] . '" />';
$sql = "SELECT categoryid, categorydescription FROM stockcategory";
@@ -71,6 +72,7 @@
</div></td>
</tr>
</table>
+ </div>
</form>';
$TotalQuantity = 0;
@@ -138,17 +140,17 @@
}
if($NumRows == 0){
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
0);
} else {
- printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</td>
+ printf('<td><a target="_blank" href="' . $rootpath . '/StockStatus.php?%s">%s</a></td>
<td>%s</td>
- <td class="number">%s</td>',
+ <td class="number">%s</td></tr>',
'StockID=' . mb_strtoupper($myrows['stockid']),
mb_strtoupper($myrows['stockid']),
$myrows['description'],
Modified: trunk/StockReorderLevel.php
===================================================================
--- trunk/StockReorderLevel.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockReorderLevel.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -22,6 +22,7 @@
$myrow = DB_fetch_row($result);
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
$sql = "SELECT locstock.loccode,
@@ -46,7 +47,7 @@
<th colspan="3">' . _('Stock Code') . ':<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" /><input type="submit" name="Show" value="' . _('Show Re-Order Levels') . '" /></th>
</tr>';
echo '<tr>
- <th colspan="3"><font color="blue" size="3"><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</font></th>
+ <th colspan="3"><h3><b>' . $StockID . ' - ' . $myrow[0] . '</b> (' . _('In Units of') . ' ' . $myrow[1] . ')</h3></th>
</tr>';
$TableHeader = '<tr>
@@ -84,8 +85,8 @@
printf('<td>%s</td>
<td class="number">%s</td>
- <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" /></td>
- <input type="hidden" name="Old_%s" value="%s" />',
+ <td><input type="text" class="number" name="%s" maxlength="10" size="10" value="%s" />
+ <input type="hidden" name="Old_%s" value="%s" /></td></tr>',
$myrow['locationname'],
locale_number_format($myrow['quantity'],$myrow['decimalplaces']),
$myrow['loccode'],
@@ -114,6 +115,7 @@
echo '<br /><a href="' . $rootpath . '/SelectCompletedOrder.php?SelectedStockItem=' . $StockID . '">' . _('Search Completed Sales Orders') . '</a>';
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/StockSerialItemResearch.php
===================================================================
--- trunk/StockSerialItemResearch.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/StockSerialItemResearch.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -23,12 +23,13 @@
echo '<div class="centre">
<br />
-<form name="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+<form id="SerialNoResearch" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') .'">';
+echo '<div>';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-echo _('Serial Number') .': <input ID="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+echo _('Serial Number') .': <input id="serialno" type="text" name="serialno" size="21" maxlength="20" value="'. $SerialNo . '" /> <input type="submit" name="submit" value="' . _('Search') . '" />
+<br />
</div>
-<br />
</form>';
echo '<script type="text/javascript">
Modified: trunk/Stocks.php
===================================================================
--- trunk/Stocks.php 2012-04-18 09:32:00 UTC (rev 5262)
+++ trunk/Stocks.php 2012-04-18 22:09:56 UTC (rev 5263)
@@ -110,7 +110,7 @@
}
if (ContainsIllegalCharacters($StockID) OR mb_strpos($StockID,' ')) {
$InputError = 1;
- prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
+ prnMsg(_('The stock item code cannot contain any of the following characters') . " - ' & + \" \\ ." . _('or a space'),'error');
$Errors[$i] = 'StockID';
$i++;
$StockID='';
@@ -714,12 +714,12 @@
}
-echo '<form name="ItemForm" enctype="multipart/form-data" method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">
- <table class="selection">
- <tr><td>'; // Nested table
+echo '<form id="ItemForm" 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'] . '" />';
echo '<input type="hidden" name="New" value="'.$New.'" />';
+echo '<table class="selection">';
if (!isset($StockID) OR $StockID=='' or isset($_POST['UpdateCategories'])) {
@@ -732,9 +732,8 @@
value="'.$StockID.'" name="StockID" size="21" maxlength="20" /></td></tr>';
} else {
echo '<tr><td>'. _('Item Code'). ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name ="StockID" value="'.$StockID.'" /></td>
</tr>';
- echo '<input type="hidden" name ="StockID" value="'.$StockID.'" />';
}
} elseif (!isset($_POST['UpdateCategories']) AND $InputError!=1) { // Must be modifying an existing item and no changes made yet
@@ -787,16 +786,14 @@
echo '<tr><td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
} else { // some changes were made to the data so don't re-set form variables to DB ie the code above
echo '<tr>
<td>' . _('Item Code') . ':</td>
- <td>'.$StockID.'</td>
+ <td>'.$StockID.'<input type="hidden" name="StockID" value="' . $StockID . '" /></td>
</tr>';
- echo '<input type="hidden" name="StockID" value="' . $StockID . '" />';
}
if (isset($_POST['Description'])) {
@@ -823,25 +820,24 @@
<td><input type="file" id="ItemPicture" name="ItemPicture" /></td>';
if (function_exists('imagecreatefromjpg')){
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
- '&StockID='.urlencode($StockID).
- '&text='.
- '&width=64'.
- '&height=64'.
- '" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC'.
+ '&StockID='.urlencode($StockID).
+ '&text='.
+ '&width=64'.
+ '&height=64'.
+ '" alt="" />';
} else {
if( isset($StockID) and file_exists($_SESSION['part_pics_dir'] . '/' .$StockID.'.jpg') ) {
- $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" />';
+ $StockImgLink = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . $StockID . '&text=&width=120&height=120" alt="" />';
} else {
$StockImgLink = _('No Image');
}
}
if ($StockImgLink!=_('No Image')) {
- echo '</td>
- <td>' . _('Image') . '<br />'.$StockImgLink . '</td>
- </tr>';
+ echo '<td>' . _('Image') . '<br />'.$StockImgLink . '</td>';
}
+echo '</tr>';
echo '<tr>
<td>' . _('Category') . ':</td>
@@ -1026,7 +1022,7 @@
<td>' . _('Next Serial No (>0 for auto numbering)') . ':</td>
<td><input ' . (in_array('NextSerialNo',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="NextSerialNo" size="15" maxlength="15" value="' . $_POST['NextSerialNo'] . '" /></td></tr>';
} else {
- echo '<input type="hidden" name="NextSerialNo" value="0" />';
+ echo '<tr><td><input type="hidden" name="NextSerialNo" value="0" /></td></tr>';
}
echo '<tr>
@@ -1047,7 +1043,7 @@
echo '<tr>
<td>' . _('Decimal Places for display Quantity') . ':</td>
- <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /><td>
+ <td><input type="text" class="number" name="DecimalPlaces" size="1" maxlength="1" value="' . $_POST['DecimalPlaces'] . '" /></td>
</tr>';
if (isset($_POST['BarCode'])) {
@@ -1123,13 +1119,12 @@
$PropertyCounter = 0;
$PropertyWidth = array();
-echo '<br />
- <table class="selection">';
if (DB_num_rows($PropertiesResult)>0) {
+echo '<br />
+ <table class="selection">';
echo '<tr>
<th colspan="2">' . _('Item Category Properties') . '</th>
</tr>';
-}
while ($PropertyRow=DB_fetch_array($PropertiesResult)){
@@ -1144,19 +1139,20 @@
} else {
$PropertyValue = '';
}
- echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
- echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
-
- echo '<tr>
- <td>' . $PropertyRow['label'] . '</td>
+ echo '<tr>
+ <td>';
+ echo '<input type="hidden" name="PropID' . $PropertyCounter . '" value="' .$PropertyRow['stkcatpropid'] .'" />';
+ echo '<input type="hidden" name="PropNumeric' . $PropertyCounter . '" value="' .$PropertyRow['numericvalue'] .'" />';
+ echo $PropertyRow['label'] . '</td>
+
<td>';
switch ($PropertyRow['controltype']) {
case 0; //textbox
if ($PropertyRow['numericvalue']==1) {
- echo '<input type="textbox" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
+ echo '<input type="text" class="number" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . locale_number_format($PropertyValue,'Variable') . '" />';
echo _('A number between') . ' ' . locale_number_format($PropertyRow['minimumvalue'],'Variable') . ' ' . _('and') . ' ' . locale_number_format($PropertyRow['maximumvalue'],'Variable') . ' ' . _('is expected');
} else {
- echo '<input type="textbox" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
+ echo '<input type="text" name="PropValue' . $PropertyCounter . '" size="20" maxlength="100" value="' . $PropertyValue . '" />';
}
break;
case 1; //select box
@@ -1185,9 +1181,10 @@
} //end loop round properties for the item category
unset($StockID);
-echo '</table>
- <br />';
+echo '</table>';
+}
echo '<input type="hidden" name="PropertyCounter" value="' . $PropertyCounter . '" />';
+echo '<br />';
if ($New==1) {
echo '<input type="submit" name="submit" value="' . _('Insert New Item') . '" />';
@@ -1199,7 +1196,7 @@
echo '<input type="submit" name="submit" value="' . _('Update') . '" />';
echo '<input type="submit" name="UpdateCategories" style="visibility:hidden;width:1px" value="' . _('Categories') . '" />';
- echo '<p>';
+ echo '<br />';
prnMsg( _('Only click the Delete button if you are sure you wish to delete the item!') . _('Checks will be made to ensure that there are no stock movements, sales analysis records, sales order items or purchase order items for the item') . '. ' . _('No deletions will be allowed if they exist'), 'warn', _('WARNING'));
echo '<br />
<br />
@@ -1207,6 +1204,7 @@
}
echo '</div>
+ </div>
</form>';
include('includes/footer.inc');
?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
