Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[4822] trunk
|
From: <vv...@us...> - 2012-01-20 22:52:52
|
Revision: 4822
http://web-erp.svn.sourceforge.net/web-erp/?rev=4822&view=rev
Author: vvs2012
Date: 2012-01-20 22:52:45 +0000 (Fri, 20 Jan 2012)
Log Message:
-----------
xhtml fixes in CustomerBranches.php StockAdjustments.php WorkOrderEntry.php
Modified Paths:
--------------
trunk/CustomerBranches.php
trunk/StockAdjustments.php
trunk/WorkOrderEntry.php
trunk/doc/Change.log
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
+ reportwriter
Modified: trunk/CustomerBranches.php
===================================================================
--- trunk/CustomerBranches.php 2012-01-20 13:48:53 UTC (rev 4821)
+++ trunk/CustomerBranches.php 2012-01-20 22:52:45 UTC (rev 4822)
@@ -360,8 +360,8 @@
$TotalEnable = 0;
$TotalDisable = 0;
if ($myrow) {
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') .
- '" alt="" />' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
+ echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ ' . ' ' . _('Branches defined for'). ' '. $DebtorNo . ' - ' . $myrow[0] . '</p>';
echo '<table class=selection>';
echo '<tr><th>'._('Code').'</th>
@@ -526,11 +526,11 @@
$_POST['DeliverBlind'] = $myrow['deliverblind'];
}
- echo '<input type=hidden name="SelectedBranch" value="' . $SelectedBranch . '" />';
- echo '<input type=hidden name="BranchCode" value="' . $_POST['BranchCode'] . '" />';
+ echo '<input type="hidden" name="SelectedBranch" value="' . $SelectedBranch . '" />';
+ echo '<input type="hidden" name="BranchCode" value="' . $_POST['BranchCode'] . '" />';
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') .
- '" alt="">' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
+ echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />
+ ' . ' ' . _('Change Details for Branch'). ' '. $SelectedBranch . '</p>';
if (isset($SelectedBranch)) {
echo '<div class="centre"><a href=' . htmlspecialchars($_SERVER['PHP_SELF']) . '?DebtorNo=' . $DebtorNo. '>' . _('Show all branches defined for'). ' '. $DebtorNo . '</a></div>';
}
@@ -576,11 +576,11 @@
if (!isset($_POST['BranchCode'])) {
$_POST['BranchCode']='';
}
- echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="">' . ' ' . _('Add a Branch').'</p>';
+ echo '<p Class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/customer.png" title="' . _('Customer') . '" alt="" />' . ' ' . _('Add a Branch').'</p>';
echo '<table class=selection>
<tr>
<td>'._('Branch Code'). ':</td>
- <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex=1 type="text" name="BranchCode" size=12 maxlength=10 value="' . $_POST['BranchCode'] . '"></td>
+ <td><input ' .(in_array('BranchCode',$Errors) ? 'class="inputerror"' : '' ) . ' tabindex="1" type="text" name="BranchCode" size="12" maxlength="10" value="' . $_POST['BranchCode'] . '" /></td>
</tr>';
$_POST['DeliverBlind'] = $_SESSION['DefaultBlindPackNote'];
}
@@ -592,12 +592,12 @@
echo '<tr>
<td>'._('Branch Name').':</td>';
if (!isset($_POST['BrName'])) {$_POST['BrName']='';}
- echo '<td><input tabindex=2 type="text" name="BrName" size="41" maxlength="40" value="'. $_POST['BrName'].'"></td>
+ echo '<td><input tabindex="2" type="text" name="BrName" size="41" maxlength="40" value="'. $_POST['BrName'].'" /></td>
</tr>';
echo '<tr>
<td>'._('Branch Contact').':</td>';
if (!isset($_POST['ContactName'])) {$_POST['ContactName']='';}
- echo '<td><input tabindex=3 type="text" name="ContactName" size="41" maxlength="40" value="'. $_POST['ContactName'].'" /></td>
+ echo '<td><input tabindex="3" type="text" name="ContactName" size="41" maxlength="40" value="'. $_POST['ContactName'].'" /></td>
</tr>';
echo '<tr><td>'._('Street Address 1 (Street)').':</td>';
if (!isset($_POST['BrAddress1'])) {
@@ -631,7 +631,7 @@
if (!isset($_POST['BrAddress5'])) {
$_POST['BrAddress5']='';
}
- echo '<td><input tabindex="8" type="text" name="BrAddress5" size="21" maxlength="20" value="'. $_POST['BrAddress5'].'"/></td>
+ echo '<td><input tabindex="8" type="text" name="BrAddress5" size="21" maxlength="20" value="'. $_POST['BrAddress5'].'" /></td>
</tr>
<tr>
<td>'._('Street Address 6').':</td>';
@@ -652,14 +652,14 @@
if (!isset($_POST['EstDeliveryDays'])) {
$_POST['EstDeliveryDays']=0;
}
- echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" class=number name="EstDeliveryDays" size="4" maxlength="2" value='. $_POST['EstDeliveryDays'].'></td>
+ echo '<td><input ' .(in_array('EstDeliveryDays',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="11" type="text" class=number name="EstDeliveryDays" size="4" maxlength="2" value='. $_POST['EstDeliveryDays'].' /></td>
</tr>
<tr>
<td>'._('Forward Date After (day in month)').':</td>';
if (!isset($_POST['FwdDate'])) {
$_POST['FwdDate']=0;
}
- echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="text" class=number name="FwdDate" size="4" maxlength="2" value='. $_POST['FwdDate'].'></td>
+ echo '<td><input ' .(in_array('FwdDate',$Errors) ? 'class="inputerror"' : '' ) .' tabindex="12" type="text" class=number name="FwdDate" size="4" maxlength="2" value='. $_POST['FwdDate'].' /></td>
</tr>';
@@ -805,7 +805,7 @@
</tr>
<tr>
<td>'._('Transactions on this branch') . ':</td>
- <td><select tabindex=20 name="DisableTrans">';
+ <td><select tabindex="20" name="DisableTrans">';
if ($_POST['DisableTrans']==0){
echo '<option selected value=0>' . _('Enabled') . '</option>
<option value=1>' . _('Disabled') . '</option>';
@@ -828,7 +828,7 @@
}
echo '<tr>
<td>'._('Default freight/shipper method') . ':</td>
- <td><select tabindex=21 name="DefaultShipVia">';
+ <td><select tabindex="21" name="DefaultShipVia">';
while ($myrow=DB_fetch_array($ShipperResults)){
if (isset($_POST['DefaultShipVia'])and $myrow['shipper_id']==$_POST['DefaultShipVia']){
echo '<option selected value=' . $myrow['shipper_id'] . '>' . $myrow['shippername'] . '</option>';
Modified: trunk/StockAdjustments.php
===================================================================
--- trunk/StockAdjustments.php 2012-01-20 13:48:53 UTC (rev 4821)
+++ trunk/StockAdjustments.php 2012-01-20 22:52:45 UTC (rev 4822)
@@ -58,13 +58,11 @@
$_SESSION['Adjustment']->Quantity = filter_number_format($_POST['Quantity']);
}
-echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' .
- _('Inventory Adjustment') . '" alt="" />' . ' ' . _('Inventory Adjustment') . '</p>';
+echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Inventory Adjustment') . '" alt="" />' . ' ' . _('Inventory Adjustment') . '</p>';
if (isset($_POST['CheckCode'])) {
- echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Dispatch') .
- '" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Dispatch') . '" alt="" />' . ' ' . _('Select Item to Adjust') . '</p>';
if (mb_strlen($_POST['StockText'])>0) {
$sql="SELECT stockid,
@@ -352,27 +350,27 @@
$DecimalPlaces = $myrow['decimalplaces'];
}
echo '<br /><table class=selection>';
-echo '<tr><th colspan=4><font color=blue size=3>'._('Adjustment Details').'</font></th></tr>';
+echo '<tr><th colspan="4"><font color=blue size=3>'._('Adjustment Details').'</font></th></tr>';
if (!isset($_GET['Description'])) {
$_GET['Description']='';
}
echo '<tr><td>'. _('Stock Code'). ':</td><td>';
if (isset($StockID)) {
- echo '<input type="text" name="StockID" size=21 value="' . $StockID . '" maxlength=20></td></tr>';
+ echo '<input type="text" name="StockID" size="21" value="' . $StockID . '" maxlength="20" /></td></tr>';
} else {
- echo '<input type="text" name="StockID" size=21 value="" maxlength=20></td></tr>';
+ echo '<input type="text" name="StockID" size="21" value="" maxlength="20" /></td></tr>';
}
echo '<tr>
<td>'. _('Partial Description'). ':</td>
<td><input type="text" name="StockText" size="21" value="' . $_GET['Description'] .'" /> '._('Partial Stock Code'). ':</td>
<td>';
if (isset($StockID)) {
- echo '<input type="text" name="StockCode" size=21 value="' . $StockID .'" maxlength="20" />';
+ echo '<input type="text" name="StockCode" size="21" value="' . $StockID .'" maxlength="20" />';
} else {
- echo '<input type="text" name="StockCode" size=21 value="" maxlength="20" />';
+ echo '<input type="text" name="StockCode" size="21" value="" maxlength="20" />';
}
echo '</td>
- <td><input type="submit" name="CheckCode" value="'._('Check Part').'"></td>
+ <td><input type="submit" name="CheckCode" value="'._('Check Part').'" /></td>
</tr>';
if (isset($_SESSION['Adjustment']) AND mb_strlen($_SESSION['Adjustment']->ItemDescription)>1){
echo '<tr>
@@ -453,7 +451,7 @@
echo '</table>
<div class="centre">
<br />
- <input type="submit" name="EnterAdjustment" value="'. _('Enter Stock Adjustment'). '">
+ <input type="submit" name="EnterAdjustment" value="'. _('Enter Stock Adjustment'). '" />
<br />';
if (!isset($_POST['StockLocation'])) {
Modified: trunk/WorkOrderEntry.php
===================================================================
--- trunk/WorkOrderEntry.php 2012-01-20 13:48:53 UTC (rev 4821)
+++ trunk/WorkOrderEntry.php 2012-01-20 22:52:45 UTC (rev 4822)
@@ -8,8 +8,7 @@
include('includes/SQL_CommonFunctions.inc');
echo '<p class="page_title_text">
- <img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Search') .
- '" alt="" />' . ' ' . $title.'
+ <img src="'.$rootpath.'/css/'.$theme.'/images/transactions.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'
</p>';
if (isset($_GET['ReqDate'])){
@@ -533,7 +532,7 @@
echo '<td class="number"><input type="hidden" name="RecdQty' . $i . '" value="' . $_POST['RecdQty' .$i] . '" />' . $_POST['RecdQty' .$i] .'</td>
<td class="number">' . locale_number_format(($_POST['OutputQty' . $i] - $_POST['RecdQty' .$i]),$_POST['DecimalPlaces' . $i]) . '</td>';
if ($_POST['Controlled'.$i]==1){
- echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '"></td>';
+ echo '<td><input type="text" name="NextLotSNRef' .$i . '" value="' . $_POST['NextLotSNRef'.$i] . '" /></td>';
if ($_SESSION['DefineControlledOnWOEntry']==1){
if ($_POST['Serialised' . $i]==1){
$LotOrSN = _('S/Ns');
@@ -557,16 +556,16 @@
echo '<input type="hidden" name="HasWOSerialNos' . $i .'" value="' . $_POST['HasWOSerialNos' . $i] . '" />';
}
}
- echo '<input type=hidden name="NumberOfOutputs" value="' . ($i -1).'" />';
+ echo '<input type="hidden" name="NumberOfOutputs" value="' . ($i -1).'" />';
}
echo '</table>';
echo '<div class="centre">
<br />
- <input type=submit name="submit" value="' . _('Update') . '" />
+ <input type="submit" name="submit" value="' . _('Update') . '" />
<br />
<br />
- <input type=submit name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />
+ <input type="submit" name="delete" value="' . _('Delete This Work Order') . '" onclick="return confirm(\'' . _('Are You Sure?') . '\');" />
<br />
</div>';
@@ -600,11 +599,11 @@
</select></td>
<td><?php echo _('Enter text extracts in the'); ?> <b><?php echo _('description'); ?></b>:</td>
-<td><input type="text" name="Keywords" size=20 maxlength=25 value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>"></td>
+<td><input type="text" name="Keywords" size="20" maxlength="25" value="<?php if (isset($_POST['Keywords'])) echo $_POST['Keywords']; ?>" /></td>
</tr>
<tr><td></td>
- <td><font SIZE 3><b><?php echo _('OR'); ?> </b></font><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
- <td><input type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>"></td>
+ <td><b><?php echo _('OR'); ?> </b><?php echo _('Enter extract of the'); ?> <b><?php echo _('Stock Code'); ?></b>:</td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18" value="<?php if (isset($_POST['StockCode'])) echo $_POST['StockCode']; ?>" /></td>
</tr>
</table>
<br /><div class="centre"><input type="submit" name="Search" value="<?php echo _('Search Now'); ?>" />
@@ -635,10 +634,10 @@
if (!in_array($myrow['stockid'],$ItemCodes)){
if (function_exists('imagecreatefrompng') ){
- $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64">';
+ $ImageSource = '<img src="GetStockImage.php?automake=1&textcolor=FFFFFF&bgcolor=CCCCCC&StockID=' . urlencode($myrow['stockid']). '&text=&width=64&height=64" />';
} else {
if(file_exists($_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg')) {
- $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg">';
+ $ImageSource = '<img src="' .$_SERVER['DOCUMENT_ROOT'] . $rootpath . '/' . $_SESSION['part_pics_dir'] . '/' . $myrow['stockid'] . '.jpg" />';
} else {
$ImageSource = _('No Image');
}
@@ -652,9 +651,9 @@
$k=1;
}
- printf('<td><font size=1>%s</font></td>
- <td><font size=1>%s</font></td>
- <td><font size=1>%s</font></td>
+ printf('<td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
+ <td><font size="1">%s</font></td>
<td>%s</td>
<td><font size=1><a href="%s">'
. _('Add to Work Order') . '</a></font></td>
Modified: trunk/doc/Change.log
===================================================================
--- trunk/doc/Change.log 2012-01-20 13:48:53 UTC (rev 4821)
+++ trunk/doc/Change.log 2012-01-20 22:52:45 UTC (rev 4822)
@@ -1,5 +1,6 @@
webERP Change Log
+20/1/12 Vitaly: xhtml fixes in CustomerBranches.php StockAdjustments.php WorkOrderEntry.php
20/1/12 Tim: Merge tendering system from Tim's branch
20/1/12 Tim: Merge xhtml fixes from Tim's branch: Labels.php TaxGroups.php GLCodesInquiry.php CustomerInquiry.php SalesByTypePeriodInquiry.php ContractBOM.php Shippers.php MRPPlannedWorkOrders.php
20/1/12 Tim: Added previously received quantity to stock transfer notes PDFStockLocTransfer.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
