[Weberp-svn] SF.net SVN: weberp:[8752] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8752] trunk
|
From: <tim...@us...> - 2012-04-29 21:55:19
|
Revision: 8752
http://weberp.svn.sourceforge.net/weberp/?rev=8752&view=rev
Author: tim_schofield
Date: 2012-04-29 21:55:11 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Layout improvements, new css and buttons
Modified Paths:
--------------
trunk/AccountGroups.php
trunk/ContractBOM.php
trunk/CustomerReceipt.php
trunk/DeliveryDetails.php
trunk/GLJournalInquiry.php
trunk/OrderDetails.php
trunk/POReport.php
trunk/PO_OrderDetails.php
trunk/Payments.php
trunk/PcAssignCashToTab.php
trunk/PcClaimExpensesFromTab.php
trunk/PcExpensesTypeTab.php
trunk/Prices_Customer.php
trunk/RecurringSalesOrders.php
trunk/ReprintGRN.php
trunk/css/silverwolf/default.css
Modified: trunk/AccountGroups.php
===================================================================
--- trunk/AccountGroups.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/AccountGroups.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -306,7 +306,7 @@
echo '<table class="selection">';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('Edit Account Group Details') . '</th>
+ <th colspan="2" class="header">' . _('Edit Account Group Details') . '</th>
</tr>';
echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_GET['SelectedAccountGroup'] . '" />';
echo '<input type="hidden" name="GroupName" value="' . $_POST['GroupName'] . '" />';
@@ -337,7 +337,7 @@
echo '<br /><table class="selection">';
echo '<input type="hidden" name="SelectedAccountGroup" value="' . $_POST['SelectedAccountGroup'] . '" />';
echo '<tr>
- <th colspan="2"><font size="2" color="#616161">' . _('New Account Group Details') . '</th>
+ <th colspan="2" class="header">' . _('New Account Group Details') . '</th>
</tr>';
echo '<tr>
<td>' . _('Account Group Name') . ':' . '</td>
@@ -406,7 +406,7 @@
</tr>';
echo '<tr>
- <td colspan="2"><div class="centre"><input tabindex="6" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td>
+ <td colspan="2"><div class="centre"><button tabindex="6" type="submit" name="submit">' . _('Enter Information') . '</button></div></td>
</tr>';
echo '</table><br />';
Modified: trunk/ContractBOM.php
===================================================================
--- trunk/ContractBOM.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/ContractBOM.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -233,7 +233,7 @@
echo '<table cellpadding="2" class="selection">';
if (isset($_SESSION['Contract'.$identifier]->ContractRef)) {
- echo '<tr><th colspan="7"><font color="#616161" size="2">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</font></th></tr>';
+ echo '<tr><th colspan="7" class="header">' . _('Contract Reference:') .' '. $_SESSION['Contract'.$identifier]->ContractRef.'</th></tr>';
}
echo '<tr>
@@ -274,8 +274,8 @@
$DisplayTotal = locale_money_format($TotalCost,$_SESSION['Contract'.$identifier]->CurrCode);
echo '<tr><td colspan="6" class="number">' . _('Total Cost') . '</td><td class="number"><b>' . $DisplayTotal . '</b></td></tr></table>';
- echo '<br /><div class="centre"><input type="submit" name="UpdateLines" value="' . _('Update Lines') . '" />';
- echo '<input type="submit" name="BackToHeader" value="' . _('Back To Contract Header') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="UpdateLines">' . _('Update Lines') . '</button>';
+ echo '<button type="submit" name="BackToHeader">' . _('Back To Contract Header') . '</button></div>';
} /*Only display the contract BOM lines if there are any !! */
@@ -316,17 +316,17 @@
}
echo '</select></td>
- <td><font size="2">' . _('Enter text extracts in the description') . ':</font></td>
+ <td>' . _('Enter text extracts in the description') . ':</td>
<td><input type="text" name="Keywords" size="20" maxlength="25" value="' . $_POST['Keywords'] . '" /></td></tr>
<tr><td></td>
- <td><font size="3"> <b>' . _('OR') . ' </b></font><font size="2">' . _('Enter extract of the Stock Code') .
- ':</font></td>
+ <td><font size="3"> <b>' . _('OR') . ' </b></font>' . _('Enter extract of the Stock Code') .
+ ':</td>
<td><input type="text" name="StockCode" size="15" maxlength="18" value="' . $_POST['StockCode'] . '" /></td>
</tr>
<tr><td></td>
- <td><font size="3"><b>' . _('OR') . ' </b></font><font size="2"><a target="_blank" href="'.$rootpath.'/Stocks.php?">' . _('Create a New Stock Item') . '</a></font></td></tr>
+ <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') . '" />
+ <div class="centre"><button type="submit" name="Search">' . _('Search Now') . '</button>
</div><br />';
@@ -335,7 +335,7 @@
if (isset($SearchResult)) {
- echo '<table cellpadding="1">';
+ echo '<table cellpadding="1" class="selection">';
$TableHeader = '<tr>
<th>' . _('Code') . '</th>
@@ -390,7 +390,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 '<br /><div class="centre"><input type="submit" name="NewItem" value="' . _('Add to Contract Bill Of Material') .'" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="NewItem">' . _('Add to Contract Bill Of Material') .'</button></div>';
}#end if SearchResults to show
echo '</form>';
Modified: trunk/CustomerReceipt.php
===================================================================
--- trunk/CustomerReceipt.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/CustomerReceipt.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -832,7 +832,7 @@
$_SESSION['ReceiptBatch']->Narrative='';
}
echo '<tr><td>' . _('Narrative') . ':</td><td><input tabindex="7" type="text" name="BatchNarrative" maxlength="50" size="52" value="' . $_SESSION['ReceiptBatch']->Narrative . '" /></td></tr>';
-echo '<tr><td colspan="3"><div class="centre"><input tabindex="8" type="submit" name="BatchInput" value="' . _('Accept') . '" /></div></td></tr>';
+echo '<tr><td colspan="3"><div class="centre"><button tabindex="8" type="submit" name="BatchInput">' . _('Accept') . '</button></div></td></tr>';
echo '</table><br />';
if (isset($_SESSION['ReceiptBatch'])){
@@ -935,7 +935,7 @@
if (isset($_POST['GLEntry']) AND isset($_SESSION['ReceiptBatch'])){
/* Set up a heading for the transaction entry for a GL Receipt */
echo '<br /><table class="selection">';
- echo '<th colspan="2"><font size="2" color="#616161">' . _('General Ledger Receipt Entry') . '</font></th>';
+ echo '<th colspan="2" class="header">' . _('General Ledger Receipt Entry') . '</th>';
//Select the tag
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
@@ -1019,8 +1019,8 @@
echo '<td>' . _('Narrative') . ':</td>';
echo '<td><textarea tabindex="13" name="Narrative" cols="40" rows="1"></textarea></td>';
echo '</table>';
- echo '<br /><div class="centre"><input tabindex="14" type="submit" name="Process" value="' . _('Accept') . '" />';
- echo '<input tabindex="15" type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><button tabindex="14" type="submit" name="Process">' . _('Accept') . '</button>';
+ echo '<button tabindex="15" type="submit" name="Cancel">' . _('Cancel') . '</button></div>';
} elseif (isset($_SESSION['ReceiptBatch']) AND !isset($_POST['GLEntry'])){
@@ -1039,8 +1039,8 @@
echo '<td><input tabindex="11" type="text" name="CustInvNo" size="8" maxlength="8" /></td>';
echo '</tr></table>';
echo '<div class="centre"><br />';
- echo '<input tabindex="11" type="submit" name="Search" value="' . _('Search Now') . '" />';
- echo '<br/><br/><input tabindex="12" type="submit" name="GLEntry" value="' . _('Enter A GL Receipt') . '" /><br /></div>';
+ echo '<button tabindex="11" type="submit" name="Search">' . _('Search Now') . '</button>';
+ echo '<br/><br/><button tabindex="12" type="submit" name="GLEntry">' . _('Enter A GL Receipt') . '</button><br /></div>';
if (isset($CustomerSearchResult)) {
@@ -1062,9 +1062,10 @@
}
printf('<td><font size="1">
- <input type="submit" name="Select" value="%s" /></font></td>
+ <button type="submit" name="Select" value="%s" />%s</button></font></td>
<td>%s</td></tr>',
$myrow['debtorno'],
+ $myrow['debtorno'],
$myrow['name']);
$j++;
@@ -1084,7 +1085,7 @@
}
if (isset($_SESSION['ReceiptBatch']->Items) and count($_SESSION['ReceiptBatch']->Items) > 0){
- echo '<div class="centre"><br/><input tabindex="13" type="submit" name="CommitBatch" value="' . _('Accept and Process Batch') . '" /></div>';
+ echo '<div class="centre"><br/><button tabindex="13" type="submit" name="CommitBatch">' . _('Accept and Process Batch') . '</button></div>';
}
echo '</form>';
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/DeliveryDetails.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -837,9 +837,9 @@
echo '<table cellpading="2" class="selection">';
if ($_SESSION['Items'.$identifier]->Quotation==1){
- echo '<tr><th colspan="7"><font size="2" color="#616161">'._('Quotation Summary').'</font></th></tr>';
+ echo '<tr><th colspan="7" class="header">'._('Quotation Summary').'</th></tr>';
} else {
- echo '<tr><th colspan="7"><font size="2" color="#616161">'._('Order Summary').'</font></th></tr>';
+ echo '<tr><th colspan="7" class="header">'._('Order Summary').'</th></tr>';
}
echo '<tr>
<th>'. _('Item Code') .'</th>
@@ -966,7 +966,7 @@
}
echo '<br /><table class="selection">';
-echo '<tr><th colspan="2"><font color="#616161" size="3">'._('Delivery Details').'</font></th></tr>';
+echo '<tr><th colspan="2" class="header">'._('Delivery Details').'</th></tr>';
echo '<tr>
<td>'. _('Deliver To') .':</td>
<td><input type="text" size="42" maxlength="40" name="DeliverTo" value="' . $_SESSION['Items'.$identifier]->DeliverTo . '" /></td>
@@ -1113,7 +1113,7 @@
echo '<td><input type="text" class="number" size="10" maxlength="12" name="FreightCost" value="' . $_SESSION['Items'.$identifier]->FreightCost . '" /></td>';
if ($_SESSION['DoFreightCalc']==true){
- echo '<td><input type="submit" name="Update" value="' . _('Recalc Freight Cost') . '" /></td></tr>';
+ echo '<td><button type="submit" name="Update" value="" />' . _('Recalc Freight Cost') . '</button></td></tr>';
}
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
@@ -1150,13 +1150,13 @@
echo '</table>';
-echo '<br /><div class="centre"><input type="submit" name="BackToLineDetails" value="' . _('Modify Order Lines') . '" /><br />';
+echo '<br /><div class="centre"><button type="submit" name="BackToLineDetails">' . _('Modify Order Lines') . '</button><br />';
if ($_SESSION['ExistingOrder'.$identifier]==0){
- echo '<br /><br /><input type="submit" name="ProcessOrder" value="' . _('Place Order') . '" />';
- echo '<br /><br /><input type="submit" name="MakeRecurringOrder" value="' . _('Create Recurring Order') . '" />';
+ echo '<br /><br /><button type="submit" name="ProcessOrder">' . _('Place Order') . '</button>';
+ echo '<br /><br /><button type="submit" name="MakeRecurringOrder">' . _('Create Recurring Order') . '</button>';
} else {
- echo '<br /><input type="submit" name="ProcessOrder" value="' . _('Commit Order Changes') . '" />';
+ echo '<br /><button type="submit" name="ProcessOrder">' . _('Commit Order Changes') . '</button>';
}
echo '</div></form>';
Modified: trunk/GLJournalInquiry.php
===================================================================
--- trunk/GLJournalInquiry.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/GLJournalInquiry.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -11,7 +11,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
- echo '<tr><th colspan="3"><font color="#616161" size="2">' . _('Selection Criteria') . '</font></th></tr>';
+ echo '<tr><th colspan="3" class="header">' . _('Selection Criteria') . '</th></tr>';
$sql = "SELECT typeno FROM systypes WHERE typeid=0";
$result = DB_query($sql, $db);
@@ -28,8 +28,13 @@
MAX(trandate) AS todate FROM gltrans WHERE type=0";
$result = DB_query($sql, $db);
$myrow = DB_fetch_array($result);
- $FromDate = $myrow['fromdate'];
- $ToDate = $myrow['todate'];
+ if (isset($FromDate) and $FromDate != '') {
+ $FromDate = $myrow['fromdate'];
+ $ToDate = $myrow['todate'];
+ } else {
+ $FromDate=date('Y-m-d');
+ $ToDate=date('Y-m-d');
+ }
echo '<tr><td>' . _('Journals Dated Between') . ':</td>
<td>' . _('From') . ':'. '<input type="text" name="FromTransDate" class="date" alt="'.$_SESSION['DefaultDateFormat'].'" maxlength="10" size="11" value="' . ConvertSQLDate($FromDate) . '" /></td>
@@ -37,7 +42,7 @@
</tr>';
echo '</table>';
- echo '<br /><div class="centre"><input type="submit" name="Show" value="' . _('Show transactions'). '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="Show">' . _('Show transactions'). '</button></div>';
echo '</form>';
} else {
@@ -86,7 +91,7 @@
}
if ($myrow['typeno']!=$LastJournal) {
- echo '<tr><td colspan="8" bgcolor="#616161"></td></tr><tr>
+ echo '<tr><td colspan="8"</td></tr><tr>
<td>'. ConvertSQLDate($myrow['trandate']) . '</td>
<td class="number">'.$myrow['typeno'].'</td>';
@@ -114,7 +119,7 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<br /><div class="centre"><input type="submit" name="Return" value="' . _('Select Another Date'). '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="Return">' . _('Select Another Date'). '</button></div>';
echo '</form>';
}
include('includes/footer.inc');
Modified: trunk/OrderDetails.php
===================================================================
--- trunk/OrderDetails.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/OrderDetails.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -58,7 +58,7 @@
$myrow = DB_fetch_array($GetOrdHdrResult);
$CustomerCurrency=$myrow['currcode'];
echo '<table class="selection">';
- echo '<tr><th colspan="4"><font size="3" color="#616161">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<tr><th colspan="4" class="header">'._('Order Header Details For Order No').' '.$_GET['OrderNumber'].'</th></tr>';
echo '<tr>
<th style="text-align: left">' . _('Customer Code') . ':</th>
<td class="OddTableRows"><font><a href="' . $rootpath . '/SelectCustomer.php?Select=' . $myrow['debtorno'] . '">' . $myrow['debtorno'] . '</a></td>
@@ -149,7 +149,7 @@
$OrderTotalWeight = 0;
echo '<br /><table cellpadding="2" class="selection">';
- echo '<tr><th colspan="9"><font size="3" color="#616161">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</font></th></tr>';
+ echo '<tr><th colspan="9" class="header">'._('Order Line Details For Order No').' '.$_GET['OrderNumber'].'</th></tr>';
echo '<tr>
<th>' . _('Item Code') . '</th>
<th>' . _('Item Description') . '</th>
Modified: trunk/POReport.php
===================================================================
--- trunk/POReport.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/POReport.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -630,7 +630,7 @@
else {
$SortBy_Display = $Detail_Array[$_POST['SortBy']];
}
- echo '<tr><th colspan="2"><font size="3" color="#616161">' . _('Header Details') . '</font></th></tr>';
+ echo '<tr><th colspan="2" class="header">' . _('Header Details') . '</th></tr>';
echo '<tr><td>' . _('Purchase Order Report') . '</td><td>' . $_POST['ReportType'] . ' By ' . $SortBy_Display . '</td></tr>';
echo '<tr><td>' . _('Date Type') . '</td><td>' . $_POST['DateType'] . '</tr>';
echo '<tr><td>' . _('Date Range') . '</td><td>' . $_POST['FromDate'] . _(' To ') . $_POST['ToDate'] . '</td></tr>';
@@ -891,7 +891,7 @@
echo '<input type="hidden" name="Category" value="' . $_POST['Category'] . '" />';
echo '<input type="hidden" name="SortBy" value="' . $_POST['SortBy'] . '" />';
echo '<input type="hidden" name="SummaryType" value="' . $_POST['SummaryType'] . '" />';
- echo '<br /><div class="centre"><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '" /></div></td>';
+ echo '<br /><div class="centre"><button type="submit" name="submitcsv">' . _('Export as csv file') . '</button></div></td>';
echo '<br /><div class="centre"><a href="">' . _('Return to Selection') . '</a></div>';
echo '</form>';
} // End of if inputerror != 1
@@ -1600,10 +1600,10 @@
echo '</select></td><td> </td></tr>';
echo '<tr><td> </td></tr>
<tr>
- <td colspan="4"><div class="centre"><input type="submit" name="submit" value="' . _('Run Inquiry') . '" /></div></td>
+ <td colspan="4"><div class="centre"><button type="submit" name="submit">' . _('Run Inquiry') . '</button></div></td>
</tr>
<tr>
- <td colspan="4"><div class="centre"><input type="submit" name="submitcsv" value="' . _('Export as csv file') . '" /></div></td>
+ <td colspan="4"><div class="centre"><button type="submit" name="submitcsv">' . _('Export as csv file') . '</button></div></td>
</tr>
</table>
<br/>';
Modified: trunk/PO_OrderDetails.php
===================================================================
--- trunk/PO_OrderDetails.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/PO_OrderDetails.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -85,7 +85,7 @@
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/supplier.png" title="' . _('Purchase Order') . '" alt="" />' . ' ' . $title . '</p>';
echo '<table class="selection" cellpadding="2">';
-echo '<tr><th colspan="8"><font size="3" color="#616161">'. _('Order Header Details'). '</font></th></tr>';
+echo '<tr><th colspan="8" class="header">'. _('Order Header Details'). '</th></tr>';
echo '<tr><th style="text-align:left">' . _('Supplier Code'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['supplierid'] . '</a></td>
<th style="text-align:left">' . _('Supplier Name'). '</td><td><a href="SelectSupplier.php?SupplierID='.$myrow['supplierid'].'">' . $myrow['suppname'] . '</a></td></tr>';
@@ -147,7 +147,7 @@
echo '<table class="selection" cellpadding="0">';
-echo '<tr><th colspan="8"><font size="3" color="#616161">'. _('Order Line Details'). '</font></th></tr>';
+echo '<tr><th colspan="8" class="header">'. _('Order Line Details'). '</th></tr>';
echo '<tr>
<th>' . _('Item Code'). '</td>
<th>' . _('Item Description'). '</td>
@@ -185,22 +185,22 @@
}
printf ('<td>%s</td>
- <td>%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td class="number">%s</td>
- <td>%s</td>
+ <td>%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td class="number">%s</td>
+ <td>%s</td>
</tr>' ,
- $myrow['itemcode'],
- $myrow['itemdescription'],
- locale_number_format($myrow['quantityord'], $myrow['decimalplaces']),
- locale_number_format($myrow['quantityrecd'], $myrow['decimalplaces']),
- locale_number_format($myrow['qtyinvoiced'], $myrow['decimalplaces']),
- locale_money_format($myrow['unitprice'], $OrderCurrCode),
- locale_money_format($myrow['actprice'], $OrderCurrCode),
- $DisplayReqdDate);
+ $myrow['itemcode'],
+ $myrow['itemdescription'],
+ locale_number_format($myrow['quantityord'], $myrow['decimalplaces']),
+ locale_number_format($myrow['quantityrecd'], $myrow['decimalplaces']),
+ locale_number_format($myrow['qtyinvoiced'], $myrow['decimalplaces']),
+ locale_money_format($myrow['unitprice'], $OrderCurrCode),
+ locale_money_format($myrow['actprice'], $OrderCurrCode),
+ $DisplayReqdDate);
}
Modified: trunk/Payments.php
===================================================================
--- trunk/Payments.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/Payments.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -285,8 +285,8 @@
echo _('Has the cheque been printed') . '?<br /><br />';
echo '<input type="hidden" name="CommitBatch" value="' . $_POST['CommitBatch'] . '" />';
echo '<input type="hidden" name="BankAccount" value="' . $_POST['BankAccount'] . '" />';
- echo '<input type="submit" name="ChequePrinted" value="' . _('Yes / Continue') . '" /> ';
- echo '<input type="submit" name="PaymentCancelled" value="' . _('No / Cancel Payment') . '" />';
+ echo '<button type="submit" name="ChequePrinted">' . _('Yes / Continue') . '</button> ';
+ echo '<button type="submit" name="PaymentCancelled">' . _('No / Cancel Payment') . '</button>';
} else {
//Start a transaction to do the whole lot inside
@@ -729,7 +729,7 @@
echo '<br /><table class="selection">';
-echo '<tr><th colspan="4"><font size="3" color="#616161">' . _('Payment');
+echo '<tr><th colspan="4" class="header">' . _('Payment');
if ($_SESSION['PaymentDetail'.$identifier]->SupplierID!=''){
echo ' ' . _('to') . ' ' . $_SESSION['PaymentDetail'.$identifier]->SuppName;
@@ -739,7 +739,7 @@
echo ' ' . _('from the') . ' ' . $_SESSION['PaymentDetail'.$identifier]->BankAccountName;
}
-echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail'.$identifier]->DatePaid . '</font></th></tr>';
+echo ' ' . _('on') . ' ' . $_SESSION['PaymentDetail'.$identifier]->DatePaid . '</th></tr>';
$SQL = "SELECT bankaccountname,
bankaccounts.accountcode,
@@ -878,17 +878,15 @@
echo '<tr><td>' . _('Reference / Narrative') . ':</td>
<td colspan="2"><input type="text" name="Narrative" maxlength="80" size="82" value="' . $_POST['Narrative'] . '" /> ' . _('(Max. length 80 characters)') . '</td>
</tr>';
-echo '<tr><td colspan="3"><div class="centre"><input type="submit" name="UpdateHeader" value="' . _('Update'). '" /></td></tr>';
+echo '<tr><td colspan="3"><div class="centre"><button type="submit" name="UpdateHeader">' . _('Update'). '</button></td></tr>';
-
echo '</table><br />';
-
if ($_SESSION['CompanyRecord']['gllink_creditors']==1 AND $_SESSION['PaymentDetail'.$identifier]->SupplierID==''){
/* Set upthe form for the transaction entry for a GL Payment Analysis item */
echo '<br /><table class="selection">';
- echo '<tr><th colspan="2"><font size="3" color="#616161">' . _('General Ledger Payment Analysis Entry') . '</font></th></tr>';
+ echo '<tr><th colspan="2" class="header">' . _('General Ledger Payment Analysis Entry') . '</th></tr>';
//Select the tag
echo '<tr><td>' . _('Select Tag') . ':</td><td><select name="tag">';
@@ -939,7 +937,7 @@
echo '<option value="' . $myrow['groupname'] . '">' . $myrow['groupname'] . '</option>';
}
}
- echo '</select><input type="submit" name="UpdateCodes" value="Select" /></td></tr>';
+ echo '</select><button type="submit" name="UpdateCodes">' . _('Select') . '</button></td></tr>';
}
if (isset($_POST['GLGroup']) AND $_POST['GLGroup']!='') {
@@ -1001,8 +999,8 @@
echo '</table><br />';
echo '<div class="centre">
- <input type="submit" name="Process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" />
+ <button type="submit" name="Process">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button>
</div>';
if (sizeOf($_SESSION['PaymentDetail'.$identifier]->GLItems)>0) {
@@ -1029,17 +1027,17 @@
$TagName=$TagMyrow[0];
}
echo '<tr>
- <td align=left>' . $PaymentItem->cheque . '</td>
- <td class="number">' . $PaymentItem->Amount . '</td>
- <td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td>
- <td>' . stripslashes($PaymentItem->Narrative) . '</td>
- <td>' . $PaymentItem->tag . ' - ' . $TagName . '</td>
- <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $PaymentItem->ID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment analysis item?') . '\');">' . _('Delete') . '</a></td>
+ <td align=left>' . $PaymentItem->cheque . '</td>
+ <td class="number">' . $PaymentItem->Amount . '</td>
+ <td>' . $PaymentItem->GLCode . ' - ' . $PaymentItem->GLActName . '</td>
+ <td>' . stripslashes($PaymentItem->Narrative) . '</td>
+ <td>' . $PaymentItem->tag . ' - ' . $TagName . '</td>
+ <td><a href="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '?Delete=' . $PaymentItem->ID . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this payment analysis item?') . '\');">' . _('Delete') . '</a></td>
</tr>';
$PaymentTotal += filter_currency_input($PaymentItem->Amount);
}
- echo '<tr><td></td><td class="number"><b>' . $PaymentTotal . '</b></td><td colspan="3"></td></tr></table><br />';
- echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />';
+ echo '<tr><td></td><td class="number"><b>' . locale_money_format($PaymentTotal, $_SESSION['PaymentDetail'.$identifier]->AccountCurrency) . '</b></td><td colspan="3"></td></tr></table><br />';
+ echo '<button type="submit" name="CommitBatch">' . _('Accept and Process Payment') . '</button>';
}
} else {
@@ -1070,7 +1068,7 @@
<td><input type="text" name="cheque" maxlength="12" size="12" /></td>
</tr>';
echo '</table><br />';
- echo '<input type="submit" name="CommitBatch" value="' . _('Accept and Process Payment') . '" />';
+ echo '<button type="submit" name="CommitBatch">' . _('Accept and Process Payment') . '</button>';
}
echo '</form>';
Modified: trunk/PcAssignCashToTab.php
===================================================================
--- trunk/PcAssignCashToTab.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/PcAssignCashToTab.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -188,8 +188,8 @@
echo '</select></td></tr>';
echo '</td></tr></table>'; // close main table
- echo '<br /><div class="centre"><input type="submit" name="process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="process">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button></div>';
echo '</form>';
} elseif (isset($SelectedTabs)) {
@@ -234,13 +234,13 @@
$result = DB_query($sql,$db);
echo '<br /><table class="selection">';
- echo '<tr><th colspan="8"><font color="#616161" size="2">' . _('Details Of Petty Cash Tab ') . '' .$SelectedTabs. '</form></th></tr>';
+ echo '<tr><th colspan="8" class="header">' . _('Details Of Petty Cash Tab ') . '' .$SelectedTabs. '</th></tr>';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><th colspan="8">' . _('Detail Of PC Tab Movements For Last ') .': ';
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> Days ';
- echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
+ echo '<button type="submit" name="Go">' . _('Go') . '</button>';
echo '</th></tr></form>';
echo '<tr>
<th>' . _('Date') . '</th>
@@ -333,9 +333,9 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class="selection">'; //Main table
if (isset($_GET['SelectedIndex'])) {
- echo '<tr><th colspan="2"><font color="#616161" size="3">'._('Update Cash Assignment').'</font></th></tr>';
+ echo '<tr><th colspan="2" class="header">'._('Update Cash Assignment').'</th></tr>';
} else {
- echo '<tr><th colspan="2"><font color="#616161" size="3">'._('New Cash Assignment').'</font></th></tr>';
+ echo '<tr><th colspan="2" class="header">'._('New Cash Assignment').'</th></tr>';
}
if ( isset($_GET['edit'])) {
@@ -397,8 +397,9 @@
echo '</td></tr></table>'; // close main table
echo '<br /><div class="centre">
- <input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ <button type="submit" name="submit">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button>
+ </div>';
echo '</form>';
Modified: trunk/PcClaimExpensesFromTab.php
===================================================================
--- trunk/PcClaimExpensesFromTab.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/PcClaimExpensesFromTab.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -185,8 +185,8 @@
echo '</select></td></tr>';
echo '</td></tr></table>'; // close main table
- echo '<br /><div class="centre"><input type="submit" name="process" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="process">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button></div>';
echo '</form>';
@@ -204,7 +204,7 @@
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<br /><table class="selection">';
- echo '<tr><th colspan="8"><font color="#616161" size="3">' . _('Petty Cash Tab') . ' ' .$SelectedTabs. '</font></th></tr>';
+ echo '<tr><th colspan="8" class="header">' . _('Petty Cash Tab') . ' ' .$SelectedTabs. '</th></tr>';
echo '<tr><th colspan="8">' . _('Detail Of Movements For Last ') .': ';
if(!isset ($Days)){
@@ -212,7 +212,7 @@
}
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
echo '<input type="text" class="number" name="Days" value="' . $Days . '" maxlength="3" size="4" /> Days ';
- echo '<input type="submit" name="Go" value="' . _('Go') . '" />';
+ echo '<button type="submit" name="Go">' . _('Go') . '</button>';
echo '</th></tr></form>';
if (isset($_POST['Cancel'])) {
@@ -329,6 +329,10 @@
$Amount['amount']=0;
}
+ if(!isset($TabRow['currency'])) {
+ $TabRow['currency']=$_SESSION['CompanyRecord']['currencydefault'];
+ }
+
echo '<tr><td colspan="2" class="number">' . _('Current balance') . ':</td>
<td class="number">'.locale_money_format($Amount['amount'],$TabRow['currency']).'</td></tr>';
@@ -419,8 +423,8 @@
echo '<input type="hidden" name="SelectedTabs" value="' . $SelectedTabs . '" />';
echo '<input type="hidden" name="Days" value="' .$Days. '" />';
echo '</td></tr></table>'; // close main table
- echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="submit">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button></div>';
echo '</form>';
} // end if user wish to delete
Modified: trunk/PcExpensesTypeTab.php
===================================================================
--- trunk/PcExpensesTypeTab.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/PcExpensesTypeTab.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -139,8 +139,8 @@
echo '</td></tr></table>'; // close main table
echo '<br /><div class="centre">
- <input type="submit" name=process value="' . _('Accept') . '" />
- <input type="submit" name=Cancel value="' . _('Cancel') . '" /></div>';
+ <button type="submit" name=process>' . _('Accept') . '</button>
+ <button type="submit" name=Cancel>' . _('Cancel') . '</button></div>';
echo '</form>';
@@ -157,7 +157,7 @@
$result = DB_query($sql,$db);
echo '<br /><table class="selection">';
- echo '<tr><th colspan="3"><font size="2" color="#616161">' . _('Expense Codes for Type of Tab ') . ' ' .$SelectedTab. '</font></th></tr>';
+ echo '<tr><th colspan="3" type="header">' . _('Expense Codes for Type of Tab ') . ' ' .$SelectedTab. '</th></tr>';
echo '<tr>
<th>' . _('Expense Code') . '</th>
<th>' . _('Description') . '</th>
@@ -224,8 +224,8 @@
echo '</td></tr></table>'; // close main table
- echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" />
- <input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
+ echo '<br /><div class="centre"><button type="submit" name="submit">' . _('Accept') . '</button>
+ <button type="submit" name="Cancel">' . _('Cancel') . '</button></div>';
echo '</form>';
} // end if user wish to delete
Modified: trunk/Prices_Customer.php
===================================================================
--- trunk/Prices_Customer.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/Prices_Customer.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -32,7 +32,7 @@
}
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . _('Special Customer Prices').'</p>';
-echo '<p class="page_title_text"><font color="blue"><b>' . $myrow['name'] . ' ' . _('in') . ' ' . $myrow['currcode'] . '<br />' . ' ' . _('for') . ' ';
+echo '<p class="page_title_text">' . $myrow['name'] . ' ' . _('in') . ' ' . $myrow['currcode'] . '<br />' . ' ' . _('for') . ' ';
$CurrCode = $myrow['currcode'];
$SalesType = $myrow['salestype'];
@@ -52,7 +52,7 @@
exit;
}
-echo $Item . ' - ' . $myrow['description'] . '</b></font></p>';
+echo $Item . ' - ' . $myrow['description'] . '</font></p>';
if (isset($_POST['submit'])) {
@@ -218,14 +218,15 @@
if (DB_num_rows($result) == 0) {
echo '<tr><td>' . _('There are no default prices set up for this part in this currency') . '</td></tr>';
} else {
- echo '<tr><th colspan="6"><font color="#616161" size="2">' . _('Normal Price') . '</font></th></tr>';
- echo '<tr><th>' . _('Price') . '</th>
- <th>' . _('UOM'). '</th>
- <th>' . _('Conversion') . '<br />'._('Factor') . '</th>
- <th>' . _('Decimal') . '<br />' . _('Places') . '</th>
- <th>' . _('Start Date') . '</th>
- <th>' . _('End Date') . '</th>
- </tr>';
+ echo '<tr><th colspan="6" class="header">' . _('Normal Price') . '</th></tr>';
+ echo '<tr>
+ <th>' . _('Price') . '</th>
+ <th>' . _('UOM'). '</th>
+ <th>' . _('Conversion') . '<br />'._('Factor') . '</th>
+ <th>' . _('Decimal') . '<br />' . _('Places') . '</th>
+ <th>' . _('Start Date') . '</th>
+ <th>' . _('End Date') . '</th>
+ </tr>';
while ($myrow = DB_fetch_array($result)) {
if ($myrow['enddate']=='0000-00-00'){
$EndDateDisplay = _('No End Date');
@@ -271,7 +272,7 @@
$result = DB_query($sql,$db,$ErrMsg,$DbgMsg);
echo '<table class="selection">';
-echo '<tr><th colspan="9"><font color="#616161" size="2">' . _('Special Prices') . '</font></th></tr>';
+echo '<tr><th colspan="9" class="header">' . _('Special Prices') . '</th></tr>';
if (DB_num_rows($result) == 0) {
echo '<tr><td>' . _('There are no special prices set up for this part') . '</td></tr>';
@@ -451,7 +452,7 @@
</tr></table>';
-echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Enter Information') . '" /></div>';
+echo '<br /><div class="centre"><button type="submit" name="submit">' . _('Enter Information') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/RecurringSalesOrders.php
===================================================================
--- trunk/RecurringSalesOrders.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/RecurringSalesOrders.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -313,7 +313,7 @@
echo '<table cellpadding="2" class="selection">';
-echo '<tr><th colspan="7"><font size="2" color="#616161"><b>'._('Order Line Details').'</b></font></th></tr>';
+echo '<tr><th colspan="7" class="header"><b>'._('Order Line Details').'</b></th></tr>';
echo '<tr>
<th>'. _('Item Code') .'</th>
<th>'. _('Item Description') .'</th>
@@ -368,7 +368,7 @@
</table>';
echo '<br /><table class="selection">';
-echo '<tr><th colspan="7"><font size="2" color="#616161"><b>'._('Order Header Details').'</b></font></th></tr>';
+echo '<tr><th colspan="7" class="header"><b>'._('Order Header Details').'</b></th></tr>';
echo '<tr>
<td>'. _('Deliver To') .':</td>
@@ -510,14 +510,14 @@
echo '<br /><div class="centre">';
if ($NewRecurringOrder=='Yes'){
echo '<input type="hidden" name="NewRecurringOrder" value="Yes" />';
- echo '<input type="submit" name="Process" value="' . _('Create Recurring Order') . '" />';
+ echo '<button type="submit" name="Process">' . _('Create Recurring Order') . '</button>';
} else {
echo '<input type="hidden" name="NewRecurringOrder" value="No" />';
echo '<input type="hidden" name="ExistingRecurrOrderNo" value="' . $_POST['ExistingRecurrOrderNo'] . '" />';
- echo '<input type="submit" name="Process" value="' . _('Update Recurring Order Details') . '" />';
+ echo '<button type="submit" name="Process">' . _('Update Recurring Order Details') . '</button>';
- echo '<br /><br /><input type="submit" name="DeleteRecurringOrder" value="' . _('Delete Recurring Order') . ' ' . $_POST['ExistingRecurrOrderNo'] . '" onclick="return confirm(\'' . _('Are you sure you wish to delete this recurring order template?') . '\');" />';
+ echo '<br /><br /><button type="submit" name="DeleteRecurringOrder" onclick="return confirm(\'' . _('Are you sure you wish to delete this recurring order template?') . '\');">' . _('Delete Recurring Order') . ' ' . $_POST['ExistingRecurrOrderNo'] . '</button>';
}
echo '</form></div>';
Modified: trunk/ReprintGRN.php
===================================================================
--- trunk/ReprintGRN.php 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/ReprintGRN.php 2012-04-29 21:55:11 UTC (rev 8752)
@@ -13,10 +13,10 @@
echo '<form action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '" method="post">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<table class="selection">';
-echo '<tr><th colspan="2"><font size="2" color="#616161">' . _('Select a purchase order') . '</th></tr>';
+echo '<tr><th colspan="2" class="header">' . _('Select a purchase order') . '</th></tr>';
echo '<tr><td>' . _('Enter a Purchase Order Number') . '</td>';
echo '<td>' . '<input type="text" name="PONumber" class="number" size="7" value="'.$_POST['PONumber'].'" /></td></tr>';
-echo '<tr><td colspan="2" style="text-align: center">' . '<input type="submit" name="Show" value="Show GRNs" /></td></tr>';
+echo '<tr><td colspan="2" style="text-align: center">' . '<button type="submit" name="Show">' . _('Show GRNs') . '</button></td></tr>';
echo '</table>';
echo '</form>';
@@ -63,7 +63,7 @@
}
$k=0;
echo '<br /><table class="selection">';
- echo '<tr><th colspan="8"><font size="2" color="#616161">' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</th></tr>';
+ echo '<tr><th colspan="8" class="header">' . _('GRNs for Purchase Order No') .' ' . $_POST['PONumber'] . '</th></tr>';
echo '<tr><th>' . _('Supplier') . '</th>';
echo '<th>' . _('PO Order line') . '</th>';
echo '<th>' . _('GRN Number') . '</th>';
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-04-29 19:24:39 UTC (rev 8751)
+++ trunk/css/silverwolf/default.css 2012-04-29 21:55:11 UTC (rev 8752)
@@ -265,21 +265,20 @@
}
button {
- background-color: #9F9F9F;
- border-top: 1px solid #abbbcc;
+ background-color: #C4C4C4;
+ border-top: 1px solid #a1afbf;
border-left: 1px solid #a7b6c7;
border-bottom: 1px solid #a1afbf;
border-right: 1px solid #a7b6c7;
-webkit-border-radius: 12px;
-moz-border-radius: 12px;
- border-radius: 12px;
- -webkit-box-shadow: inset 0 1px 0 0 white;
- -moz-box-shadow: inset 0 1px 0 0 white;
- box-shadow: inset 0 1px 0 0 white;
+ border-radius: 7px;
+ -webkit-box-shadow: inset 0 0px 0 0 white;
+ -moz-box-shadow: inset 0 0px 0 0 white;
+ box-shadow: inset 0 0px 0 0 white;
color: #092442;
font: normal 10px "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
- line-height: 1;
- padding: 3px 3px 3px 3px;
+ padding: 1px 1px 1px 1px;
margin-right: 3px;
text-align: center;
}
@@ -298,7 +297,7 @@
border-right: 1px solid #9caaba;
-webkit-box-shadow: inset 0 1px 0 0 #f2f2f2;
-moz-box-shadow: inset 0 1px 0 0 #f2f2f2;
- box-shadow: inset 0 1px 0 0 #f2f2f2;
+ box-shadow: inset 0 0px 0 0 #f2f2f2;
color: #163659;
cursor: pointer;
}
@@ -714,7 +713,7 @@
font-family: "Lucida Grande", "Lucida Sans Unicode", "Lucida Sans", Geneva, Verdana, sans-serif;
padding-top: 2px;
padding-bottom: 2px;
- font-weight: bold;
+ font-weight: normal;
font-size: 150%;
color: white;
background-color: #7A7A89;
@@ -881,8 +880,8 @@
}
.OsRow {
- background-color: #234567;
- color: white;
+ background-color: #FFDAE1;
+ color: #510D19;
}
/* From merge, uncomment to apply style
.table_index {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
