[Web-erp-svn] SF.net SVN: web-erp:[5276] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5276
          http://web-erp.svn.sourceforge.net/web-erp/?rev=5276&view=rev
Author:   vvs2012
Date:     2012-04-23 03:06:00 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
xhtml

Modified Paths:
--------------
    trunk/SupplierAllocations.php
    trunk/SupplierBalsAtPeriodEnd.php
    trunk/SupplierContacts.php
    trunk/SupplierCredit.php
    trunk/SupplierInquiry.php
    trunk/SupplierInvoice.php
    trunk/SupplierPriceList.php

Modified: trunk/SupplierAllocations.php
===================================================================

--- trunk/SupplierAllocations.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierAllocations.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -264,6 +264,7 @@
 for allocating to  */
 
 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['SupplierID'])){
@@ -591,7 +592,7 @@
 			<td>%s</td>
 			<td class="number">%s</td>
 			<td class="number">%s</td>
-			<td><a href="%sAllocTrans=%s">' . _('Allocate') .'</td>
+			<td><a href="%sAllocTrans=%s">' . _('Allocate') .'</a></td>
 			</tr>',
 			$myrow['typename'],
 			$myrow['suppname'],
@@ -667,7 +668,7 @@
 			<td>%s</td>
 			<td class="number">%s</td>
 			<td class="number">%s</td>
-			<td><a href="%sAllocTrans=%s">' . _('Allocate') . '</td>
+			<td><a href="%sAllocTrans=%s">' . _('Allocate') . '</a></td>
 			</tr>',
 			$myrow['typename'],
 			$myrow['suppname'],
@@ -689,6 +690,7 @@
 
 } /* end of else if not a SupplierID or transaction called with the URL */
 
-echo '</form>';
+echo '</div>
+      </form>';
 include('includes/footer.inc');
 ?>
\ No newline at end of file

Modified: trunk/SupplierBalsAtPeriodEnd.php
===================================================================
--- trunk/SupplierBalsAtPeriodEnd.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierBalsAtPeriodEnd.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -123,11 +123,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 '<tr>
+	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 '<table class="selection">';
+    echo '<tr>
 			<td>' . _('From Supplier Code') . ':</td>
 			<td><input type="text" maxlength="6" size="7" name="FromCriteria" value="'.$_POST['FromCriteria'].'" /></td>
 		</tr>
@@ -137,7 +138,7 @@
 		</tr>
 		<tr>
 			<td>' . _('Balances As At') . ':</td>
-			<td><select Name="PeriodEnd">';
+			<td><select name="PeriodEnd">';
 
 	$sql = "SELECT periodno, 
 					lastdate_in_period 
@@ -158,7 +159,8 @@
 			<div class="centre">
 				<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
 			</div>';
-
+    echo '</div>
+          </form>';
 	include('includes/footer.inc');
 }/*end of else not PrintPDF */
 

Modified: trunk/SupplierContacts.php
===================================================================
--- trunk/SupplierContacts.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierContacts.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -143,7 +143,7 @@
 		
 		echo '<table class="selection">
 				<tr>
-					<th colspan="7"><font size="3" color="navy">' . _('Contacts Defined for') . ' - ' . $myrow['suppname'] . '</font></th>
+					<th colspan="7"><h3>' . _('Contacts Defined for') . ' - ' . $myrow['suppname'] . '</h3></th>
 				</tr>';
 	
 		echo '<tr>
@@ -159,9 +159,9 @@
 					<td>%s</td>
 					<td>%s</td>
 					<td>%s</td>
-					<td><a href="mailto:%s">%s</td>
-					<td><a href="%s&SupplierID=%s&SelectedContact=%s">' . _('Edit') . '</td>
-					<td><a href="%s&SupplierID=%s&SelectedContact=%s&delete=yes" onclick=\'return confirm("'  . _('Are you sure you wish to delete this contact?') . '");\'>' .  _('Delete') . '</td></tr>',
+					<td><a href="mailto:%s">%s</a></td>
+					<td><a href="%s&amp;SupplierID=%s&amp;SelectedContact=%s">' . _('Edit') . '</a></td>
+					<td><a href="%s&amp;SupplierID=%s&amp;SelectedContact=%s&amp;delete=yes" onclick="return confirm(\''  . _('Are you sure you wish to delete this contact?') . '\');">' .  _('Delete') . '</a></td></tr>',
 					$myrow['contact'],
 					$myrow['position'],
 					$myrow['tel'],
@@ -175,6 +175,7 @@
 					$SupplierID,
 					$myrow['contact']);
 		} while ($myrow = DB_fetch_array($result));
+        echo '</table><br />';
 	} else {
 		prnMsg(_('There are no contacts defined for this supplier'),'info');
 	}
@@ -183,7 +184,6 @@
 
 //end of ifs and buts!
 
-echo '</table><br />';
 
 if (isset($SelectedContact)) {
 	echo '<div class="centre">
@@ -195,6 +195,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($SelectedContact)) {
@@ -253,9 +254,9 @@
 		$_POST['Email'] = '';
 	}
 
-	echo '<input type="hidden" name="SupplierID" value="' . $SupplierID . '" />
-		<tr>
-			<td>' . _('Position') . ':</td>
+	echo '<tr>
+            <td><input type="hidden" name="SupplierID" value="' . $SupplierID . '" />
+			' . _('Position') . ':</td>
 			<td><input type="text" name="Position" size="31" maxlength="30" value="' . $_POST['Position'] . '" /></td>
 		</tr>
 		<tr>
@@ -280,6 +281,7 @@
 	echo '<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/SupplierCredit.php
===================================================================
--- trunk/SupplierCredit.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierCredit.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -266,28 +266,29 @@
 		</tr>';
 
 echo '<tr>
-		<th><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' . $_SESSION['SuppTrans']->SupplierName . '</b></font></th>
-		<th><font color="blue"><b>' .  $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
-		<td><font color="blue"><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
-		<td><font color="blue"><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
+		<th><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' . $_SESSION['SuppTrans']->SupplierName . '</b></th>
+		<th><b>' .  $_SESSION['SuppTrans']->CurrCode . '</b></th>
+		<td><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></td>
+		<td><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></td>
 	</tr>
 	</table>';
 
-echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form1">';
+echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form1">';
+echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 echo '<br />
 		<table class="selection">';
 echo '<tr>
-		<td><font color="red">' . _('Supplier Credit Note Reference') . ':</font></td>
-		<td><font size="2"><input type="text" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '" /></td>';
+		<td style="color:red">' . _('Supplier Credit Note Reference') . ':</td>
+		<td><input type="text" size="20" maxlength="20" name="SuppReference" value="' . $_SESSION['SuppTrans']->SuppReference . '" /></td>';
 
 if (!isset($_SESSION['SuppTrans']->TranDate)){
 	$_SESSION['SuppTrans']->TranDate= Date($_SESSION['DefaultDateFormat'], Mktime(0,0,0,Date('m'),Date('d')-1,Date('y')));
 }
-echo '<td><font color="red">' . _('Credit Note Date') . ' (' . _('in format') . ' ' . $_SESSION['DefaultDateFormat'] . ') :</font></td>
+echo '<td style="color:red">' . _('Credit Note Date') . ' (' . _('in format') . ' ' . $_SESSION['DefaultDateFormat'] . ') :</td>
 		<td><input type="text" class="date" alt="' . $_SESSION['DefaultDateFormat'] . '" size="11" maxlength="10" name="TranDate" value="' . $_SESSION['SuppTrans']->TranDate . '" /></td>
-		<td><font color=red>' . _('Exchange Rate') . ':</font></td>
+		<td style="color:red">' . _('Exchange Rate') . ':</td>
 		<td><input type="text" class="number" size="11" maxlength="10" name="ExRate" value="' . locale_number_format($_SESSION['SuppTrans']->ExRate,'Variable') . '" /></td>
 	</tr>
 	</table>';
@@ -367,8 +368,8 @@
 	}
 
 	echo '<tr>
-			<td class="number"><font color="red">' . _('Total Credited Against Shipments') .  ':</font></td>
-			<td class="number"><font color="red"><U>' . locale_number_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) .  '</U></font></td>
+			<td class="number" style="color:red">' . _('Total Credited Against Shipments') .  ':</td>
+			<td class="number" style="color:red">' . locale_number_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) .  '</td>
 		</tr>
 		</table><br />';
 }
@@ -403,8 +404,8 @@
 	}
 
 	echo '<tr>
-			<td colspan="2" class="number"><font color="red">' . _('Total') . ':</font></td>
-			<td class="number"><font color="red"><u>' .  locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</u></font></td>
+			<td colspan="2" class="number" style="color:red">' . _('Total') . ':</td>
+			<td class="number" style="color:red">' .  locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 		</tr>
 		</table>';
 } //end loop around fixed assets
@@ -440,7 +441,7 @@
 		}
 	}
 
-	echo '<tr><td class="number" colspan="2"><font color="red">' . _('Total Credited against Contracts') . ':</font></td>
+	echo '<tr><td class="number" colspan="2" style="color:red">' . _('Total Credited against Contracts') . ':</td>
 			<td class="number">' .  locale_number_format($TotalContractsValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr></table><br />';
 }
@@ -482,8 +483,8 @@
 		}
 
 		echo '<tr>
-				<td colspan="3" class="number"><font color="red">' . _('Total GL Analysis') . ':</font></td>
-				<td class="number"><font color="red"><u>' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</u></font></td>
+				<td colspan="3" class="number" style="color:red">' . _('Total GL Analysis') . ':</td>
+				<td class="number" style="color:red">' . locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr>
 			</table>
 			<br />';
@@ -508,14 +509,14 @@
 
 	echo '<table class="selection">
 			<tr>
-				<td><font color="red">' . _('Credit Amount in Supplier Currency') . ':</font></td>
-				<td colspan="2" class="number">' . locale_number_format($_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td></tr>';
-	echo '<input type="hidden" name="OvAmount" value="' . locale_number_format($_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" />';
+				<td style="color:red">' . _('Credit Amount in Supplier Currency') . ':</td>
+				<td colspan="2" class="number">' . locale_number_format($_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces);
+    echo '<input type="hidden" name="OvAmount" value="' . locale_number_format($_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td></tr>';
 } else {
 	echo '<table class="selection">
 			<tr>
-				<td><font color="red">' . _('Credit Amount in Supplier Currency') .
-		  ':</font></td>
+				<td style="color:red">' . _('Credit Amount in Supplier Currency') .
+		  ':</td>
 		  	<td colspan="2" class="number"><input type="text" size="12" maxlength="10" name="OvAmount" value="' . locale_number_format($_SESSION['SuppTrans']->OvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" /></td></tr>';
 }
 
@@ -588,7 +589,7 @@
 $DisplayTotal = locale_number_format($_SESSION['SuppTrans']->OvAmount + $TaxTotal,$_SESSION['SuppTrans']->CurrDecimalPlaces);
 
 echo '<tr>
-		<td><font color="red">' . _('Credit Note Total') . '</font></td>
+		<td style="color:red">' . _('Credit Note Total') . '</td>
 		<td colspan="2" class="number"><b>' . $DisplayTotal. '</b></td>
 	</tr>
 	</table>
@@ -596,16 +597,15 @@
 
 echo '<table class="selection">
 		<tr>
-			<td><font color="red">' . _('Comments') . '</font></td>
+			<td style="color:red">' . _('Comments') . '</td>
 			<td><textarea name="Comments" cols="40" rows="2">' . $_SESSION['SuppTrans']->Comments . '</textarea></td>
 		</tr>
 	</table>';
 
-echo '<p>
+echo '<br />
 		<div class="centre">
 			<input type="submit" name="PostCreditNote" value="' . _('Enter Credit Note') . '" />
-		</div>
-	</p>';
+		</div>';
 
 
 if (isset($_POST['PostCreditNote'])){
@@ -1337,6 +1337,7 @@
 
 } /*end of process credit note */
 
-echo '</form>';
+echo '</div>
+      </form>';
 include('includes/footer.inc');
 ?>
\ No newline at end of file

Modified: trunk/SupplierInquiry.php
===================================================================
--- trunk/SupplierInquiry.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierInquiry.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -158,9 +158,11 @@
 echo '<br />
 	<div class="centre">
 		<form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post">';
-echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+echo '<div>
+        <input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 echo _('Show all transactions after') . ': ' .'<input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'] .'" name="TransAfterDate" value="' . $_POST['TransAfterDate'] . '" maxlength="10" size="10" /> 
-	<input type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" />
+	    <input type="submit" name="Refresh Inquiry" value="' . _('Refresh Inquiry') . '" />
+    </div>
 	</form>
 	<br />';
 echo '</div>';
@@ -192,7 +194,7 @@
 $TransResult = DB_query($SQL, $db, $ErrMsg, $DbgMsg);
 
 if (DB_num_rows($TransResult) == 0){
-	echo '<p><div class="centre">' . _('There are no transactions to display since') . ' ' . $_POST['TransAfterDate'];
+	echo '<br /><div class="centre">' . _('There are no transactions to display since') . ' ' . $_POST['TransAfterDate'];
 	echo '</div>';
 	include('includes/footer.inc');
 	exit;
@@ -254,8 +256,8 @@
 					<td class="number">' . locale_number_format($myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>
 					<td class="number">' . locale_number_format($myrow['totalamount']-$myrow['allocated'],$SupplierRecord['currdecimalplaces']) . '</td>
 					<td align="left">' . $myrow['transtext'] . '</td>
-					<td><a target="_blank" href="' . $rootpath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&TransNo=' . $myrow['transno'] .'">' . _('View GL Postings') . '</a></td>
-					<td><a href="' . $rootpath . '/PaymentAllocations.php?SuppID=' . $myrow['supplierno'] . '&InvID=' . $myrow['suppreference'] .'">' . _('View Payments') . '</a></td>
+					<td><a target="_blank" href="' . $rootpath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] . '&amp;TransNo=' . $myrow['transno'] .'">' . _('View GL Postings') . '</a></td>
+					<td><a href="' . $rootpath . '/PaymentAllocations.php?SuppID=' . $myrow['supplierno'] . '&amp;InvID=' . $myrow['suppreference'] .'">' . _('View Payments') . '</a></td>
 					</tr>';
 			} else {
 				echo '<td>' . $myrow['transno'] . '</td>
@@ -277,15 +279,15 @@
 				$AuthRow=DB_fetch_array($AuthResult);
 				
 				if ($AuthRow[0]==0) {
-					echo '<td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&HoldTrans=' . $myrow['transno']. '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue .'</a></td>';
+					echo '<td><a href="' .htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?HoldType=' . $myrow['type'] . '&amp;HoldTrans=' . $myrow['transno']. '&amp;HoldStatus=' . $HoldValue . '&amp;FromDate=' . $_POST['TransAfterDate'].'">' . $HoldValue .'</a></td>';
 				} else {
 					if ($HoldValue==_('Release')) {
 						echo '<td>' . $HoldValue .'</a></td>';
 					} else {
-						echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?' . 'HoldType=' . $myrow['type'] .'&HoldTrans=' . $myrow['transno'] . '&HoldStatus=' . $HoldValue . '&FromDate=' . $_POST['TransAfterDate'] .'">'.$HoldValue .'</a></td>';
+						echo '<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'). '?' . 'HoldType=' . $myrow['type'] .'&amp;HoldTrans=' . $myrow['transno'] . '&amp;HoldStatus=' . $HoldValue . '&amp;FromDate=' . $_POST['TransAfterDate'] .'">'.$HoldValue .'</a></td>';
 					}
 				}
-				echo '<td><a target="_blank" href="' . $rootpath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] .'&TransNo=' . $myrow['transno'] .'">' ._('View GL Postings') . '</a></td></tr>';
+				echo '<td><a target="_blank" href="' . $rootpath . '/GLTransInquiry.php?TypeID=' . $myrow['type'] .'&amp;TransNo=' . $myrow['transno'] .'">' ._('View GL Postings') . '</a></td></tr>';
 			}
 		} else {
 
@@ -321,8 +323,8 @@
 						<td class="number">%s</td>
 						<td class="number">%s</td>
 						<td align=left>%s</td>
-						<td><a href="%s?HoldType=%s&HoldTrans=%s&HoldStatus=%s&FromDate=%s">%s</a></td>
-						<td><a href="%s/PaymentAllocations.php?SuppID=%s&InvID=%s">' . _('View Payments') . '</a></tr>',
+						<td><a href="%s?HoldType=%s&amp;HoldTrans=%s&amp;HoldStatus=%s&amp;FromDate=%s">%s</a></td>
+						<td><a href="%s/PaymentAllocations.php?SuppID=%s&amp;InvID=%s">' . _('View Payments') . '</a></tr>',
 						$myrow['transno'],
 						$myrow['typename'],
 						$myrow['suppreference'],
@@ -356,7 +358,7 @@
 					<td class="number">%s</td>
 					<td align="left">%s</td>
 					<td><a href="%s/SupplierAllocations.php?AllocTrans=%s">' . _('View Allocations') . '</a></td>
-					<td><a target="_blank" href="%s/GLTransInquiry.php?TypeID=%s&TransNo=%s">' . _('View GL Postings') . '</a></td>
+					<td><a target="_blank" href="%s/GLTransInquiry.php?TypeID=%s&amp;TransNo=%s">' . _('View GL Postings') . '</a></td>
 					</tr>',
 					$myrow['transno'],
 					$myrow['typename'],

Modified: trunk/SupplierInvoice.php
===================================================================
--- trunk/SupplierInvoice.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierInvoice.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -238,15 +238,16 @@
 			</tr>';
 
 	echo '<tr>
-			<td><font color=blue><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
-		$_SESSION['SuppTrans']->SupplierName . '</b></font></td>
-			<th><font color=blue><b>' .  $_SESSION['SuppTrans']->CurrCode . '</b></font></th>
-			<td><font color=blue><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></font></td>
-			<td><font color=blue><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></font></td>
+			<td><b>' . $_SESSION['SuppTrans']->SupplierID . ' - ' .
+		$_SESSION['SuppTrans']->SupplierName . '</b></td>
+			<th><b>' .  $_SESSION['SuppTrans']->CurrCode . '</b></th>
+			<td><b>' . $_SESSION['SuppTrans']->TermsDescription . '</b></td>
+			<td><b>' . $_SESSION['SuppTrans']->TaxGroupDescription . '</b></td>
 		</tr>
 		</table>';
 
-	echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" name="form1" />';
+	echo '<br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '" method="post" id="form1">';
+    echo '<div>';
 	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
 
 	echo '<br /><table class="selection">';
@@ -313,8 +314,8 @@
 		}
 
 		echo '<tr>
-				<td colspan="5" class="number"><font color="blue">' . _('Total Value of Goods Charged') . ':</font></td>
-				<td class="number"><font color="blue"><U>' . locale_number_format($TotalGRNValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</U></font></td>
+				<td colspan="5" class="number" style="color:blue">' . _('Total Value of Goods Charged') . ':</td>
+				<td class="number" style="color:blue">' . locale_number_format($TotalGRNValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr>
 			</table>';
 	}
@@ -353,8 +354,8 @@
 		}
 
 		echo '<tr>
-				<td class="number"><font color="blue">' . _('Total shipment charges') . ':</font></td>
-				<td class="number"><font color="blue"><u>' .  locale_number_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</u></font></td>
+				<td class="number" style="color:blue">' . _('Total shipment charges') . ':</td>
+				<td class="number" style="color:blue">' .  locale_number_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr>
 			</table>';
 	}
@@ -393,8 +394,8 @@
 		}
 
 		echo '<tr>
-				<td colspan="2" class="number"><font color="blue">' . _('Total asset additions') . ':</font></td>
-				<td class="number"><font color="blue"><u>' .  locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</u></font></td>
+				<td colspan="2" class="number" style="color:blue">' . _('Total asset additions') . ':</td>
+				<td class="number" style="color:blue">' .  locale_number_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr>
 			</table>';
 	} //end loop around assets added to invocie
@@ -435,8 +436,8 @@
 		}
 
 		echo '<tr>
-				<td colspan="2" class="number"><font color="blue">' . _('Total contract charges') . ':</font></td>
-				<td class="number"><font color="blue">' .  locale_number_format($TotalContractsValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
+				<td colspan="2" class="number" style="color:blue">' . _('Total contract charges') . ':</td>
+				<td class="number" style="color:blue">' .  locale_number_format($TotalContractsValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 			</tr>
 			</table>';
 	}
@@ -473,8 +474,8 @@
 			}
 
 			echo '<tr>
-					<td colspan="3" class="number"><font color="blue">' . _('Total GL Analysis') .  ':</font></td>
-					<td class="number"><font color="blue">' .  locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</font></td>
+					<td colspan="3" class="number" style="color:blue">' . _('Total GL Analysis') .  ':</td>
+					<td class="number" style="color:blue">' .  locale_number_format($TotalGLValue,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '</td>
 				</tr>
 				</table>';
 		}
@@ -528,7 +529,7 @@
 		if (!isset($_POST['OverRideTax']) 
 			OR $_POST['OverRideTax']=='Auto'){
 
-			echo  ' <input type="text" class="number" name=TaxRate' . $Tax->TaxCalculationOrder . ' maxlength="4" size="4" value="' . locale_number_format($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100,$_SESSION['SuppTrans']->CurrDecimalPlaces)  . '" />%';
+			echo  ' <input type="text" class="number" name="TaxRate' . $Tax->TaxCalculationOrder . '" maxlength="4" size="4" value="' . locale_number_format($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100,$_SESSION['SuppTrans']->CurrDecimalPlaces)  . '" />%';
 
 			/*Now recaluclate the tax depending on the method */
 			if ($Tax->TaxOnTax ==1){
@@ -551,7 +552,7 @@
 //		}
 			$_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount = filter_number_format($_POST['TaxAmount'  . $Tax->TaxCalculationOrder]);
 
-			echo  ' <input type="hidden" name="TaxRate"' . $Tax->TaxCalculationOrder . ' value="' . locale_number_format($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" />';
+			echo  ' <input type="hidden" name="TaxRate' . $Tax->TaxCalculationOrder . '" value="' . locale_number_format($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxRate * 100,$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" />';
 
 			echo '</td>
 				<td><input type="text" class="number" size="12" maxlength="12" name="TaxAmount'  . $Tax->TaxCalculationOrder . '"  value="' . locale_number_format(round($_SESSION['SuppTrans']->Taxes[$Tax->TaxCalculationOrder]->TaxOvAmount,$_SESSION['SuppTrans']->CurrDecimalPlaces),$_SESSION['SuppTrans']->CurrDecimalPlaces) . '" />';
@@ -585,6 +586,8 @@
 				<input type="submit" name="PostInvoice" value="' . _('Enter Invoice') . '" />
 			</div>';
 
+    echo '</div>
+          </form>';
 } else { // $_POST['PostInvoice'] is set so do the postings -and dont show the button to process
 
 /*First do input reasonableness checks
@@ -1518,6 +1521,5 @@
 	echo '<div class="centre"><a href="'.$rootpath.'/SupplierInvoice.php" >'._('Back to Invoice Entry').'</a></div>';
 } //end of return link for input errors
 
-echo '</form>';
 include('includes/footer.inc');
 ?>

Modified: trunk/SupplierPriceList.php
===================================================================
--- trunk/SupplierPriceList.php	2012-04-23 02:34:38 UTC (rev 5275)
+++ trunk/SupplierPriceList.php	2012-04-23 03:06:00 UTC (rev 5276)
@@ -8,6 +8,7 @@
 
 if (isset($_POST['StockSearch'])) {
 	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" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
 
@@ -43,7 +44,7 @@
 		echo '<input type="search" name="Keywords" size="34" maxlength="25" placeholder="Enter part of the item description" />';
 	}
 	echo '</td></tr><tr><td></td>';
-	echo '<td><font size="3"><b>' . _('OR') . ' ' . '</b></font>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
+	echo '<td><b>' . _('OR') . ' ' . '</b>' . _('Enter partial') . ' <b>' . _('Stock Code') . '</b>:</td>';
 	echo '<td>';
 	if (isset($_POST['StockCode'])) {
 		echo '<input type="text" name="StockCode" value="' . $_POST['StockCode'] . '" size="15" maxlength="18" />';
@@ -53,7 +54,8 @@
 	echo '</td></tr></table><br />';
 	echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div><br />';
 	echo '<script  type="text/javascript">defaultControl(document.forms[0].StockCode);</script>';
-	echo '</form>';
+	echo '</div>
+          </form>';
 	include('includes/footer.inc');
 	exit;
 }
@@ -211,6 +213,7 @@
 if (isset($searchresult) AND !isset($_POST['Select'])) {
 	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') . '" alt="" />' . ' ' . _('Search for Inventory Items'). '</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 '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
 	$ListCount = DB_num_rows($searchresult);
@@ -281,7 +284,10 @@
 			//end of page full new headings if
 		}
 		//end of while loop
-		echo '</table></form><br />';
+		echo '</table>
+              <br />
+              </div>
+              </form>';
 		include('includes/footer.inc');
 		exit;
 	}
@@ -380,16 +386,20 @@
 	}
 	if (!isset($_POST['SearchSupplier'])) {
 		echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Search for a supplier') . '</p><br />';
-		echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
-				<table cellpadding="3" class="selection"><tr>';
-		echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-		echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</font></td>';
+		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 '<table cellpadding="3" class="selection"><tr>';
+		echo '<td>' . _('Text in the Supplier') . ' <b>' . _('NAME') . '</b>:</td>';
 		echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td>';
-		echo '<td><font size="3"><b>' . _('OR') . '</b></font></td>';
-		echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</font></td>';
+		echo '<td><b>' . _('OR') . '</b></td>';
+		echo '<td>' . _('Text in Supplier') . ' <b>' . _('CODE') . '</b>:</td>';
 		echo '<td><input type="text" name="SupplierCode" size="15" maxlength="18" /></td>';
 		echo '</tr></table><br />';
-		echo '<div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" /></div></form>';
+		echo '<div class="centre"><input type="submit" name="SearchSupplier" value="' . _('Find Suppliers Now') . '" /></div>';
+        echo '</div>
+              </form>';
 		include ('includes/footer.inc');
 		exit;
 	};
@@ -427,9 +437,11 @@
 
 if (isset($SuppliersResult)) {
 	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Select a supplier') . '</p><br />';
-	echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">
-			<table cellpadding="2" class="selection">';
-	echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+	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 '<table cellpadding="2" class="selection">';
 	$TableHeader = '<tr><th>' . _('Code') . '</th>
 						<th>' . _('Supplier Name') . '</th>
 				<th>' . _('Currency') . '</th>
@@ -447,12 +459,12 @@
 			echo '<tr class="OddTableRows">';
 			$k++;
 		}
-	   printf('<td><font size="1"><input type="submit" name="SupplierID" value="%s" /></font></td>
-				<td><font size="1">%s</font></td>
-				<td><font size="1">%s</font></td>
-				<td><font size="1">%s</font></td>
-				<td><font size="1">%s</font></td>
-				<td><font size="1">%s</font></td>
+	   printf('<td><input type="submit" name="SupplierID" value="%s" /></td>
+				<td>%s</td>
+				<td>%s</td>
+				<td>%s</td>
+				<td>%s</td>
+				<td>%s</td>
 			</tr>',
 				$myrow['supplierid'],
 				$myrow['suppname'],
@@ -464,7 +476,10 @@
 
 	}
 	//end of while loop
-	echo '</table><br/></form>';
+	echo '</table>
+          <br/>
+          </div>
+          </form>';
 	include('includes/footer.inc');
 	exit;
 }
@@ -473,6 +488,7 @@
 if (isset($_POST['SupplierID'])) {
 	echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/supplier.png" title="' . _('Search') . '" alt="" />' . _('Supplier Purchasing Data') . '</p><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'] . '" />';
 	$SQL="SELECT purchdata.stockid,
 				stockmaster.description,
@@ -499,9 +515,9 @@
 	$UOMResult = DB_query($UOMSQL, $db);
 	echo '<input type="hidden" value="' . $_POST['SupplierID'] . '" name="SupplierID" />';
 	echo '<table class="selection">';
-	echo '<tr><th colspan="8" style="text-align: left"><font color="navy" size="3">' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</font></th>';
-	echo '<th colspan="5" style="text-align: right"><font color="navy" size="2">' . _('Find new Item Code') . '</font>
-			<button type="submit" name="StockSearch"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" /></button></th></tr>';
+	echo '<tr><th colspan="8" style="text-align: left"><h3>' . _('Supplier purchasing data for') . ' ' . $_POST['SupplierID'] . '</h3></th>';
+	echo '<th colspan="5" style="text-align: right">' . _('Find new Item Code') . '
+			<button type="submit" name="StockSearch"><img width="15" src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" alt="" /></button></th></tr>';
 	echo '<tr>
 			<th>' . _('StockID') . '</th>
 			<th>' . _('Description') . '</th>
@@ -541,7 +557,7 @@
 				echo '<td><input type="text" class="date" size="11" value="' . date( $_SESSION['DefaultDateFormat']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '"  name="EffectiveFrom0" /></td>
 				<td><input type="text" size="20" maxlength="50" value="" name="SupplierPartNo0" /></td>
 				<td><input type="text" class="number" size="11" value="1" name="MinOrderQty0" /></td>
-				<td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+				<td><button type="submit" style="width:100%;text-align:left" name="Insert"><img width="15" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" alt="" /></button></td>
 			</tr>';
 	}
 
@@ -572,12 +588,13 @@
 				echo '<td><input type="text" class="date" size="11" value="' . ConvertSQLDate($myrow['effectivefrom']) . '" alt="' . $_SESSION['DefaultDateFormat'] . '"  name="EffectiveFrom'.$RowCounter.'" /></td>
 				<td><input type="text" size="20" maxlength="50" value="' . $myrow['suppliers_partno'] . '" name="SupplierPartNo'.$RowCounter.'" /></td>
 				<td><input type="text" class="number" size="11" value="' . $myrow['minorderqty'] . '" name="MinOrderQty'.$RowCounter.'" /></td>
-				<td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15px" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" /></button></td>
+				<td><button type="submit" style="width:100%;text-align:left" name="Update'.$RowCounter.'"><img width="15" src="' . $rootpath . '/css/' . $theme . '/images/tick.png" alt="" /></button></td>
 			</tr>';
 		$RowCounter++;
 	}
 	echo '</table>';
-	echo '</form>';
+	echo '</div>
+          </form>';
 	include('includes/footer.inc');
 	exit;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





[Web-erp-svn] SF.net SVN: web-erp:[5276] trunk

Accounting & Best Practice Business Administration System

[Web-erp-svn] SF.net SVN: web-erp:[5276] trunk