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

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

Revision: 3650
          http://web-erp.svn.sourceforge.net/web-erp/?rev=3650&view=rev
Author:   tim_schofield
Date:     2010-07-20 13:55:38 +0000 (Tue, 20 Jul 2010)

Log Message:
-----------
Add in the new quantity on hand field

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

Modified: trunk/StockLocMovements.php
===================================================================
--- trunk/StockLocMovements.php	2010-07-20 11:36:56 UTC (rev 3649)
+++ trunk/StockLocMovements.php	2010-07-20 13:55:38 UTC (rev 3650)
@@ -11,6 +11,10 @@
 
 echo '<form action="' . $_SERVER['PHP_SELF'] . '?' . SID . '" method=post>';
 
+echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/magnifier.png" title="' . _('Search') .
+	'" alt="">' . ' ' . $title.'</p>';
+
+echo '<table class=selection><tr><td>';
 echo '  ' . _('From Stock Location') . ':<select name="StockLocation"> ';
 
 $sql = 'SELECT loccode, locationname FROM locations';
@@ -30,7 +34,7 @@
 	}
 }
 
-echo '</select><br>';
+echo '</select>';
 
 if (!isset($_POST['BeforeDate']) OR !Is_Date($_POST['BeforeDate'])){
    $_POST['BeforeDate'] = Date($_SESSION['DefaultDateFormat']);
@@ -40,8 +44,8 @@
 }
 echo ' ' . _('Show Movements before') . ': <input type=TEXT name="BeforeDate" size=12 maxlength=12 Value="' . $_POST['BeforeDate'] . '">';
 echo ' ' . _('But after') . ': <input type=TEXT name="AfterDate" size=12 maxlength=12 Value="' . $_POST['AfterDate'] . '">';
-echo ' <input type=submit name="ShowMoves" VALUE="' . _('Show Stock Movements') . '">';
-echo '<hr>';
+echo '</td></tr></table><br>';
+echo '<div class=centre><input type=submit name="ShowMoves" VALUE="' . _('Show Stock Movements') . '"></div><br>';
 
 
 $SQLBeforeDate = FormatDateForSQL($_POST['BeforeDate']);
@@ -72,7 +76,7 @@
 $ErrMsg = _('The stock movements for the selected criteria could not be retrieved because');
 $MovtsResult = DB_query($sql, $db,$ErrMsg);
 
-echo '<table cellpadding=5 CELLSPACING=4 BORDER=0>';
+echo '<table cellpadding=5 CELLSPACING=4 class=selection>';
 $tableheader = '<tr>
 		<th>' . _('Item Code') . '</th>
 		<th>' . _('Type') . '</th>
@@ -83,6 +87,7 @@
 		<th>' . _('Reference') . '</th>
 		<th>' . _('Price') . '</th>
 		<th>' . _('Discount') . '</th>
+		<th>' . _('Quantity on Hand') . '</th>
 		</tr>';
 echo $tableheader;
 
@@ -111,6 +116,7 @@
 			<td>%s</td>
 			<td class=number>%s</td>
 			<td class=number>%s</td>
+			<td class=number>%s</td>
 			</tr>",
 			strtoupper($myrow['stockid']),
 			strtoupper($myrow['stockid']),
@@ -122,7 +128,8 @@
 			$myrow['decimalplaces']),
 			$myrow['reference'],
 			number_format($myrow['price'],2),
-			number_format($myrow['discountpercent']*100,2));
+			number_format($myrow['discountpercent']*100,2),
+			number_format($myrow['newqoh'],$myrow['decimalplaces']));
 	$j++;
 	If ($j == 16){
 		$j=1;
@@ -132,7 +139,7 @@
 }
 //end of while loop
 
-echo '</table><hr>';
+echo '</table>';
 echo '</form>';
 
 include('includes/footer.inc');

Modified: trunk/doc/Change.log.html
===================================================================
--- trunk/doc/Change.log.html	2010-07-20 11:36:56 UTC (rev 3649)
+++ trunk/doc/Change.log.html	2010-07-20 13:55:38 UTC (rev 3650)
@@ -1,5 +1,6 @@
 <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p>
 <p></p>
+<p>20/07/10 Tim: StockLocMovements.php - Add in the new quantity on hand field</p>
 <p>20/07/10 Tim: TopItems.php - Show value in functional currency, and show decimal places correctly</p>
 <p>20/07/10 Tim: Daily Transactions listings - Show reports correctly even in mysql strict mode</p>
 <p>19/07/10 Tim: FixedassetTransfer.php - Layout changes and sql quoting, use javascript to change location</p>


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