[Weberp-svn] SF.net SVN: weberp:[8751] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8751] trunk
|
From: <tim...@us...> - 2012-04-29 19:24:47
|
Revision: 8751
http://weberp.svn.sourceforge.net/weberp/?rev=8751&view=rev
Author: tim_schofield
Date: 2012-04-29 19:24:39 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/SelectCreditItems.php
trunk/SelectSalesOrder.php
trunk/SelectWorkOrder.php
trunk/ShipmentCosting.php
trunk/Shipments.php
trunk/Shipt_Select.php
trunk/StockCostUpdate.php
trunk/StockSerialItems.php
trunk/StockStatus.php
trunk/StockUsage.php
trunk/SuppCreditGRNs.php
trunk/SuppFixedAssetChgs.php
trunk/SuppInvGRNs.php
trunk/SuppShiptChgs.php
trunk/SuppTransGLAnalysis.php
trunk/SupplierContacts.php
trunk/SupplierTenders.php
trunk/TaxGroups.php
trunk/WhereUsedInquiry.php
trunk/WorkOrderStatus.php
trunk/Z_UpgradeDatabase.php
trunk/css/silverwolf/default.css
Modified: trunk/SelectCreditItems.php
===================================================================
--- trunk/SelectCreditItems.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SelectCreditItems.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -184,7 +184,7 @@
}
echo '</table><br />';
- echo '<div class="centre"><input type="submit" name="Search" value="' . _('Search Now') . '" /></div>';
+ echo '<div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button></div>';
if (isset($_SESSION['SalesmanLogin']) and $_SESSION['SalesmanLogin'] != '') {
prnMsg(_('Your account enables you to see only customers allocated to you'), 'warn', _('Note: Sales-person Login'));
}
@@ -387,9 +387,9 @@
$ListPage++;
}
echo '</select>
- <input type="submit" name="Go1" value="' . _('Go') . '" />
- <input type="submit" name="Previous" value="' . _('Previous') . '" />
- <input type="submit" name="Next" value="' . _('Next') . '" />';
+ <button type="submit" name="Go1">' . _('Go') . '</button>
+ <button type="submit" name="Previous">' . _('Previous') . '</button>
+ <button type="submit" name="Next">' . _('Next') . '</button>';
echo '</div>';
}
echo '<br /><table cellpadding="2" class="selection">';
@@ -419,7 +419,7 @@
echo '<tr class="OddTableRows">';
$k = 1;
}
- echo '<td><font size="1"><input type="submit" name="Customer' . $j . '" value="' . _('Select') . '" /></font></td>
+ echo '<td><button type="submit" name="Customer' . $j . '">' . _('Select') . '</button></td>
<td><font size="1">' . htmlspecialchars_decode($myrow['name']) . '</font></td>
<td><font size="1">' . htmlspecialchars_decode($myrow['brname']) . '</font></td>
<td><font size="1">' . htmlspecialchars_decode($myrow['contactname']) . '</font></td>
@@ -836,6 +836,7 @@
$LineItem->Units,
$LineItem->ConversionFactor,
$DiscountPercentage/100,
+ 1,
$Narrative,
'No',
$LineItem->ItemDue,
@@ -1013,12 +1014,19 @@
$i=0; // initialise the number of taxes iterated through
$TaxLineTotal =0; //initialise tax total for the line
+ $sql="SELECT taxid FROM taxauthorities";
+ $result=DB_query($sql, $db);
+ while ($myrow=DB_fetch_array($result)) {
+ $TaxTotals[$myrow['taxid']]=0;
+ }
+
foreach ($LineItem->Taxes AS $Tax) {
if ($i>0){
echo '<br />';
}
echo '<input type="text" class="number" name="' . $LineItem->LineNumber . $Tax->TaxCalculationOrder . '_TaxRate" maxlength="4" size="4" value="' . locale_number_format($Tax->TaxRate*100, 2) . '" /> %';
$i++;
+ echo $Tax->TaxAuthID.'<br />';
if ($Tax->TaxOnTax ==1){
$TaxTotals[$Tax->TaxAuthID] += ($Tax->TaxRate * ($LineTotal + $TaxLineTotal));
$TaxLineTotal += ($Tax->TaxRate * ($LineTotal + $TaxLineTotal));
@@ -1052,6 +1060,8 @@
if (!isset($_POST['ChargeFreightCost']) AND !isset($_SESSION['CreditItems'.$identifier]->FreightCost)){
$_POST['ChargeFreightCost']=0;
+ } elseif (!isset($_POST['ChargeFreightCost'])) {
+ $_POST['ChargeFreightCost']=filter_currency_input($_SESSION['CreditItems'.$identifier]->FreightCost);
} else {
$_POST['ChargeFreightCost']=filter_currency_input($_POST['ChargeFreightCost']);
}
@@ -1199,10 +1209,11 @@
</tr>
</table><br />';
- echo '<div class="centre"><input type="submit" name="Update" value="' . _('Update') . '" />
- <input type="submit" name="CancelCredit" value="' . _('Cancel') . '" onclick="return confirm(\'' . _('Are you sure you wish to cancel the whole of this credit note?') . '\');" />';
+ echo '<div class="centre">
+ <button type="submit" name="Update">' . _('Update') . '</button>
+ <button type="submit" name="CancelCredit" onclick="return confirm(\'' . _('Are you sure you wish to cancel the whole of this credit note?') . '\');">' . _('Cancel') . '</button>';
if (!isset($_POST['ProcessCredit'])){
- echo '<input type="submit" name="ProcessCredit" value="' . _('Process Credit Note') . '" /></div><br />';
+ echo '<button type="submit" name="ProcessCredit">' . _('Process Credit Note') . '</button></div><br />';
}
} # end of if lines
@@ -1248,18 +1259,22 @@
echo '</tr>';
echo '</table><br /><div class="centre">';
- echo '<input type="submit" name="Search" value="' . _('Search Now') .'" />';
- echo '<input type="submit" name="ChangeCustomer" value="' . _('Change Customer') . '" />';
- echo '<input type="submit" name="Quick" value="' . _('Quick Entry') . '" />';
+ echo '<button type="submit" name="Search">' . _('Search Now') .'</button>';
+ echo '<button type="submit" name="ChangeCustomer">' . _('Change Customer') . '</button>';
+ echo '<button type="submit" name="Quick">' . _('Quick Entry') . '</button>';
echo '</div>';
if (isset($SearchResult)) {
- echo '<br /><table cellpadding="2" class="selection">';
- echo '<tr><td><input type="hidden" name="previous" value="'.($Offset-1).'" /><input type="submit" name="Prev" value="'._('Prev').'" /></td>';
- echo '<td style="text-align:center" colspan="3"><input type="hidden" name="order_items" value="1" /><input type="submit" name="AddToCredit" value="'._('Add to Credit Note').'" /></td>';
- echo '<td><input type="hidden" name="nextlist" value="'.($Offset+1).'" /><input type="submit" name="Next" value="'._('Next').'" /></td></tr>';
- $TableHeader = '<tr><th>' . _('Code') . '</th>
+ echo '<br />
+ <table cellpadding="2" class="selection">
+ <tr>
+ <td><input type="hidden" name="previous" value="'.($Offset-1).'" /><button type="submit" name="Prev">'._('Prev').'</button></td>
+ <td style="text-align:center" colspan="3"><input type="hidden" name="order_items" value="1" /><button type="submit" name="AddToCredit">'._('Add to Credit Note').'</button></td>
+ <td><input type="hidden" name="nextlist" value="'.($Offset+1).'" /><button type="submit" name="Next">'._('Next').'</button></td>
+ </tr>';
+ $TableHeader = '<tr>
+ <th>' . _('Code') . '</th>
<th>' . _('Description') . '</th>
<th>' . _('Units') .'</th>
<th>' . _('Quantity') .'</th>
@@ -1349,16 +1364,16 @@
#end of page full new headings if
}
#end of while loop
- echo '<tr><td><input type="hidden" name="previous" value="'.($Offset-1).'" /><input type="submit" name="Prev" value="'._('Prev').'" /></td>';
- echo '<td style="text-align:center" colspan="3"><input type="hidden" name="order_items" value="1" /><input type="submit" name="AddToCredit" value="'._('Add to Credit Note').'" /></td>';
- echo '<td><input type="hidden" name="nextlist" value="'.($Offset+1).'" /><input type="submit" name="Next" value="'._('Next').'" /></td></tr>';
+ echo '<tr><td><input type="hidden" name="previous" value="'.($Offset-1).'" /><button type="submit" name="Prev">'._('Prev').'</button></td>';
+ echo '<td style="text-align:center" colspan="3"><input type="hidden" name="order_items" value="1" /><button type="submit" name="AddToCredit">' . _('Add to Credit Note') . '</button></td>';
+ echo '<td><input type="hidden" name="nextlist" value="'.($Offset+1).'" /><button type="submit" name="Next">'._('Next').'</button></td></tr>';
echo '</table>';
}#end if SearchResults to show
} /*end if part searching required */ elseif(!isset($_POST['ProcessCredit'])) { /*quick entry form */
/*FORM VARIABLES TO POST TO THE CREDIT NOTE 10 AT A TIME WITH PART CODE AND QUANTITY */
echo '<table class="selection">';
- echo '<tr><th colspan="2"><font size="3" color="#616161"><b>' . _('Quick Entry') . '</b></font></th></tr>';
+ echo '<tr><th colspan="2" class="header"><b>' . _('Quick Entry') . '</b></th></tr>';
echo '<tr>
<th>' . _('Part Code') . '</th>
<th>' . _('Quantity') . '</th>
@@ -1370,8 +1385,8 @@
<td><input type="text" class="number" name="qty_' . $i . '" size="6" maxlength="6" /></td></tr>';
}
- echo '</table><br /><div class="centre"><input type="submit" name="QuickEntry" value="' . _('Process Entries') . '" />
- <input type="submit" name="PartSearch" value="' . _('Search Parts') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="QuickEntry">' . _('Process Entries') . '</button>
+ <button type="submit" name="PartSearch">' . _('Search Parts') . '</button></div>';
}
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SelectSalesOrder.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -213,7 +213,7 @@
DB_Txn_Commit($db);
}
- /*Starting a new purchase order with a different supplier */
+ /*Starting a new purchase order with a different supplier */
$result = DB_Txn_Begin($db);
$PO_OrderNo = GetNextTransNo(18, $db); //get the next PO number
@@ -222,18 +222,18 @@
$Order_Value =0;
/*Now get all the required details for the supplier */
$sql = "SELECT address1,
- address2,
- address3,
- address4,
- address5,
- address6,
- telephone,
- paymentterms,
- currcode,
- rate
- FROM suppliers INNER JOIN currencies
- ON suppliers.currcode = currencies.currabrev
- WHERE supplierid='" . $SupplierID . "'";
+ address2,
+ address3,
+ address4,
+ address5,
+ address6,
+ telephone,
+ paymentterms,
+ currcode,
+ rate
+ FROM suppliers INNER JOIN currencies
+ ON suppliers.currcode = currencies.currabrev
+ WHERE supplierid='" . $SupplierID . "'";
$ErrMsg = _('Could not get the supplier information for the order');
$SuppResult = DB_query($sql, $db, $ErrMsg);
@@ -242,61 +242,61 @@
$StatusComment=date($_SESSION['DefaultDateFormat']).' - ' . _('Order Created by') . ' ' . $UserDetails . ' - '._('Auto created from sales orders') .'<br />';
/*Insert to purchase order header record */
$sql = "INSERT INTO purchorders ( orderno,
- supplierno,
- orddate,
- rate,
- initiator,
- intostocklocation,
- deladd1,
- deladd2,
- deladd3,
- deladd4,
- deladd5,
- deladd6,
- tel,
- suppdeladdress1,
- suppdeladdress2,
- suppdeladdress3,
- suppdeladdress4,
- suppdeladdress5,
- suppdeladdress6,
- supptel,
- version,
- revised,
- deliveryby,
- status,
- stat_comment,
- deliverydate,
- paymentterms,
- allowprint)
- VALUES( '" . $PO_OrderNo . "',
- '" . $SupplierID . "',
- '" . Date('Y-m-d') . "',
- '" . $SuppRow['rate'] . "',
- '" . $_SESSION['UsersRealName'] . "',
- '" . $_SESSION['UserStockLocation'] . "',
- '" . $DelAddRow['locationname'] . "',
- '" . $DelAddRow['deladd1'] . "',
- '" . $DelAddRow['deladd2'] . "',
- '" . $DelAddRow['deladd3'] . "',
- '" . $DelAddRow['deladd4'] . "',
- '" . $DelAddRow['deladd5'] . ' ' . $DelAddRow['deladd6'] . "',
- '" . $DelAddRow['tel'] . "',
- '" . $SuppRow['address1'] . "',
- '" . $SuppRow['address2'] . "',
- '" . $SuppRow['address3'] . "',
- '" . $SuppRow['address4'] . "',
- '" . $SuppRow['address5'] . "',
- '" . $SuppRow['address6'] . "',
- '" . $SuppRow['telephone'] . "',
- '1.0',
- '" . Date('Y-m-d') . "',
- '" . $_SESSION['Default_Shipper'] . "',
- 'Pending',
- '" . $StatusComment . "',
- '" . Date('Y-m-d') . "',
- '" . $SuppRow['paymentterms'] . "',
- 0)";
+ supplierno,
+ orddate,
+ rate,
+ initiator,
+ intostocklocation,
+ deladd1,
+ deladd2,
+ deladd3,
+ deladd4,
+ deladd5,
+ deladd6,
+ tel,
+ suppdeladdress1,
+ suppdeladdress2,
+ suppdeladdress3,
+ suppdeladdress4,
+ suppdeladdress5,
+ suppdeladdress6,
+ supptel,
+ version,
+ revised,
+ deliveryby,
+ status,
+ stat_comment,
+ deliverydate,
+ paymentterms,
+ allowprint)
+ VALUES( '" . $PO_OrderNo . "',
+ '" . $SupplierID . "',
+ '" . Date('Y-m-d') . "',
+ '" . $SuppRow['rate'] . "',
+ '" . $_SESSION['UsersRealName'] . "',
+ '" . $_SESSION['UserStockLocation'] . "',
+ '" . $DelAddRow['locationname'] . "',
+ '" . $DelAddRow['deladd1'] . "',
+ '" . $DelAddRow['deladd2'] . "',
+ '" . $DelAddRow['deladd3'] . "',
+ '" . $DelAddRow['deladd4'] . "',
+ '" . $DelAddRow['deladd5'] . ' ' . $DelAddRow['deladd6'] . "',
+ '" . $DelAddRow['tel'] . "',
+ '" . $SuppRow['address1'] . "',
+ '" . $SuppRow['address2'] . "',
+ '" . $SuppRow['address3'] . "',
+ '" . $SuppRow['address4'] . "',
+ '" . $SuppRow['address5'] . "',
+ '" . $SuppRow['address6'] . "',
+ '" . $SuppRow['telephone'] . "',
+ '1.0',
+ '" . Date('Y-m-d') . "',
+ '" . $_SESSION['Default_Shipper'] . "',
+ 'Pending',
+ '" . $StatusComment . "',
+ '" . Date('Y-m-d') . "',
+ '" . $SuppRow['paymentterms'] . "',
+ 0)";
$ErrMsg = _('The purchase order header record could not be inserted into the database because');
$DbgMsg = _('The SQL statement used to insert the purchase order header record and failed was');
@@ -306,29 +306,29 @@
/*reminder we are in a loop of the total of each item to place a purchase order for based on a selection of sales orders */
$DeliveryDate = DateAdd(Date($_SESSION['DefaultDateFormat']),'d',$ItemRow['leadtime']);
$sql = "INSERT INTO purchorderdetails ( orderno,
- itemcode,
- deliverydate,
- itemdescription,
- glcode,
- unitprice,
- quantityord,
- uom,
- suppliers_partno,
- gw,
- cuft,
- conversionfactor )
- VALUES ('" . $PO_OrderNo . "',
- '" . $ItemRow['stockid'] . "',
- '" . FormatDateForSQL($DeliveryDate) . "',
- '" . $ItemRow['suppliers_partno'] . ' ' . $ItemRow['supplierdescription'] . "',
- '" . $ItemRow['stockact'] . "',
- '" . $ItemRow['price'] . "',
- '" . $ItemRow['orderqty'] . "',
- '" . $ItemRow['suppliersuom'] . "',
- '" . $ItemRow['suppliers_partno'] . "',
- '" . $ItemRow['kgs'] . "',
- '" . $ItemRow['volume'] . "',
- '" . $ItemRow['conversionfactor'] . "')";
+ itemcode,
+ deliverydate,
+ itemdescription,
+ glcode,
+ unitprice,
+ quantityord,
+ uom,
+ suppliers_partno,
+ gw,
+ cuft,
+ conversionfactor )
+ VALUES ('" . $PO_OrderNo . "',
+ '" . $ItemRow['stockid'] . "',
+ '" . FormatDateForSQL($DeliveryDate) . "',
+ '" . $ItemRow['suppliers_partno'] . ' ' . $ItemRow['supplierdescription'] . "',
+ '" . $ItemRow['stockact'] . "',
+ '" . $ItemRow['price'] . "',
+ '" . $ItemRow['orderqty'] . "',
+ '" . $ItemRow['suppliersuom'] . "',
+ '" . $ItemRow['suppliers_partno'] . "',
+ '" . $ItemRow['kgs'] . "',
+ '" . $ItemRow['volume'] . "',
+ '" . $ItemRow['conversionfactor'] . "')";
$ErrMsg =_('One of the purchase order detail records could not be inserted into the database because');
$DbgMsg =_('The SQL statement used to insert the purchase order detail record and failed was');
@@ -349,7 +349,7 @@
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
if ($AuthRow['authlevel']=''){
- $AuthRow['authlevel'] = 0;
+ $AuthRow['authlevel'] = 0;
}
if (DB_num_rows($AuthResult) > 0 AND $AuthRow['authlevel'] > $Order_Value) { //user has authority to authrorise as well as create the order
@@ -394,7 +394,7 @@
if (isset($_POST['ResetPart'])){
- unset($_REQUEST['SelectedStockItem']);
+ unset($_REQUEST['SelectedStockItem']);
}
echo '<br /><div class="centre">';
@@ -490,7 +490,7 @@
if (!isset($StockID)) {
- /* Not appropriate really to restrict search by date since may miss older ouststanding orders */
+ /* Not appropriate really to restrict search by date since may miss older ouststanding orders */
if (!isset($_REQUEST['OrderNumber']) or $_REQUEST['OrderNumber']==''){
@@ -506,9 +506,9 @@
while ($myrow=DB_fetch_array($resultStkLocs)){
if (isset($_POST['StockLocation'])){
if ($myrow['loccode'] == $_POST['StockLocation']){
- echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
+ echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['locationname'] . '</option>';
} else {
- echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname']. '</option>';
+ echo '<option value="' . $myrow['loccode'] . '">' . $myrow['locationname']. '</option>';
}
} elseif ($myrow['loccode']==$_SESSION['UserStockLocation']){
echo '<option selected="True" value="' . $myrow['loccode'] . '">' . $myrow['locationname']. '</option>';
@@ -533,7 +533,7 @@
}
echo '</select> </td><td>';
- echo '<input type="submit" name="SearchOrders" value="' . _('Search') . '" /></td>';
+ echo '<button type="submit" name="SearchOrders">' . _('Search') . '</button></td>';
echo ' <td><a href="' . $rootpath . '/SelectOrderItems.php?NewOrder=Yes">' .
_('Add Sales Order') . '</a></td></tr></table>';
}
@@ -546,37 +546,37 @@
$result1 = DB_query($SQL,$db);
echo '<br /><table class="selection">';
- echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('To search for sales orders for a specific part use the part selection facilities below');
+ echo '<tr><th colspan="6" class="header">' . _('To search for sales orders for a specific part use the part selection facilities below');
echo '</th></tr>';
echo '<tr>
- <td><font size="1">' . _('Select a stock category') . ':</font>
- <select name="StockCat">';
+ <td><font size="1">' . _('Select a stock category') . ':</font>
+ <select name="StockCat">';
while ($myrow1 = DB_fetch_array($result1)) {
echo '<option value="'. $myrow1['categoryid'] . '">' . $myrow1['categorydescription'] . '</option>';
}
- echo '</select>
- <td><font size="1">' . _('Enter text extract(s) in the description') . ':</font></td>
- <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
+ echo '</select>
+ <td><font size="1">' . _('Enter text extract(s) in the description') . ':</font></td>
+ <td><input type="text" name="Keywords" size="20" maxlength="25" /></td>
</tr>
- <tr><td></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font><font size="1">' . _('Enter extract of the Stock Code') . '</b>:</font></td>
- <td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
- </tr>
- </table>';
- echo '<br /><input type="submit" name="SearchParts" value="' . _('Search Parts Now') . '" />
- <input type="submit" name="ResetPart" value="' . _('Show All') . '" /></div><br />';
+ <tr><td></td>
+ <td><font size="3"><b>' . _('OR') . ' </b></font><font size="1">' . _('Enter extract of the Stock Code') . '</b>:</font></td>
+ <td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
+ </tr>
+ </table>';
+ echo '<br /><button type="submit" name="SearchParts">' . _('Search Parts Now') . '</button>
+ <button type="submit" name="ResetPart">' . _('Show All') . '</button></div><br />';
if (isset($StockItemsResult) and DB_num_rows($StockItemsResult)>0) {
echo '<table cellpadding="2" class="selection">';
$TableHeader = '<tr>
- <th>' . _('Code') . '</th>
- <th>' . _('Description') . '</th>
- <th>' . _('On Hand') . '</th>
- <th>' . _('Units') . '</th>
- </tr>';
+ <th>' . _('Code') . '</th>
+ <th>' . _('Description') . '</th>
+ <th>' . _('On Hand') . '</th>
+ <th>' . _('Units') . '</th>
+ </tr>';
echo $TableHeader;
$j = 1;
@@ -592,12 +592,13 @@
$k++;
}
- printf('<td><input type="submit" name="SelectedStockItem" value="%s" /></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td>%s</td>
+ printf('<td><button type="submit" name="SelectedStockItem" value="%s">%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
</tr>',
$myrow['stockid'],
+ $myrow['stockid'],
$myrow['description'],
locale_number_format($myrow['qoh'], $myrow['decimalplaces']),
$myrow['units']);
@@ -660,7 +661,7 @@
salesorders.poplaced
ORDER BY salesorders.orderno";
} else {
- /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
+ /* $DateAfterCriteria = FormatDateforSQL($OrdersAfterDate); */
if (isset($_REQUEST['SelectedCustomer'])) {
@@ -807,8 +808,8 @@
/*show a table of the orders returned by the SQL */
if (DB_num_rows($SalesOrdersResult)>0) {
- /* Get users authority to place POs */
- $AuthSQL="SELECT cancreate
+ /* Get users authority to place POs */
+ $AuthSQL="SELECT cancreate
FROM purchorderauth
WHERE userid='". $_SESSION['UserID'] . "'";
@@ -816,20 +817,20 @@
$AuthResult=DB_query($AuthSQL,$db);
$AuthRow=DB_fetch_array($AuthResult);
- echo '<table cellpadding="2" width="95%" class="selection">';
+ echo '<table cellpadding="2" width="95%" class="selection">';
if (isset($_POST['Quotations']) AND $_POST['Quotations']=='Orders_Only'){
$tableheader = '<tr>
- <th>' . _('Modify') . '</th>
- <th>' . _('Invoice') . '</th>
- <th>' . _('Dispatch Note') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Cust Order') . ' #</th>
- <th>' . _('Order Date') . '</th>
- <th>' . _('Req Del Date') . '</th>
- <th>' . _('Delivery To') . '</th>
- <th>' . _('Order Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>';
+ <th>' . _('Modify') . '</th>
+ <th>' . _('Invoice') . '</th>
+ <th>' . _('Dispatch Note') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Branch') . '</th>
+ <th>' . _('Cust Order') . ' #</th>
+ <th>' . _('Order Date') . '</th>
+ <th>' . _('Req Del Date') . '</th>
+ <th>' . _('Delivery To') . '</th>
+ <th>' . _('Order Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th>';
if ($AuthRow['cancreate']==0){ //If cancreate==0 then this means the user can create orders hmmm!!
$tableheader .= '<th>' . _('Place PO') . '</th></tr>';
} else {
@@ -837,23 +838,23 @@
}
} else { // displaying only quotations
$tableheader = '<tr>
- <th>' . _('Modify') . '</th>
- <th>' . _('Print Quote') . '</th>
- <th>' . _('Customer') . '</th>
- <th>' . _('Branch') . '</th>
- <th>' . _('Cust Ref') . ' #</th>
- <th>' . _('Quote Date') . '</th>
- <th>' . _('Req Del Date') . '</th>
- <th>' . _('Delivery To') . '</th>
- <th>' . _('Quote Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th></tr>';
+ <th>' . _('Modify') . '</th>
+ <th>' . _('Print Quote') . '</th>
+ <th>' . _('Customer') . '</th>
+ <th>' . _('Branch') . '</th>
+ <th>' . _('Cust Ref') . ' #</th>
+ <th>' . _('Quote Date') . '</th>
+ <th>' . _('Req Del Date') . '</th>
+ <th>' . _('Delivery To') . '</th>
+ <th>' . _('Quote Total') . '<br />' . $_SESSION['CompanyRecord']['currencydefault'] . '</th></tr>';
}
echo $tableheader;
$i = 1;
- $j = 1;
- $k=0; //row colour counter
- $OrdersTotal =0;
+ $j = 1;
+ $k = 0; //row colour counter
+ $OrdersTotal = 0;
while ($myrow=DB_fetch_array($SalesOrdersResult)) {
@@ -887,58 +888,58 @@
if ($_POST['Quotations']=='Orders_Only'){
- /*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */
- if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed
- printf('<td><a href="%s">%s</a></td>
- <td><a href="%s">' . _('Invoice') . '</a></td>
- <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td><input type="checkbox" name="PlacePO_%s" value"" /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td>
- </tr>',
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue,
- $i,
- $i,
- $myrow['orderno']);
- } else { //User is not authorised to create POs so don't even show the option
- printf('<td><a href="%s">%s</a></td>
- <td><a href="%s">' . _('Invoice') . '</a></td>
- <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- </tr>',
- $ModifyPage,
- $myrow['orderno'],
- $Confirm_Invoice,
- $PrintDispatchNote,
- $myrow['name'],
- $myrow['brname'],
- $myrow['customerref'],
- $FormatedOrderDate,
- $FormatedDelDate,
- $myrow['deliverto'],
- $FormatedOrderValue);
- }
+ /*Check authority to create POs if user has authority then show the check boxes to select sales orders to place POs for otherwise don't provide this option */
+ if ($AuthRow['cancreate']==0 AND $myrow['poplaced']==0){ //cancreate==0 if the user can create POs and not already placed
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td><input type="checkbox" name="PlacePO_%s" value"" /><input type="hidden" name="OrderNo_PO_%s" value="%s" /></td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ $myrow['deliverto'],
+ $FormatedOrderValue,
+ $i,
+ $i,
+ $myrow['orderno']);
+ } else { //User is not authorised to create POs so don't even show the option
+ printf('<td><a href="%s">%s</a></td>
+ <td><a href="%s">' . _('Invoice') . '</a></td>
+ <td><a target="_blank" href="%s">' . $PrintText . ' <img src="' .$rootpath.'/css/'.$theme.'/images/pdf.png" title="' . _('Click for PDF') . '" /></a></td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ </tr>',
+ $ModifyPage,
+ $myrow['orderno'],
+ $Confirm_Invoice,
+ $PrintDispatchNote,
+ $myrow['name'],
+ $myrow['brname'],
+ $myrow['customerref'],
+ $FormatedOrderDate,
+ $FormatedDelDate,
+ $myrow['deliverto'],
+ $FormatedOrderValue);
+ }
} else { //must be quotes only
printf('<td><a href="%s">%s</a></td>
@@ -962,7 +963,7 @@
$myrow['deliverto'],
$FormatedOrderValue);
}
- $i++;
+ $i++;
$j++;
$OrdersTotal += $myrow['ordervalue'];
if ($j == 12){
@@ -973,7 +974,7 @@
}//end while loop through orders to display
if ($_POST['Quotations']=='Orders_Only' AND $AuthRow['cancreate']==0){ //cancreate==0 means can create POs
echo '<tr><th colspan="8"></th><th></th><th colspan="2" class="number">
- <input type="submit" name="PlacePO" value="' . _('Place') . "\n" . _('PO') . '" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');" /></th></tr>';
+ <button type="submit" name="PlacePO" value="" onclick="return confirm(\'' . _('This will create purchase orders for all the items on the checked sales orders above, based on the preferred supplier purchasing data held in the system. Are You Absolutely Sure?') . '\');">' . _('Place') . "\n" . _('PO') . '</button></th></tr>';
}
echo '<tr><td colspan="9" class="number">';
if ($_POST['Quotations']=='Orders_Only'){
Modified: trunk/SelectWorkOrder.php
===================================================================
--- trunk/SelectWorkOrder.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SelectWorkOrder.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -143,7 +143,7 @@
}
echo '</select>   ';
- echo '<input type="submit" name="SearchOrders" value="' . _('Search') . '" />';
+ echo '<button type="submit" name="SearchOrders">' . _('Search') . '</button>';
echo ' <a href="' . $rootpath . '/WorkOrderEntry.php">' . _('New Work Order') . '</a></td></tr></table><br />';
}
@@ -156,7 +156,7 @@
echo '<table class="selection">
<tr>
- <th colspan="6"><font size="3" color="#616161">' . _('To search for work orders for a specific item use the item selection facilities below') . '</font></th>
+ <th colspan="6" class="header">' . _('To search for work orders for a specific item use the item selection facilities below') . '</th>
</tr>
<tr>
<td><font size="1">' . _('Select a stock category') . ':</font>
@@ -176,8 +176,8 @@
<td><input type="text" name="StockCode" size="15" maxlength="18" /></td>
</tr>
</table><br />';
- echo '<div class="centre"><input type="submit" name="SearchParts" value="' . _('Search Items Now') . '" />
- <input type="submit" name="ResetPart" value="' . _('Show All') . '" /></div>';
+ echo '<div class="centre"><button type="submit" name="SearchParts">' . _('Search Items Now') . '</button>
+ <button type="submit" name="ResetPart">' . _('Show All') . '</button></div>';
}
if (isset($StockItemsResult)) {
@@ -204,12 +204,13 @@
$k++;
}
- 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>%s</td>
</tr>',
$myrow['stockid'],
+ $myrow['stockid'],
$myrow['description'],
$myrow['qoh'],
$myrow['units']);
Modified: trunk/ShipmentCosting.php
===================================================================
--- trunk/ShipmentCosting.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/ShipmentCosting.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -46,7 +46,7 @@
$HeaderData = DB_fetch_array($GetShiptHdrResult);
echo '<br />';
echo '<table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="#616161">'._('Shipment Details').'</font></th></tr>';
+echo '<tr><th colspan="4" class="header">'._('Shipment Details').'</th></tr>';
echo '<tr>
<td><b>'. _('Shipment') .': </td>
<td><b>' . $_GET['SelectedShipment'] . '</b></td>
@@ -137,7 +137,7 @@
}
echo '<br /><table cellpadding="2" class="selection">';
- echo '<tr><th colspan="9"><font color="#616161" size="3">' . _('Items on shipment'). '</font></th></tr>';
+ echo '<tr><th colspan="9" class="header">' . _('Items on shipment'). '</th></tr>';
$TableHeader = '<tr>
<th>'. _('Item'). '</th>
@@ -499,7 +499,7 @@
$ChargesResult = DB_query($sql,$db);
echo '<table cellpadding="2" class="selection">';
-echo '<tr><th colspan="6"><font color="#616161" size="3">' . _('Shipment Charges Against Products'). '</font></th></tr>';
+echo '<tr><th colspan="6" class="header">' . _('Shipment Charges Against Products'). '</th></tr>';
$TableHeader = '<tr>
<th>'. _('Supplier'). '</th>
@@ -570,7 +570,7 @@
$ChargesResult = DB_query($sql,$db);
echo '<table cellpadding="2" class="selection">';
-echo '<tr><th colspan="6"><font color="#616161" size="3">'._('General Shipment Charges').'</font></th></tr>';
+echo '<tr><th colspan="6" class="header">'._('General Shipment Charges').'</th></tr>';
$TableHeader = '<tr>
<th>'. _('Supplier'). '</th>
@@ -630,7 +630,7 @@
<option value="No">'. _('No') . '</option>
</select>';
}
- echo '<br /><br /><input type="submit" name="Close" value="'. _('Confirm OK to Close'). '" />';
+ echo '<br /><br /><button type="submit" name="Close">'. _('Confirm OK to Close'). '</button>';
echo '</form></div>';
}
Modified: trunk/Shipments.php
===================================================================
--- trunk/Shipments.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/Shipments.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -376,7 +376,7 @@
/* Always display all shipment lines */
echo '<br /><table cellpadding="2" class="selection">';
- echo '<tr><th colspan="9"><font color="#616161" size="3">'. _('Order Lines On This Shipment'). '</font></th></tr>';
+ echo '<tr><th colspan="9" class="header">'. _('Order Lines On This Shipment'). '</th></tr>';
$TableHeader = '<tr>
<th>'. _('Order'). '</th>
@@ -426,7 +426,7 @@
echo '</table>';
}//there are lines on the shipment
-echo '<br /><div class="centre"><input type="submit" name="Update" value="'. _('Update Shipment Details') . '" /></div><br />';
+echo '<br /><div class="centre"><button type="submit" name="Update">'. _('Update Shipment Details') . '</button></div><br />';
if (!isset($_POST['StockLocation'])) {
$_POST['StockLocation'] =$_SESSION['Shipment']->StockLocation;
@@ -456,16 +456,16 @@
if (DB_num_rows($result)>0){
echo '<table cellpadding="2" class="selection">';
- echo '<tr><th colspan="7"><font color="#616161" size="3">'. _('Possible Order Lines To Add To This Shipment').'</font></th></tr>';
+ echo '<tr><th colspan="7" class="header">'. _('Possible Order Lines To Add To This Shipment').'</th></tr>';
$TableHeader = '<tr>
- <th>'. _('Order').'</th>
- <th>'. _('Item').'</th>
- <th>'. _('Quantity').'<br />'. _('Ordered').'</th>
- <th>'. _('Units').'</th>
- <th>'. _('Quantity').'<br />'. _('Received').'</th>
- <th>'. _('Delivery').'<br />'. _('Date').'</th>
- </tr>';
+ <th>'. _('Order').'</th>
+ <th>'. _('Item').'</th>
+ <th>'. _('Quantity').'<br />'. _('Ordered').'</th>
+ <th>'. _('Units').'</th>
+ <th>'. _('Quantity').'<br />'. _('Received').'</th>
+ <th>'. _('Delivery').'<br />'. _('Date').'</th>
+ </tr>';
echo $TableHeader;
Modified: trunk/Shipt_Select.php
===================================================================
--- trunk/Shipt_Select.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/Shipt_Select.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -29,32 +29,13 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
-If (isset($_POST['ResetPart'])) {
+if (isset($_POST['ResetPart'])) {
unset($SelectedStockItem);
}
-If (isset($ShiptRef) and $ShiptRef!="") {
- if (!is_numeric($ShiptRef)){
- echo '<br />';
- prnMsg( _('The Shipment Number entered MUST be numeric') );
- unset ($ShiptRef);
- } else {
- echo _('Shipment Number'). ' - '. $ShiptRef;
- }
-} else {
- if (isset($SelectedSupplier)) {
- echo '<br />' ._('For supplier'). ': '. $SelectedSupplier . ' ' . _('and'). ' ';
- echo '<input type="hidden" name="SelectedSupplier" value="'. $SelectedSupplier. '" />';
- }
- If (isset($SelectedStockItem)) {
- echo _('for the part'). ': ' . $SelectedStockItem . '.';
- echo '<input type="hidden" name="SelectedStockItem" value="'. $SelectedStockItem. '" />';
- }
-}
-
if (isset($_POST['SearchParts'])) {
- If ($_POST['Keywords'] AND $_POST['StockCode']) {
+ if ($_POST['Keywords'] AND $_POST['StockCode']) {
echo '<br />';
prnMsg( _('Stock description keywords have been used in preference to the Stock code extract entered'),'info');
}
@@ -68,7 +49,7 @@
INNER JOIN purchorderdetails
ON stockmaster.stockid=purchorderdetails.itemcode";
- If ($_POST['Keywords']) {
+ if ($_POST['Keywords']) {
//insert wildcard characters in spaces
$SearchString = '%' . str_replace(' ', '%', $_POST['Keywords']) . '%';
@@ -101,9 +82,29 @@
}
-if (!isset($ShiptRef) or $ShiptRef==""){
- echo '<table class="selection"><tr><td>';
- echo _('Shipment Number'). ': <input type="text" name="ShiptRef" maxlength="10" size="10" /> '.
+if (!isset($ShiptRef) or $ShiptRef==''){
+ echo '<table class="selection">';
+ echo '<tr><th class="header">';
+ if (isset($ShiptRef) and $ShiptRef!='') {
+ if (!is_numeric($ShiptRef)){
+ echo '<br />';
+ prnMsg( _('The Shipment Number entered MUST be numeric') );
+ unset ($ShiptRef);
+ } else {
+ echo _('Shipment Number'). ' - '. $ShiptRef;
+ }
+ } else {
+ if (isset($SelectedSupplier)) {
+ echo _('For supplier'). ': '. $SelectedSupplier . ' ' . _('and'). ' ';
+ echo '<input type="hidden" name="SelectedSupplier" value="'. $SelectedSupplier. '" />';
+ }
+ if (isset($SelectedStockItem)) {
+ echo _('for the part'). ': ' . $SelectedStockItem . '.';
+ echo '<input type="hidden" name="SelectedStockItem" value="'. $SelectedStockItem. '" />';
+ }
+ }
+ echo '</th></tr>';
+ echo '<tr><td>' . _('Shipment Number'). ': <input type="text" name="ShiptRef" maxlength="10" size="10" /> '.
_('Into Stock Location').' :<select name="StockLocation"> ';
$sql = "SELECT loccode, locationname FROM locations";
$resultStkLocs = DB_query($sql,$db);
@@ -134,7 +135,7 @@
}
echo '</select></td></tr></table>';
- echo '<br /><div class="centre"><input type="submit" name="SearchShipments" value="'. _('Search Shipments'). '" /></div></div><br />';
+ echo '<br /><div class="centre"><button type="submit" name="SearchShipments">'. _('Search Shipments'). '</button></div></div><br />';
}
$SQL="SELECT categoryid,
@@ -146,7 +147,7 @@
echo '<table class="selection">';
-echo '<tr><th colspan="5"><font size="3" color="#616161">'._('To search for shipments for a specific part use the part selection facilities below') . '</font></th></tr>';
+echo '<tr><th colspan="5" class="header">'._('To search for shipments for a specific part use the part selection facilities below') . '</th></tr>';
echo '<tr>
<td><font size="1">' . _('Select a stock category') . ':</font>
<select name="StockCat">';
@@ -168,8 +169,8 @@
</tr>
</table><br />';
-echo '<div class="centre"><input type="submit" name="SearchParts" value="'._('Search Parts Now').'" />';
-echo '<input type="submit" name="ResetPart" value="'. _('Show All') .'" /></div><br />';
+echo '<div class="centre"><button type="submit" name="SearchParts">' . _('Search Parts Now') . '</button>';
+echo '<button type="submit" name="ResetPart">'. _('Show All') .'</button></div><br />';
if (isset($StockItemsResult)) {
@@ -199,11 +200,16 @@
/*
Code Description On Hand Orders Ostdg Units Code Description On Hand Orders Ostdg Units */
printf('<td><input type="submit" name="SelectedStockItem" value="%s" /></td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td>%s</td></tr>',
- $myrow['stockid'], $myrow['description'], $myrow['qoh'], $myrow['qord'],$myrow['units']);
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
+ </tr>',
+ $myrow['stockid'],
+ $myrow['description'],
+ $myrow['qoh'],
+ $myrow['qord'],
+ $myrow['units']);
$j++;
If ($j == 15){
Modified: trunk/StockCostUpdate.php
===================================================================
--- trunk/StockCostUpdate.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/StockCostUpdate.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -130,12 +130,12 @@
echo '<table cellpadding="2" class="selection">';
echo '<tr>
<th colspan="2">' . _('Item Code') . ':<input type="text" name="StockID" value="' . $StockID . '" maxlength="20" />';
-echo '<input type="submit" name="Show" value="' . _('Show Cost Details') . '" /></th></tr>';
+echo '<button type="submit" name="Show">' . _('Show Cost Details') . '</button></th></tr>';
echo '<tr>
- <th colspan="2"><font color="#616161" size="2">' . $StockID . ' - ' . $myrow['description'] . '</font></th>
+ <th colspan="2" class="header">' . $StockID . ' - ' . $myrow['description'] . '</th>
</tr>';
echo '<tr>
- <th colspan="2"><font color="#616161" size="2">'. _('Total Quantity On Hand') . ': ' . locale_number_format($myrow['totalqoh'], $myrow['decimalplaces']) . ' ' . $myrow['units'] .'</font></th>
+ <th colspan="2" class="header">'. _('Total Quantity On Hand') . ': ' . locale_number_format($myrow['totalqoh'], $myrow['decimalplaces']) . ' ' . $myrow['units'] .'</th>
</tr>';
if (($myrow['mbflag']=='D' AND $myrow['stocktype'] != 'L')
Modified: trunk/StockSerialItems.php
===================================================================
--- trunk/StockSerialItems.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/StockSerialItems.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -68,13 +68,13 @@
echo '<table cellpadding="2" class="selection">';
if ($Serialised==1){
- echo '<tr><th colspan="5"><font color="#616161" size="2">' . _('Serialised items in') . ' ';
+ echo '<tr><th colspan="5" class="header">' . _('Serialised items in') . ' ';
} else {
- echo '<tr><th colspan="11"><font color=#616161 size="2">' . _('Controlled items in') . ' ';
+ echo '<tr><th colspan="11" class="header">' . _('Controlled items in') . ' ';
}
-echo $myrow['locationname']. '</font></th></tr>';
+echo $myrow['locationname']. '</th></tr>';
-echo '<tr><th colspan="11"><font color="#616161" size="2">'.$StockID .'-'. $Description .'</b> (' . _('In units of') . ' ' . $UOM . ')</font></th></tr>';
+echo '<tr><th colspan="11" class="header">'.$StockID .'-'. $Description .'</b> (' . _('In units of') . ' ' . $UOM . ')</th></tr>';
if ($Serialised == 1){
$tableheader = '<tr>
Modified: trunk/StockStatus.php
===================================================================
--- trunk/StockStatus.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/StockStatus.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -300,7 +300,7 @@
}
if (isset($PriceHistory)) {
echo '<br /><table cellpadding="4" class="selection">';
- echo '<tr><th colspan="4"><font color="#616161" size="2">' . _('Pricing history for sales of') . ' ' . $StockID . ' ' . _('to') . ' ' . $DebtorNo . '</font></th></tr>';
+ echo '<tr><th colspan="4" class="header">' . _('Pricing history for sales of') . ' ' . $StockID . ' ' . _('to') . ' ' . $DebtorNo . '</th></tr>';
$tableheader = '<tr>
<th>' . _('Date Range') . '</th>
<th>' . _('Quantity') . '</th>
Modified: trunk/StockUsage.php
===================================================================
--- trunk/StockUsage.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/StockUsage.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -43,13 +43,13 @@
$Its_A_KitSet_Assembly_Or_Dummy =False;
if (($myrow['mbflag']=='K') OR ($myrow['mbflag']=='A') OR ($myrow['mbflag']=='D')) {
$Its_A_KitSet_Assembly_Or_Dummy =True;
- echo '<font color="#616161" size="3"><b>' . $StockID - $myrow['description'] . '</b></font>';
+ echo '<font color="#616162" size="3"><b>' . $StockID - $myrow['description'] . '</b></font>';
echo '<br />' . _('The selected item is a dummy or assembly or kit-set item and cannot have a stock holding') . '. ' . _('Please select a different item');
$StockID = '';
} else {
- echo '<tr><th><font size="3" color="#616161">' . _('Item') . ' :<b> ' . $StockID . ' - ' . $myrow['description'] . ' </b> (' . _('in units of') . ' :<b> ' . $myrow['units'] . ')</b></font></th></tr>';
+ echo '<tr><th class="header">' . _('Item') . ' :<b> ' . $StockID . ' - ' . $myrow['description'] . ' </b> (' . _('in units of') . ' :<b> ' . $myrow['units'] . ')</b></th></tr>';
}
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post"><tr><td>';
Modified: trunk/SuppCreditGRNs.php
===================================================================
--- trunk/SuppCreditGRNs.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SuppCreditGRNs.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -106,8 +106,8 @@
}
}
-echo '<tr><td colspan="5" class="number"><font size="2" color="#616161">' . _('Total Value Credited Against Goods') . ':</font></td>
- <td class="number"><font size="2" color="#616161"><u>' . locale_money_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrCode) . '</u></font></td></tr>';
+echo '<tr><th colspan="5" class="header">' . _('Total Value Credited Against Goods') . ':</th>
+ <th class="header"><u>' . locale_money_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrCode) . '</u></th></tr>';
echo '</table><br /><div class="centre"><a href="' . $rootpath . '/SupplierCredit.php">' . _('Back to Credit Note Entry') . '</a></div>';
/* Now get all the GRNs for this supplier from the database
@@ -231,7 +231,7 @@
$myrow = DB_fetch_array($GRNEntryResult);
echo '<br /><table class="selection">';
- echo '<tr><th colspan="6"><font size="3" color="#616161">' . _('GRN Selected For Adding To A Suppliers Credit Note') . '</font></th></tr>';
+ echo '<tr><th colspan="6" class="header">' . _('GRN Selected For Adding To A Suppliers Credit Note') . '</th></tr>';
echo '<tr><th>' . _('GRN') . '</th>
<th>' . _('Item') . '</th>
<th>' . _('Quantity') . '<br />' . _('Outstanding') . '</th>
Modified: trunk/SuppFixedAssetChgs.php
===================================================================
--- trunk/SuppFixedAssetChgs.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SuppFixedAssetChgs.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -91,8 +91,8 @@
}
echo '<tr>
- <td class="number"><font size="2" color="#616161">' . _('Total') . ':</font></td>
- <td class="number"><font size="2" color="#616161"><U>' . locale_money_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrCode) . '</U></font></td>
+ <th class="header">' . _('Total') . ':</th>
+ <th class="header"><u>' . locale_money_format($TotalAssetValue,$_SESSION['SuppTrans']->CurrCode) . '</u></th>
</tr>
</table><br />';
Modified: trunk/SuppInvGRNs.php
===================================================================
--- trunk/SuppInvGRNs.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SuppInvGRNs.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -148,8 +148,8 @@
}
echo '<tr>
- <td colspan="5" align="right"><font size="2" color="#616161">' . _('Total Value of Goods Charged') . ':</font></td>
- <td class="number"><font size="2" color="#616161">' . locale_money_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrCode) . '</font></td>
+ <th colspan="5" align="right" class="header">' . _('Total Value of Goods Charged') . ':</th>
+ <th class="number">' . locale_money_format($TotalValueCharged,$_SESSION['SuppTrans']->CurrCode) . '</th>
</tr>';
echo '</table>';
echo '<br /><div class="centre"><a href="' . $rootpath . '/SupplierInvoice.php">' . _('Back to Invoice Entry') . '</a></div><br />';
@@ -235,7 +235,7 @@
$GRNTmp = $_SESSION['SuppTrans']->GRNs[$GRNNo];
echo '<table class="selection">';
- echo '<tr><th colspan="10"><font size="3" color="#616161">' . _('GRN Selected For Adding To A Purchase Invoice') . '</font></th></tr>';
+ echo '<tr><th colspan="10" class="header">' . _('GRN Selected For Adding To A Purchase Invoice') . '</th></tr>';
echo '<tr bgcolor=#800000>
<th>' . _('Sequence') . ' #</th>
<th>' . _('Item') . '</th>
Modified: trunk/SuppShiptChgs.php
===================================================================
--- trunk/SuppShiptChgs.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SuppShiptChgs.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -99,8 +99,8 @@
}
echo '<tr>
- <td class="number"><font size="2" color="#616161">' . _('Total') . ':</font></td>
- <td class="number"><font size="2" color="#616161"><u>' . locale_money_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrCode) . '</u></font></td>
+ <th class="header">' . _('Total') . ':</th>
+ <th class="header"><u>' . locale_money_format($TotalShiptValue,$_SESSION['SuppTrans']->CurrCode) . '</u></th>
</tr>
</table><br />';
Modified: trunk/SuppTransGLAnalysis.php
===================================================================
--- trunk/SuppTransGLAnalysis.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SuppTransGLAnalysis.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -133,8 +133,8 @@
}
echo '<tr>
- <td colspan="2" class="number"><font size="4" color="blue">' . _('Total') . ':</font></td>
- <td class="number"><font size="2" color="#616161"><u>' . locale_money_format($TotalGLValue,$_SESSION['SuppTrans']->CurrCode) . '</u></font></td>
+ <th colspan="2" class="header">' . _('Total') . ':</th>
+ <th class="header"><u>' . locale_money_format($TotalGLValue,$_SESSION['SuppTrans']->CurrCode) . '</u></th>
</tr>
</table>';
Modified: trunk/SupplierContacts.php
===================================================================
--- trunk/SupplierContacts.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SupplierContacts.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -131,16 +131,17 @@
AND suppliercontacts.supplierid = '".$SupplierID."'";
$result = DB_query($sql, $db);
+ $myrow=DB_fetch_array($result);
if (DB_num_rows($result)>0){
- echo '<table class="selection"><tr><th colspan="7"><font size="3" color="#616161">' . _('Contacts Defined for') . ' - ' . $myrow['suppname'] . '</font></th></tr>';
+ echo '<br /><table class="selection"><tr><th colspan="7" class="header">' . _('Contacts Defined for') . ' - ' . $myrow['suppname'] . '</th></tr>';
echo '<tr><th>' . _('Name') . '</th>
<th>' . _('Position') . '</th>
<th>' . _('Phone No') . '</th>
<th>' . _('Fax No') . '</th>
<th>' . _('Email') . '</th></tr>';
-
+ DB_data_seek($result, 0);
while ($myrow = DB_fetch_array($result)) {
printf('<tr><td>%s</td>
<td>%s</td>
@@ -149,7 +150,7 @@
<td><a href="mailto:%s">%s</td>
<td><a href="%s?SupplierID=%s&SelectedContact=%s">' . _('Edit') . '</td>
<td><a href="%s?SupplierID=%s&SelectedContact=%s&delete=yes" onclick=\'return confirm("' . _('Are you sure you wish to delete this contact?') . '");\'>' . _('Delete') . '</td></tr>',
- $myrow['suppname'],
+ $myrow['contact'],
$myrow['position'],
$myrow['tel'],
$myrow['fax'],
@@ -206,7 +207,7 @@
$_POST['Mobile'] = $myrow['mobile'];
echo '<input type="hidden" name="SelectedContact" value="' . $_POST['Contact'] . '" />';
echo '<input type="hidden" name="Contact" value="' . $_POST['Contact'] . '" />';
- echo '<table><tr><td>' . _('Contact') . ':</td><td>' . $_POST['Contact'] . '</td></tr>';
+ echo '<table class="selection"><tr><td>' . _('Contact') . ':</td><td>' . $_POST['Contact'] . '</td></tr>';
} else { //end of if $SelectedContact only do the else when a new record is being entered
if (!isset($_POST['Contact'])) {
Modified: trunk/SupplierTenders.php
===================================================================
--- trunk/SupplierTenders.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/SupplierTenders.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -111,7 +111,7 @@
}
}
echo '</td>';
- echo '<th colspan="8" style="vertical-align:top"><font size="2" color="#616161">' . _('Tender Number') . ': ' .$_SESSION['offer'.$identifier]->TenderID . '</font></th>';
+ echo '<th colspan="8" class="header" style="vertical-align:top">' . _('Tender Number') . ': ' .$_SESSION['offer'.$identifier]->TenderID . '</th>';
echo '<input type="hidden" value="' . $_SESSION['offer'.$identifier]->TenderID . '" name="Tender" />';
echo '<tr><th>' . stripslashes($_SESSION['CompanyRecord']['coyname']) . '<br />' . _('Item Code') . '</th>';
echo '<th>' . _('Item Description') . '</th>';
@@ -425,7 +425,7 @@
ORDER BY tendersuppliers.tenderid";
$result=DB_query($sql, $db);
echo '<table class="selection">';
- echo '<tr><th colspan="13"><font size="3" color="#616161">' . _('Outstanding Tenders Waiting For Offer') . '</font></th></tr>';
+ echo '<tr><th colspan="13" class="header">' . _('Outstanding Tenders Waiting For Offer') . '</th></tr>';
while ($myrow=DB_fetch_array($result)) {
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -453,7 +453,7 @@
}
}
echo '</td>';
- echo '<th colspan="8" style="vertical-align:top"><font size="2" color="#616161">' . _('Tender Number') . ': ' .$myrow['tenderid'] . '</font></th>';
+ echo '<th colspan="8" class="header" style="vertical-align:top">' . _('Tender Number') . ': ' .$myrow['tenderid'] . '</th>';
echo '<input type="hidden" value="' . $myrow['tenderid'] . '" name="Tender" />';
echo '<th><button type="submit" value="" name="Process">' . _('Process') . "\n" . _('Tender') . '</button></th></tr>';
$ItemSQL="SELECT tenderitems.tenderid,
Modified: trunk/TaxGroups.php
===================================================================
--- trunk/TaxGroups.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/TaxGroups.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -264,7 +264,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<input type="hidden" name="SelectedGroup" value="' . $SelectedGroup .'" />';
echo '<table class="selection">';
- echo '<tr><th colspan="3"><font size="3" color="#616161">'._('Calculation Order').'</font></th></tr>';
+ echo '<tr><th colspan="3" class="header">'._('Calculation Order').'</th></tr>';
echo '<tr>
<th>'._('Tax Authority').'</th>
Modified: trunk/WhereUsedInquiry.php
===================================================================
--- trunk/WhereUsedInquiry.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/WhereUsedInquiry.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -56,7 +56,7 @@
include('includes/footer.inc');
exit;
}
- echo '<tr><th colspan="6"><font color="#616161" size="3"><b>'.$StockID . ' - ' . $myrow['description'] .'</b> (' . _('in units of') . ' ' . $myrow['units'] . ')</font></th></tr>';
+ echo '<tr><th colspan="6" class="header"><b>'.$StockID . ' - ' . $myrow['description'] .'</b> (' . _('in units of') . ' ' . $myrow['units'] . ')</th></tr>';
}
$tableheader = '<tr><th>' . _('Used By') . '</th>
Modified: trunk/WorkOrderStatus.php
===================================================================
--- trunk/WorkOrderStatus.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/WorkOrderStatus.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -79,8 +79,8 @@
echo '</td></tr></table><br />';
//set up options for selection of the item to be issued to the WO
- echo '<table class="selection"><tr><th colspan="5"><font size="2" color="#616161">' . _('Material Requirements For this Work Order') . '</font></th></tr>';
- echo '<tr><th colspan="4"><font size="2" color="#616161">' . _('Stock Issued From') . ' - ' . $LocRow['locationname'] . '</font></th></tr>';
+ echo '<table class="selection"><tr><th colspan="5" class="header">' . _('Material Requirements For this Work Order') . '</th></tr>';
+ echo '<tr><th colspan="4" class="header">' . _('Stock Issued From') . ' - ' . $LocRow['locationname'] . '</th></tr>';
echo '<tr><th colspan="2">' . _('Item') . '</th>
<th>' . _('Qty Required') . '</th>
<th>' . _('Qty Issued') . '</th>
Modified: trunk/Z_UpgradeDatabase.php
===================================================================
--- trunk/Z_UpgradeDatabase.php 2012-04-29 19:24:04 UTC (rev 8750)
+++ trunk/Z_UpgradeDatabase.php 2012-04-29 19:24:39 UTC (rev 8751)
@@ -68,10 +68,10 @@
// echo '</tr>';
}
echo '<table class="selection"><tr>';
- echo '<th colspan="4"><font size="2" color="#616161"><b>'._('Database Updates Have Been Run').'</b></font></th></tr>';
+ echo '<th colspan="4" class="header"><b>'._('Database Updates Have Been Run').'</b></th></tr>';
echo '<tr><td style="background-color: #fddbd...
[truncated message content] |
