[Weberp-svn] SF.net SVN: weberp:[8759] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8759] trunk
|
From: <tim...@us...> - 2012-05-01 14:15:48
|
Revision: 8759
http://weberp.svn.sourceforge.net/weberp/?rev=8759&view=rev
Author: tim_schofield
Date: 2012-05-01 14:15:40 +0000 (Tue, 01 May 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/PO_AuthorisationLevels.php
trunk/PO_AuthoriseMyOrders.php
trunk/PO_Header.php
trunk/PO_Items.php
trunk/PO_PDFPurchOrder.php
trunk/PO_SelectOSPurchOrder.php
trunk/PO_SelectPurchOrder.php
trunk/Prices.php
trunk/PricesBasedOnMarkUp.php
trunk/PricesByCost.php
trunk/PrintCustStatements.php
trunk/PrintCustTrans.php
trunk/PrintCustTransPortrait.php
trunk/ReorderLevel.php
trunk/ReorderLevelLocation.php
Modified: trunk/PO_AuthorisationLevels.php
===================================================================
--- trunk/PO_AuthorisationLevels.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_AuthorisationLevels.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -10,9 +10,10 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/group_add.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
$User='';
$Currency='';
-$CanCreate=1;
-$OffHold=1;
+$CanCreate=0;
+$OffHold=0;
$AuthLevel=0;
+$InputError=0;
if (isset($_POST['Submit'])) {
if (isset($_POST['CanCreate']) and $_POST['CanCreate']=='on') {
$CanCreate=0;
@@ -27,13 +28,24 @@
if ($_POST['AuthLevel']=='') {
$_POST['AuthLevel']=0;
}
+ if ($_POST['UserID']=='') {
+ prnMsg(_('You must select a user from the list'), 'error');
+ echo '<br />';
+ $InputError=1;
+ }
+ if ($_POST['CurrCode']=='') {
+ prnMsg(_('You must select a currency from the list'), 'error');
+ echo '<br />';
+ $InputError=1;
+ }
+
$sql="SELECT COUNT(*)
FROM purchorderauth
WHERE userid='".$_POST['UserID']."'
AND currabrev='".$_POST['CurrCode']."'";
$result=DB_query($sql, $db);
$myrow=DB_fetch_array($result);
- if ($myrow[0]==0) {
+ if ($myrow[0]==0 and $InputError==0) {
$sql="INSERT INTO purchorderauth (
userid,
currabrev,
@@ -129,16 +141,8 @@
echo '<td><a href="'.$rootpath.'/PO_AuthorisationLevels.php?Delete=Yes&UserID=' . $myrow['userid'] . '&Currency='.$myrow['currabrev'].'">'._('Delete').'</td></tr>';
}
-echo '</table><br /><br />';
+echo '</table><br />';
-if (!isset($_GET['Edit'])) {
- $UserID=$_SESSION['UserID'];
- $Currency=$_SESSION['CompanyRecord']['currencydefault'];
- $CanCreate='No';
- $OffHold='No';
- $AuthLevel=0;
-}
-
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post" name="form1">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
@@ -150,6 +154,7 @@
echo '<tr><td>'._('User ID').'</td><td><select name="UserID">';
$usersql="SELECT userid FROM www_users";
$userresult=DB_query($usersql,$db);
+ echo '<option value=""></option>';
while ($myrow=DB_fetch_array($userresult)) {
if ($myrow['userid']==$UserID) {
echo '<option selected="True" value="'.$myrow['userid'].'">'.$myrow['userid'].'</option>';
@@ -192,6 +197,7 @@
echo '<input type="hidden" name="CurrCode" value="'.$Currency.'" />';
} else {
echo '<tr><td>'._('Currency').'</td><td><select name="CurrCode">';
+ echo '<option value=""></option>';
$currencysql="SELECT currabrev,currency FROM currencies";
$currencyresult=DB_query($currencysql,$db);
while ($myrow=DB_fetch_array($currencyresult)) {
@@ -205,27 +211,31 @@
}
echo '<tr><td>'._('User can create orders').'</td>';
-if ($CanCreate=='No') {
+if (isset($CanCreate) and $CanCreate=='No') {
echo '<td><input type="checkbox" name="CanCreate" /></td></tr>';
} else {
echo '<td><input type="checkbox" checked="True" name="CanCreate" /></td></tr>';
}
echo '<tr><td>'._('User can release invoices').'</td>';
-if ($OffHold=='No') {
+if (isset($OffHold) and $OffHold=='No') {
echo '<td><input type="checkbox" name="OffHold" /></td></tr>';
} else {
echo '<td><input type="checkbox" checked="True" name="OffHold" /></td></tr>';
}
echo '<tr><td>'._('User can authorise orders up to :').'</td>';
-echo '<td><input type="input" name="AuthLevel" size="11" class="number" value="'.locale_money_format($AuthLevel, $Currency).'" /></td></tr>';
+if ($Currency!='') {
+ echo '<td><input type="input" name="AuthLevel" size="11" class="number" value="'.locale_money_format($AuthLevel, $Currency).'" /></td></tr>';
+} else {
+ echo '<td><input type="input" name="AuthLevel" size="11" class="number" value="0" /></td></tr>';
+}
echo '</table>';
if (isset($_GET['Edit'])) {
- echo '<br /><div class="centre"><input type="submit" name="Update" value="'._('Update Information').'" /></div></form>';
+ echo '<br /><div class="centre"><button type="submit" name="Update">'._('Update Information').'</button></div><br /></form>';
} else {
- echo '<br /><div class="centre"><input type="submit" name="Submit" value="'._('Enter Information').'" /></div></form>';
+ echo '<br /><div class="centre"><button type="submit" name="Submit">'._('Enter Information').'</button></div><br /></form>';
}
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_AuthoriseMyOrders.php
===================================================================
--- trunk/PO_AuthoriseMyOrders.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_AuthoriseMyOrders.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -125,7 +125,7 @@
}
} //end while header loop
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="updateall" value="' . _('Update'). '" /></form>';
+echo '<br /><div class="centre"><button type="submit" name="updateall" value="" />' . _('Update'). '</button></div><br /></form>';
include('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PO_Header.php
===================================================================
--- trunk/PO_Header.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_Header.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -544,8 +544,8 @@
<td><input type="text" name="SuppCode" size="15" maxlength="18" /></td>
</tr>
</table><br /><div class="centre">
- <input type="submit" name="SearchSuppliers" value="' . _('Search Now') . '" />
- <input type="submit" action="reset" value="' . _('Reset') . '" /></div>';
+ <button type="submit" name="SearchSuppliers">' . _('Search Now') . '</button>
+ <button type="submit" action="reset">' . _('Reset') . '</button></div>';
echo '<script type="text/javascript">defaultControl(document.forms[0].Keywords);</script>';
@@ -575,7 +575,7 @@
$k++;
}
- echo '<td><input type="submit" style="width:100%" name="Select" value="'.$myrow['supplierid'].'" /></td>
+ echo '<td><button type="submit" style="width:100%" name="Select">'.$myrow['supplierid'].'</button></td>
<td>'.$myrow['suppname'].'</td><td>';
for ($i=1; $i<=6; $i++) {
@@ -722,13 +722,10 @@
}
echo '<br /><table width="80%">
- <tr>
- <th><font color="blue" size="4"><b>' . _('Order Initiation Details') . '</b></font></th>
- <th><font color="blue" size="4"><b>' . _('Order Status') . '</b></font></th>
- </tr>
<tr><td style="width:50%">';
//sub table starts
echo '<table class="selection" width="100%">';
+ echo '<tr><th colspan="3" class="header">' . _('Order Initiation Details') . '</th></tr>';
echo '<tr><td>' . _('PO Date') . ':</td><td>';
if ($_SESSION['ExistingOrder'.$identifier]!=0){
echo ConvertSQLDate($_SESSION['PO'.$identifier]->Orig_OrderDate);
@@ -788,8 +785,8 @@
<td><select name="RePrint" onChange="ReloadForm(form1.AllowRePrint)">
<option selected="True" value="0">' . _('No') . '</option>
<option value="1">' . _('Yes') . '</option>
- </select></td>';
- echo '<td><input type="submit" name="AllowRePrint" value="Update" /></td></tr>';
+ </select>';
+ echo '<button type="submit" name="AllowRePrint">' . _('Update') . '</button></td></tr>';
} elseif ($Printed) {
echo '<tr><td colspan="2"><a target="_blank" href="' . $rootpath . '/PO_PDFPurchOrder.php?OrderNo=' . $_SESSION['ExistingOrder'.$identifier] . '&identifier='.$identifier. '">' . _('Reprint Now') . '</a></td></tr>';
}
@@ -797,6 +794,8 @@
echo '</table>';
echo '<td style="width:50%" valign="top"><table class="selection" width="100%">';
+ echo '<tr><th colspan="3" class="header">' . _('Order Status') . '</th></th></tr>';
+
if($_SESSION['ExistingOrder'.$identifier] != 0 and $_SESSION['PO'.$identifier]->Status == PurchOrder::STATUS_PRINTED){
echo '<tr><td><a href="' .$rootpath . '/GoodsReceived.php?&PONumber=' . $_SESSION['PO'.$identifier]->OrderNo . '&identifier='.$identifier.'">'._('Receive this order').'</a></td></tr>';
}
@@ -849,21 +848,26 @@
<td><input type="text" name="StatusComments" size="50" /></td></tr>
<tr><td colspan="2"><b>' . html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,'UTF-8') .'</b></td></tr>';
//need to use single quotes as double quotes inside the string of StatusComments
- echo "<input type='hidden' name='StatusCommentsComplete' value='" . addslashes(html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,'UTF-8')) ."' />";
- echo '<tr><td><input type="submit" name="UpdateStatus" value="' . _('Status Update') .'" /></td>';
+ echo '<input type="hidden" name="StatusCommentsComplete" value="' . addslashes(html_entity_decode($_SESSION['PO'.$identifier]->StatComments,ENT_QUOTES,'UTF-8')) . '" />';
+ echo '<tr><td><button type="submit" name="UpdateStatus">' . _('Status Update') .'</button></td>';
echo '</tr></table></td>';
echo '<table width="80%">
<tr>
- <th><font color="blue" size="4"><b>' . _('Warehouse Info') . '</b></font></th>
- <th><font color="blue" size="4"><b>' . _('Supplier Info') . '</b></font></th>
+
+
</tr>
<tr><td valign="top">';
/*nested table level1 */
- echo '<table class="selection" width="100%"><tr><td>' . _('Warehouse') . ':</td>
- <td><select name="StkLocation" onChange="ReloadForm(form1.LookupDeliveryAddress)">';
+ echo '<table class="selection" width="100%">
+ <tr>
+ <th colspan="3" class="header">' . _('Warehouse Info') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Warehouse') . ':</td>
+ <td><select name="StkLocation" onChange="ReloadForm(form1.LookupDeliveryAddress)">';
$sql = "SELECT loccode,
locationname
@@ -880,7 +884,7 @@
}
echo '</select>
- <input type="submit" name="LookupDeliveryAddress" value="' ._('Select') . '" /></td>
+ <button type="submit" name="LookupDeliveryAddress">' ._('Select') . '</button></td>
</tr>';
/* If this is the first time
@@ -1010,8 +1014,13 @@
/* end of sub table */
echo '</td><td>'; /*sub table nested */
- echo '<table class="selection" width="100%"><tr><td>' . _('Supplier Selection') . ':</td><td>
- <select name="Keywords" onChange="ReloadForm(form1.SearchSuppliers)">';
+ echo '<table class="selection" width="100%">
+ <tr>
+ <th class="header" colspan="3">' . _('Supplier Info') . '</th>
+ </tr>
+ <tr>
+ <td>' . _('Supplier Selection') . ':</td>
+ <td><select name="Keywords" onChange="ReloadForm(form1.SearchSuppliers)">';
$SuppCoResult = DB_query("SELECT supplierid, suppname FROM suppliers ORDER BY suppname",$db);
@@ -1024,7 +1033,7 @@
}
echo '</select> ';
- echo '<input type="submit" name="SearchSuppliers" value="' . _('Select Now') . '" /></td></tr>';
+ echo '<button type="submit" name="SearchSuppliers">' . _('Select Now') . '</button></td></tr>';
echo '</td></tr><tr><td>' . _('Supplier Contact') . ':</td><td>
<select name="SupplierContact">';
@@ -1094,7 +1103,7 @@
}
echo '</td></tr></table>'; /*end of sub table */
- echo '</td></tr><tr><th colspan="4"><font color="blue" size="4"><b>' . _('Comments');
+ echo '</td></tr><tr><td colspan="2"><table class="selection" width="100%"><tr><th colspan="4" class="header">' . _('Comments') . ':</b></font></th></tr>';
$Default_Comments = '';
@@ -1102,13 +1111,14 @@
$_POST['Comments']=$Default_Comments;
}
- echo ':</b></font></th></tr><tr><td colspan="4"><textarea name="Comments" style="width:100%" rows="5">' . $_POST['Comments'] . '</textarea>';
+ echo '<tr><td colspan="4"><textarea name="Comments" style="width:100%" rows="5">' . $_POST['Comments'] . '</textarea>';
+ echo '</table></td></tr>';
echo '</table>';
echo '</td></tr></table><br />'; /* end of main table */
- echo '<div class="centre"><input type="submit" name="EnterLines" value="' . _('Enter Line Items') . '" /></div>';
+ echo '<div class="centre"><button type="submit" name="EnterLines">' . _('Enter Line Items') . '</button></div>';
} /*end of if supplier selected */
Modified: trunk/PO_Items.php
===================================================================
--- trunk/PO_Items.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_Items.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -961,7 +961,6 @@
<td><input type="text" class="number" name="Price' . $POLine->LineNo . '" size="11" value="' .$DisplayPrice.'" /></td>
<td class="number">' . $DisplayLineTotal . '</td>
<td><input type="text" class="date" alt="' .$_SESSION['DefaultDateFormat'].'" name="ReqDelDate' . $POLine->LineNo.'" size="11" value="' .$POLine->ReqDelDate .'" /></td>
- <td>'.$POLine->PODetailRec.'</td>
<td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?identifier='.$identifier. '&Delete=' . $POLine->LineNo . '">' . _('Delete') . '</a></td></tr>';
$_SESSION['PO'.$identifier]->Total = $_SESSION['PO'.$identifier]->Total + $LineTotal;
}
@@ -969,8 +968,8 @@
$DisplayTotal = locale_money_format($_SESSION['PO'.$identifier]->Total,$_SESSION['PO'.$identifier]->CurrCode);
echo '<tr><td colspan="6" class="number">' . _('TOTAL') . _(' excluding Tax') . '</td><td class="number"><b>' . $DisplayTotal . '</b></td></tr></table>';
- echo '<br /><div class="centre"><input type="submit" name="UpdateLines" value="Update Order Lines" />';
- echo ' <input type="submit" name="Commit" value="Process Order" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="UpdateLines">' . _('Update Order Lines') . '</button>';
+ echo ' <button type="submit" name="Commit">' . _('Process Order') . '</button></div>';
if (!isset($_POST['NewItem']) and isset($_GET['Edit'])) {
/*show a form for putting in a new line item with or without a stock entry */
@@ -1020,7 +1019,7 @@
<tr><td>'._('Delivery Date').'</td>
<td><input type="text" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" name="ReqDelDate" size="11" value="'.$_SESSION['PO'.$identifier]->DeliveryDate .'" /></td></tr>';
echo '</table>';
- echo '<div class="centre"><input type="submit" name="EnterLine" value="Enter Item" /></div>';
+ echo '<div class="centre"><button type="submit" name="EnterLine">' . _('Enter Item') . '</button></div>';
}
/* Now show the stock item selection search stuff below */
@@ -1036,9 +1035,9 @@
$DbgMsg = _('The SQL used to retrieve the category details but failed was');
$result1 = DB_query($sql,$db,$ErrMsg,$DbgMsg);
- echo '<table class="selection"><tr><th colspan="3"><font size="3" color="blue">'. _('Search For Stock Items') . '</th>';
+ echo '<table class="selection"><tr><th colspan="3" class="header">'. _('Search For Stock Items') . '</th>';
- echo ':</font></tr><tr><td><select name="StockCat">';
+ echo ':</tr><tr><td><select name="StockCat">';
echo '<option selected="True" value="All">' . _('All') . '</option>';
while ($myrow1 = DB_fetch_array($result1)) {
@@ -1071,8 +1070,8 @@
<tr><td></td>
<td><font size="3"><b>' . _('OR') . ' </b></font><a target="_blank" href="'.$rootpath.'/Stocks.php">' . _('Create a New Stock Item') . '</a></td></tr>
</table><br />
- <div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" />
- <input type="submit" name="NonStockOrder" value="' . _('Order a non stock item') . '" />
+ <div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button>
+ <button type="submit" name="NonStockOrder">' . _('Order a non stock item') . '</button>
</div><br />';
@@ -1158,7 +1157,7 @@
prnMsg( _('Only the first') . ' ' . $Maximum_Number_Of_Parts_To_Show . ' ' . _('can be displayed') . '. ' .
_('Please restrict your search to only the parts required'),'info');
}
- echo '<a name="end"></a><br /><div class="centre"><input type="submit" name="NewItem" value="Order some" /></div>';
+ echo '<a name="end"></a><br /><div class="centre"><button type="submit" name="NewItem" value="" />' . _('Order some') . '</button></div>';
}#end if SearchResults to show
echo '</form>';
Modified: trunk/PO_PDFPurchOrder.php
===================================================================
--- trunk/PO_PDFPurchOrder.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_PDFPurchOrder.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -417,7 +417,7 @@
} else {
echo '</table>';
}
- echo '<br /><div class="centre"><input type="submit" name="DoIt" value="' . _('OK') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="DoIt">' . _('OK') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
}
Modified: trunk/PO_SelectOSPurchOrder.php
===================================================================
--- trunk/PO_SelectOSPurchOrder.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_SelectOSPurchOrder.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -181,7 +181,7 @@
} else {
echo '<option value="Rejected">' . _('Rejected') . '</option>';
}
- echo '</select> <input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" /></td></tr></table>';
+ echo '</select> <button type="submit" name="SearchOrders">' . _('Search Purchase Orders') . '</button></td></tr></table>';
}
$SQL="SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
@@ -205,8 +205,8 @@
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td></tr><tr><td></td>';
echo '<td><font size="4"><b>' . _('OR') . '</b></font><font size="1">' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td></tr></table><br />';
-echo '<table><tr><td><input type="submit" name="SearchParts" value="' . _('Search Parts Now') . '" />';
-echo '<input type="submit" name="ResetPart" value="' . _('Show All') . '" /></td></tr></table>';
+echo '<table><tr><td><button type="submit" name="SearchParts">' . _('Search Parts Now') . '</button>';
+echo '<button type="submit" name="ResetPart">' . _('Show All') . '</button></td></tr></table>';
echo '<br />';
@@ -233,12 +233,13 @@
$k=1;
}
- printf('<td><input type="submit" name="SelectedStockItem" value="%s" /></td>
+ printf('<td><button type="submit" name="SelectedStockItem" value="%s">%s</button></td>
<td>%s</td>
<td class="number">%s</td>
<td class="number">%s</td>
<td>%s</td></tr>',
$myrow['stockid'],
+ $myrow['stockid'],
$myrow['description'],
locale_number_format($myrow['qoh'], $myrow['decimalplaces']),
locale_number_format($myrow['qord'], $myrow['decimalplaces']),
Modified: trunk/PO_SelectPurchOrder.php
===================================================================
--- trunk/PO_SelectPurchOrder.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PO_SelectPurchOrder.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -157,11 +157,11 @@
} else {
echo '<option value="Complete">' . _('Completed') . '</option>';
}
- echo '</select> <input type="submit" name="SearchOrders" value="' . _('Search Purchase Orders') . '" /></td></tr></table>';
+ echo '</select> <button type="submit" name="SearchOrders">' . _('Search Purchase Orders') . '</button></td></tr></table>';
}
$SQL = "SELECT categoryid, categorydescription FROM stockcategory ORDER BY categorydescription";
$result1 = DB_query($SQL, $db);
-echo '<br /><br /><table class="selection"><tr><td>';
+echo '<br /><table class="selection"><tr><td>';
echo '<font size="1">' . _('To search for purchase orders for a specific part use the part selection facilities below') . '</font>';
echo '<tr><td><font size="1">' . _('Select a stock category') . ':</font><select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
@@ -175,8 +175,8 @@
echo '<td><input type="text" name="Keywords" size="20" maxlength="25" /></td></tr><tr><td></td>';
echo '<td><font size="3"><b>' . _('OR') . ' </b></font><font size="1">' . _('Enter extract of the') . '<b>' . _('Stock Code') . '</b>:</font></td>';
echo '<td><input type="text" name="StockCode" size="15" maxlength="18" /></td></tr>';
-echo '<tr><td colspan="3"><div class="centre"><input type="submit" name="SearchParts" value="' . _('Search Parts Now') . '" />';
-echo '<input type="submit" name="ResetPart" value="' . _('Show All') . '" /></div></td></tr>';
+echo '<tr><td colspan="3"><div class="centre"><button type="submit" name="SearchParts">' . _('Search Parts Now') . '</button>';
+echo '<button type="submit" name="ResetPart">' . _('Show All') . '</button></div></td></tr>';
echo '</table><br /><br />';
if (isset($StockItemsResult)) {
echo '<table cellpadding="2" class="selection">';
@@ -197,7 +197,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><input type="submit" name="SelectedStockItem" value="' . $myrow['stockid'] . '" /></td>
+ echo '<td><button type="submit" name="SelectedStockItem" value="' . $myrow['stockid'] . '">' . $myrow['stockid'] . '</button></td>
<td>' . $myrow['description'] . '</td>
<td class="number">' . locale_number_format($myrow['qoh'], $myrow['decimalplaces']) . '</td>
<td class="number">' . locale_number_format($myrow['qord'], $myrow['decimalplaces']) . '</td>
Modified: trunk/Prices.php
===================================================================
--- trunk/Prices.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/Prices.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -224,7 +224,7 @@
echo '<tr><th colspan="8"><form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo _('Pricing for part') . ':<input type="text" name="Item" maxsize="22" value="' . $Item . '" maxlength="20" />
- <input type="submit" name="NewPart" value="' . _('Review Prices') . '" />';
+ <button type="submit" name="NewPart">' . _('Review Prices') . '</button>';
echo '</th></tr></form>';
echo '<tr>
@@ -335,7 +335,7 @@
}
echo '<br /><table class="selection">';
- echo '<tr><th colspan="5"><font color="blue" size="3"><b>' . $Item . ' - ' . $PartDescription . '</b></font></th></tr>';
+ echo '<tr><th colspan="5" class="header"><b>' . $Item . ' - ' . $PartDescription . '</b></th></tr>';
echo '<tr><td>' . _('Sales Type Price List') . ':</td><td><select name="TypeAbbrev">';
@@ -425,8 +425,8 @@
echo '</table>';
echo '<br /><div class="centre">';
- echo '<input type="submit" name="submit" value="'. _('Enter') . '/' . _('Amend Price') . '" />';
- echo '</div>';
+ echo '<button type="submit" name="submit">'. _('Enter') . '/' . _('Amend Price') . '</button>';
+ echo '</div><br />';
}
}
Modified: trunk/PricesBasedOnMarkUp.php
===================================================================
--- trunk/PricesBasedOnMarkUp.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PricesBasedOnMarkUp.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -161,8 +161,9 @@
<td><input type="text" name="IncreasePercent" class="number" size="4" maxlength="4" value="' . $_POST['IncreasePercent'] . '" /></td></tr></table>';
-echo '<p><div class="centre">
- <input type="submit" name="UpdatePrices" value="' . _('Update Prices') . '\' onclick="return confirm(\'' . _('Are you sure you wish to update or add all the prices according to the criteria selected?') . '\');" /></div></p>';
+echo '<br /><div class="centre">
+ <button type="submit" name="UpdatePrices" onclick="return confirm(\'' . _('Are you sure you wish to update or add all the prices according to the criteria selected?') . '\');" />' . _('Update Prices') . '</button>
+ </div>';
echo '</form>';
Modified: trunk/PricesByCost.php
===================================================================
--- trunk/PricesByCost.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PricesByCost.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -221,8 +221,8 @@
} //end of looping
echo '<input type="hidden" name="Counter" value="' . $PriceCounter . '" />';
echo '<tr>
- <td colspan="12" style="text-align:center"><input type="submit" name="submit" value="' . _('Update') . '" />
- <a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"><input type="submit" value="' . _('Back') . '" /><a/></td>
+ <td colspan="12" style="text-align:center"><button type="submit" name="submit">' . _('Update') . '</button>
+ <a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"><button type="submit">' . _('Back') . '</button><a/></td>
</tr></form>';
} else {
prnMsg(_('There were no prices meeting the criteria specified to review'),'info');
@@ -230,7 +230,7 @@
}
} else { /*The option to submit was not hit so display form */
echo '<div class="page_help_text">' . _('Use this report to display price list with the cost.') . '</div><br />';
- echo '<br /><br /><form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"><table class="selection">';
+ 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'] . '" />';
$SQL = "SELECT categoryid, categorydescription
@@ -283,7 +283,7 @@
} //end while loop
DB_data_seek($result, 0);
echo '</select></td></tr>';
- echo '</table><br /><p><div class="centre"><input type="submit" name="submit" value="' . _('Submit') . '" /></div></p>';
+ echo '</table><br /><div class="centre"><button type="submit" name="submit">' . _('Submit') . '</button></div>';
} /*end of else not submit */
include ('includes/footer.inc');
?>
\ No newline at end of file
Modified: trunk/PrintCustStatements.php
===================================================================
--- trunk/PrintCustStatements.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PrintCustStatements.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -423,10 +423,10 @@
<tr><td>'. _('Ending Customer statement to print (Customer code)').'</td><td>
<input type="text" maxlength="6" size="7" name="ToCust" value="zzzzzz" /></td></tr></table>
<br /><div class="centre">
- <input type="submit" name="PrintPDF" value="' . _('Print All Statements in the Range Selected').'" />
+ <button type="submit" name="PrintPDF">' . _('Print All Statements in the Range Selected').'</button>
</div>';
}
- echo '<br /><br /><br />';
+ echo '<br />';
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/PrintCustTrans.php
===================================================================
--- trunk/PrintCustTrans.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PrintCustTrans.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -362,7 +362,7 @@
}
} /* end loop to print invoices */
-if (($InvOrCredit == 'Invoice' or $InvOrCredit == 'Credit') and isset($PrintPDF)) {
+if (isset($InvOrCredit) and ($InvOrCredit == 'Invoice' or $InvOrCredit == 'Credit') and isset($PrintPDF)) {
if (isset($_GET['Email'])) { //email the invoice to address supplied
include ('includes/header.inc');
@@ -416,12 +416,12 @@
echo '</select></td></tr>';
echo '<tr><td>' . _('Start invoice/credit note number to print') . '</td><td><input type="text" class="number" maxlength="6" size="7" name="FromTransNo" /></td></tr>';
echo '<tr><td>' . _('End invoice/credit note number to print') . '</td><td><input type="text" class="number" maxlength="6" size="7" name="ToTransNo" /></td></tr></table>';
- echo '<br /><div class="centre"><input type="submit" name="Print" value="' . _('Print') . '" /><br />';
- echo '<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="Print">' . _('Print') . '</button><br />';
+ echo '<br /><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button></div>';
$sql = "SELECT typeno FROM systypes WHERE typeid=10";
$result = DB_query($sql, $db);
$myrow = DB_fetch_row($result);
- echo '<div class="page_help_text"><b>' . _('The last invoice created was number') . ' ' . $myrow[0] . '</b><br />' . _('If only a single invoice is required') . ', ' . _('enter the invoice number to print in the Start transaction number to print field and leave the End transaction number to print field blank') . '. ' . _('Only use the end invoice to print field if you wish to print a sequential range of invoices') . '';
+ echo '<br /><div class="page_help_text"><b>' . _('The last invoice created was number') . ' ' . $myrow[0] . '</b><br />' . _('If only a single invoice is required') . ', ' . _('enter the invoice number to print in the Start transaction number to print field and leave the End transaction number to print field blank') . '. ' . _('Only use the end invoice to print field if you wish to print a sequential range of invoices') . '';
$sql = "SELECT typeno FROM systypes WHERE typeid=11";
$result = DB_query($sql, $db);
$myrow = DB_fetch_row($result);
Modified: trunk/PrintCustTransPortrait.php
===================================================================
--- trunk/PrintCustTransPortrait.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/PrintCustTransPortrait.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -560,15 +560,15 @@
echo '</select></td></tr>';
echo '<tr><td>' . _('Start invoice/credit note number to print') . '</td><td><input class="number" type="text" maxlength="6" size="7" name="FromTransNo" /></td></tr>';
echo '<tr><td>' . _('End invoice/credit note number to print') . '</td><td><input class="number" type="text" maxlength="6" size="7" name="ToTransNo" /></td></tr></table>';
- echo '<div class="centre"><br /><input type="submit" name="Print" value="' . _('Print Preview') . '" /><br />';
- echo '<input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
+ echo '<div class="centre"><br /><button type="submit" name="Print">' . _('Print Preview') . '</button><br />';
+ echo '<br /><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button></div>';
$sql = "SELECT typeno FROM systypes WHERE typeid=10";
$result = DB_query($sql,$db);
$myrow = DB_fetch_row($result);
- echo '<div class="page_help_text"><b>' . _('The last invoice created was number') . ' ' . $myrow[0] . '</b><br />' .
+ echo '<br /><div class="page_help_text"><b>' . _('The last invoice created was number') . ' ' . $myrow[0] . '</b><br />' .
_('if only a single invoice is required') . ', ' .
_('enter the invoice number to print in the Start transaction number to print field and leave the End transaction number to print field blank')
. '. ' . _('Only use the end invoice to print field if you wish to print a sequential range of invoices') . '';
Modified: trunk/ReorderLevel.php
===================================================================
--- trunk/ReorderLevel.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/ReorderLevel.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -251,7 +251,7 @@
echo '</table>
<br />
<div class="centre">
- <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
+ <button type="submit" name="PrintPDF">' . _('Print PDF') . '</button>
</div>';
include('includes/footer.inc');
Modified: trunk/ReorderLevelLocation.php
===================================================================
--- trunk/ReorderLevelLocation.php 2012-05-01 13:53:11 UTC (rev 8758)
+++ trunk/ReorderLevelLocation.php 2012-05-01 14:15:40 UTC (rev 8759)
@@ -35,7 +35,9 @@
$order="locstock.stockid";
}
- $sql="SELECT locstock.stockid, stockmaster.description,
+ $sql="SELECT locstock.stockid,
+ stockmaster.description,
+ stockmaster.decimalplaces,
locstock.reorderlevel,
(SELECT SUM(salesorderdetails.qtyinvoiced)
FROM salesorderdetails,salesorders
@@ -59,9 +61,9 @@
$ResultLocation = DB_query($sqlloc,$db);
$Location=DB_fetch_array($ResultLocation);
- echo'<p class="page_title_text" align="center"><strong>' . _('Location : ') . '' . $Location['locationname'] . ' </strong></p>';
- echo'<p class="page_title_text" align="center"><strong>' . _('Number Of Days Sales : ') . '' . $_POST['NumberOfDays'] . '' . _(' Days ') . ' </strong></p>';
- echo '<table>';
+ echo'<p class="page_title_text" align="center">' . _('Location : ') . '' . $Location['locationname'] . '</p>';
+ echo'<p class="page_title_text" align="center">' . _('Number Of Days Sales : ') . '' . $_POST['NumberOfDays'] . '' . _(' Days ') . '</p>';
+ echo '<table class="selection">';
echo '<tr><th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Total Invoiced').'<br />'._('At All Locations') . '</th>
@@ -133,20 +135,20 @@
$ohin = DB_query($sqlohin,$db);
$ohinRow = DB_fetch_array($ohin);
- echo'<td>'.$myrow['stockid'].'</td>
+ echo '<td>'.$myrow['stockid'].'</td>
<td>'.$myrow['description'].'</td>
- <td class="number">'.$QtyInvoiceAll.'</td>
- <td class="number">'.$QtyInvoice.'</td>
- <td class="number">'.$ohRow['0'].'</td>
- <td class="number">'.$ohinRow['0'].'</td>
- <td><input type="text" class="number" name="ReorderLevel' . $i .'" maxlength="3" size="4" value="'. $myrow['reorderlevel'] .'" />
+ <td class="number">'.locale_number_format($QtyInvoiceAll,$myrow['decimalplaces']).'</td>
+ <td class="number">'.locale_number_format($QtyInvoice,$myrow['decimalplaces']).'</td>
+ <td class="number">'.locale_number_format($ohRow['0'],$myrow['decimalplaces']).'</td>
+ <td class="number">'.locale_number_format($ohinRow['0'],$myrow['decimalplaces']).'</td>
+ <td><input type="text" class="number" name="ReorderLevel' . $i .'" maxlength="10" size="12" value="'. locale_number_format($myrow['reorderlevel'],$myrow['decimalplaces']) .'" />
<input type="hidden" name="StockID' . $i . '" value="' . $myrow['stockid'] . '" /></td>
</tr> ';
$i++;
} //end of looping
echo'<tr>
- <td style="text-align:center" colspan="7"><input type="submit" name="submit" value="' . _('Update') . '" /></td>
+ <td style="text-align:center" colspan="7"><button type="submit" name="submit">' . _('Update') . '</button></td>
</tr></form>';
@@ -196,7 +198,7 @@
echo '<option value="2">'. _('Code') . '</option>';
echo '</select></td></tr>';
- echo '</table><br /><p><div class="centre"><input type="submit" name="submit" value="' . _('Submit') . '" /></div></p>';
+ echo '</table><br /><p><div class="centre"><button type="submit" name="submit">' . _('Submit') . '</button></div></p>';
} /*end of else not submit */
include('includes/footer.inc');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
