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

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

Revision: 3387
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3387&view=rev
Author:   tim_schofield
Date:     2010-03-16 08:37:07 +0000 (Tue, 16 Mar 2010)

Log Message:
-----------
Tim: PO_SelecOSPurchOrder.php - Correctly position link to create a new order

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

Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php	2010-03-16 08:23:36 UTC (rev 3386)
+++ trunk/PO_SelectOSPurchOrder.php	2010-03-16 08:37:07 UTC (rev 3387)
@@ -35,7 +35,7 @@
 
 
 if (isset($_POST['ResetPart'])){
-     unset($SelectedStockItem);
+	 unset($SelectedStockItem);
 }
 
 if (isset($OrderNumber) && $OrderNumber!='') {
@@ -130,10 +130,10 @@
 */
 
 if (!isset($OrderNumber) or $OrderNumber=='' ){
-    echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title;
-	echo '<br><br>&nbsp;&nbsp;<a href="' . $rootpath . '/PO_Header.php?' .SID . '&NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
-    echo '<div class="centre">'._('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9>  ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
-   	$sql = 'SELECT loccode, locationname FROM locations';
+	echo '<a href="' . $rootpath . '/PO_Header.php?' .SID . '&NewOrder=Yes">' . _('Add Purchase Order') . '</a>';
+	echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/magnifier.png" title="' . _('Search') . '" alt="">' . ' ' . $title.'</p>';
+	echo '<div class="centre">'._('Order Number') . ': <input type=text name="OrderNumber" MAXLENGTH =8 size=9>  ' . _('Into Stock Location') . ':<select name="StockLocation"> ';
+	$sql = 'SELECT loccode, locationname FROM locations';
 	$resultStkLocs = DB_query($sql,$db);
 	while ($myrow=DB_fetch_array($resultStkLocs)){
 		if (isset($_POST['StockLocation'])){
@@ -211,7 +211,7 @@
 		}
 
 		printf("<td><input type=submit name='SelectedStockItem' VALUE='%s'</td>
-		        <td>%s</td>
+				<td>%s</td>
 			<td class=number>%s</td>
 			<td class=number>%s</td>
 			<td>%s</td></tr>",
@@ -265,7 +265,7 @@
 				suppliers.currcode';
 	} else {
 
-	      /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+		  /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
 
 		if (isset($SelectedSupplier)) {
 
@@ -400,7 +400,7 @@
 
 	echo '<table cellpadding=2 colspan=7 WIDTH=100%>';
 
-//	               '</td><td class="tableheader">' . _('Receive') .
+//				   '</td><td class="tableheader">' . _('Receive') .
 	$TableHeader = '<tr><th>' . _('Order #') .
 			'</th><th>' . _('Order Date') .
 			'</th><th>' . _('Initiated by') .
@@ -443,16 +443,16 @@
 		}
 		if ($myrow['status'] == PurchOrder::STATUS_AUTHORISED) {
 			$PrintPurchOrder = '
-                <a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
-                ' . _('Print') . '
-                </a>';
+				<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=2">
+				' . _('Print') . '
+				</a>';
 		} else {
 			$PrintPurchOrder = _(PurchOrder::STATUS_PRINTED);
 		}
 		$PrintPurchOrder2 = '
-            <a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=1">
-                ' . _('Show') . '
-            </a>';
+			<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=1">
+				' . _('Show') . '
+			</a>';
 		$s2 = '<a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?' . SID . '&OrderNo=' . $myrow['orderno'] . '&realorderno=' . $myrow['realorderno'] . '&ViewingOnly=1">' . $myrow['realorderno']. '</a>';
 
 		$FormatedOrderDate = ConvertSQLDate($myrow['orddate']);
@@ -465,7 +465,7 @@
 //			$myrow['initiator']);
 //			'</td><td class="tableheader">' . _('Requisition') .
 //			'</td><td class="tableheader">' . _('Initiator') .
-//		        <td><a href='%s'>" . _('Receive') . "</a></td>
+//				<td><a href='%s'>" . _('Receive') . "</a></td>
 		printf("<td>%s</font></td>
 			<td>%s</td>
 			<td>%s</td>

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-03-16 08:23:36 UTC (rev 3386)
+++ trunk/doc/Change.log.html	2010-03-16 08:37:07 UTC (rev 3387)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Correctly position link to create a new order</p>
 <p>16/03/10 Tim: PO_SelecOSPurchOrder.php - Change option from Printed to Print in case where order is not yet printed</p>
 <p>15/03/10 Tim: Layout changes to make SelectCustomer.php SelectProduct.php and SelectSupplier.php have a similar look and feel to them</p>
 <p>14/03/10 Tim: Various layout improvements</p>


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