From: <tim...@us...> - 2010-09-24 18:47:54
|
Revision: 3774 http://web-erp.svn.sourceforge.net/web-erp/?rev=3774&view=rev Author: tim_schofield Date: 2010-09-24 18:47:48 +0000 (Fri, 24 Sep 2010) Log Message: ----------- Layout changes and improvements and bug fixes Modified Paths: -------------- trunk/SelectRecurringSalesOrder.php trunk/doc/Change.log.html Modified: trunk/SelectRecurringSalesOrder.php =================================================================== --- trunk/SelectRecurringSalesOrder.php 2010-09-24 18:18:59 UTC (rev 3773) +++ trunk/SelectRecurringSalesOrder.php 2010-09-24 18:47:48 UTC (rev 3774) @@ -7,13 +7,16 @@ include('includes/header.inc'); echo '<form action=' . $_SERVER['PHP_SELF'] .'?' .SID . ' method=post>'; +echo '<p class="page_title_text"><img src="' . $rootpath . '/css/' . $theme . '/images/customer.png" title="' . + _('Inventory Items') . '" alt="">' . ' ' . $title . '</p>'; -echo _('Select recurring order templates for delivery from:') . ' ' . '<select name="StockLocation">'; +echo '<table class=selection><tr><td>'; +echo _('Select recurring order templates for delivery from:') . ' </td><td>' . '<select name="StockLocation">'; $sql = 'SELECT loccode, locationname FROM locations'; - + $resultStkLocs = DB_query($sql,$db); - + while ($myrow=DB_fetch_array($resultStkLocs)){ if (isset($_POST['StockLocation'])){ if ($myrow['loccode'] == $_POST['StockLocation']){ @@ -28,14 +31,12 @@ } } -echo '</select>  '; - -echo "<input type=submit name='SearchRecurringOrders' VALUE='" . _('Search Recurring Orders') . "'>"; +echo '</select></td></tr></table>'; -echo '<hr>'; +echo "<br /><div class=centre><input type=submit name='SearchRecurringOrders' VALUE='" . _('Search Recurring Orders') . "'></div>"; if (isset($_POST['SearchRecurringOrders'])){ - + $SQL = "SELECT recurringsalesorders.recurrorderno, debtorsmaster.name, custbranch.brname, @@ -64,14 +65,14 @@ recurringsalesorders.lastrecurrence, recurringsalesorders.stopdate, recurringsalesorders.frequency"; - + $ErrMsg = _('No recurring orders were returned by the SQL because'); $SalesOrdersResult = DB_query($SQL,$db,$ErrMsg); - + /*show a table of the orders returned by the SQL */ - - echo '<table cellpadding=2 colspan=7 WIDTH=100%>'; - + + echo '<br /><table cellpadding=2 colspan=7 width=90% class=selection>'; + $tableheader = "<tr> <th>" . _('Modify') . "</th> <th>" . _('Customer') . "</th> @@ -82,14 +83,14 @@ <th>" . _('Times p.a.') . "</th> <th>" . _('Order Total') . "</th> </tr>"; - + echo $tableheader; - + $j = 1; $k=0; //row colour counter while ($myrow=DB_fetch_array($SalesOrdersResult)) { - - + + if ($k==1){ echo '<tr class="EvenTableRows">'; $k=0; @@ -97,12 +98,12 @@ echo '<tr class="OddTableRows">';; $k++; } - + $ModifyPage = $rootpath . "/RecurringSalesOrders.php?" . SID . '&ModifyRecurringSalesOrder=' . $myrow['recurrorderno']; $FormatedLastRecurrence = ConvertSQLDate($myrow['lastrecurrence']); $FormatedStopDate = ConvertSQLDate($myrow['stopdate']); $FormatedOrderValue = number_format($myrow['ordervalue'],2); - + printf("<td><a href='%s'>%s</a></td> <td>%s</td> <td>%s</td> @@ -121,7 +122,7 @@ $FormatedStopDate, $myrow['frequency'], $FormatedOrderValue); - + $j++; If ($j == 12){ $j=1; @@ -130,7 +131,7 @@ //end of page full new headings if } //end of while loop - + echo '</table></form>'; } Modified: trunk/doc/Change.log.html =================================================================== --- trunk/doc/Change.log.html 2010-09-24 18:18:59 UTC (rev 3773) +++ trunk/doc/Change.log.html 2010-09-24 18:47:48 UTC (rev 3774) @@ -1,5 +1,6 @@ <p><font SIZE=4 COLOR=BLUE><b>webERP Change Log</b></font></p> <p></p> +<p>24/09/10 Tim: SelectRecurringSalesOrder.php - Layout changes and improvements and bug fixes</p> <p>24/09/10 Tim: SelectProduct.php - SQL quoting corrections</p> <p>24/09/10 Tim: SelectOrderItems.php - SQL quoting corrections</p> <p>24/09/10 Tim: SelectGLAccount.php - SQL quoting corrections and layout changes and improvements and bug fixes</p> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |