[Weberp-cvs] SF.net SVN: web-erp:[3815] trunk

[<tim...@us...>]

Revision: 3815
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3815&view=rev
Author:   tim_schofield
Date:     2010-09-28 09:23:01 +0000 (Tue, 28 Sep 2010)

Log Message:
-----------
Layout changes and improvements

Modified Paths:
--------------
    trunk/SuppShiptChgs.php
    trunk/doc/Change.log.html

Modified: trunk/SuppShiptChgs.php
===================================================================
--- trunk/SuppShiptChgs.php	2010-09-28 09:06:27 UTC (rev 3814)
+++ trunk/SuppShiptChgs.php	2010-09-28 09:23:01 UTC (rev 3815)
@@ -19,6 +19,12 @@
 
 include('includes/header.inc');
 
+if ($_SESSION['SuppTrans']->InvoiceOrCredit == 'Invoice'){
+	echo '<a href="' . $rootpath . '/SupplierInvoice.php?' . SID . '">' . _('Back to Invoice Entry') . '</a>';
+} else {
+	echo '<a href="' . $rootpath . '/SupplierCredit.php?' . SID . '">' . _('Back to Credit Note Entry') . '</a>';
+}
+
 if (!isset($_SESSION['SuppTrans'])){
 	prnMsg(_('Shipment charges or credits are entered against supplier invoices or credit notes respectively') . '. ' . _('To enter supplier transactions the supplier must first be selected from the supplier selection screen') . ', ' . _('then the link to enter a supplier invoice or credit note must be clicked on'),'info');
 	echo "<br><a href='$rootpath/SelectSupplier.php?" . SID ."'>" . _('Select A Supplier') . '</a>';
@@ -64,7 +70,7 @@
 }
 echo $_SESSION['SuppTrans']->SuppReference . ' ' ._('From') . ' ' . $_SESSION['SuppTrans']->SupplierName;
 echo '</div>';
-echo '<table cellpadding=2>';
+echo '<table cellpadding=2 class=selection>';
 $TableHeader = '<tr><th>' . _('Shipment') . '</th>
 		<th>' . _('Amount') . '</th></tr>';
 echo $TableHeader;
@@ -82,34 +88,28 @@
 }
 
 echo '<tr>
-	<td colspan=2 class=number><font size=4 color=BLUE>' . _('Total') . ':</font></td>
-	<td class=number><font size=4 color=BLUE><U>' . number_format($TotalShiptValue,2) . '</U></font></td>
+	<td class=number><font size=2 color=navy>' . _('Total') . ':</font></td>
+	<td class=number><font size=2 color=navy><U>' . number_format($TotalShiptValue,2) . '</U></font></td>
 </tr>
-</table>';
+</table><br />';
 
-if ($_SESSION['SuppTrans']->InvoiceOrCredit == 'Invoice'){
-	echo '<br><a href="' . $rootpath . '/SupplierInvoice.php?' . SID . '">' . _('Back to Invoice Entry') . '</a><hr>';
-} else {
-	echo '<br><a href="' . $rootpath . '/SupplierCredit.php?' . SID . '">' . _('Back to Credit Note Entry') . '</a><hr>';
-}
-
 /*Set up a form to allow input of new Shipment charges */
 echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method="post">';
 
 if (!isset($_POST['ShiptRef'])) {
 	$_POST['ShiptRef']='';
 }
-echo '<table>';
+echo '<table class=selection>';
 echo '<tr><td>' . _('Shipment Reference') . ':</td>
 	<td><input type="text" name="ShiptRef" size="12" maxlength="11" VALUE="' .  $_POST['ShiptRef'] . '"></td></tr>';
 echo '<tr><td>' . _('Shipment Selection') . ':<br> ' . _('If you know the code enter it above') . '<br>' . _('otherwise select the shipment from the list') . '</td><td><select name="ShiptSelection">';
 
-$sql = 'SELECT shiptref, 
-							vessel, 
-							eta, 
-							suppname 
-						FROM shipments INNER JOIN suppliers 
-							ON shipments.supplierid=suppliers.supplierid 
+$sql = 'SELECT shiptref,
+							vessel,
+							eta,
+							suppname
+						FROM shipments INNER JOIN suppliers
+							ON shipments.supplierid=suppliers.supplierid
 						WHERE closed=0';
 
 $result = DB_query($sql, $db);
@@ -132,7 +132,7 @@
 	<td><input type="text" name="Amount" size="12" maxlength="11" VALUE="' .  $_POST['Amount'] . '"></td></tr>';
 echo '</table>';
 
-echo '<input type="submit" name="AddShiptChgToInvoice" VALUE="' . _('Enter Shipment Charge') . '">';
+echo '<br /><div class=centre><input type="submit" name="AddShiptChgToInvoice" VALUE="' . _('Enter Shipment Charge') . '"></div>';
 
 echo '</form>';
 include('includes/footer.inc');

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-09-28 09:06:27 UTC (rev 3814)
+++ trunk/doc/Change.log.html	2010-09-28 09:23:01 UTC (rev 3815)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>28/09/10 Tim: SuppShiptChargesphp - Layout changes and improvements</p>
 <p>28/09/10 Tim: SuppPriceList.php - Layout changes and improvements</p>
 <p>27/09/10 Paul Thursby: Various default.css files -- Minor CSS corrections.</p>
 <p>27/09/10 Tim: SuppPaymentRun.php - SQL quoting corrections and layout changes and improvements</p>


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