[Weberp-svn] SF.net SVN: weberp:[8770] trunk
Brought to you by:
sotandeka,
tim_schofield
Menu
▾
▴
[Weberp-svn] SF.net SVN: weberp:[8770] trunk
|
From: <tim...@us...> - 2012-05-03 13:40:34
|
Revision: 8770
http://weberp.svn.sourceforge.net/weberp/?rev=8770&view=rev
Author: tim_schofield
Date: 2012-05-03 13:40:22 +0000 (Thu, 03 May 2012)
Log Message:
-----------
Merges from kcmc branch
Modified Paths:
--------------
trunk/AccountSections.php
trunk/AddCustomerNotes.php
trunk/AgedDebtors.php
trunk/AgedSuppliers.php
trunk/Areas.php
trunk/AuditTrail.php
trunk/BOMExtendedQty.php
trunk/BOMIndented.php
trunk/BankAccounts.php
trunk/BankMatching.php
trunk/BankReconciliation.php
trunk/ConfirmDispatch_Invoice.php
trunk/CopyBOM.php
trunk/DeliveryDetails.php
trunk/PcTypeTabs.php
trunk/SelectCustomer.php
trunk/SelectOrderItems.php
trunk/SelectSalesOrder.php
trunk/Shippers.php
trunk/SpecialOrder.php
trunk/SupplierAllocations.php
trunk/css/silverwolf/default.css
Modified: trunk/AccountSections.php
===================================================================
--- trunk/AccountSections.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/AccountSections.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -205,6 +205,8 @@
if (! isset($_GET['delete'])) {
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p>
+ <br />';
echo '<form method="post" name="AccountSections" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
@@ -255,7 +257,7 @@
<td><input tabindex="2" ' . (in_array('SectionName',$Errors) ? 'class="inputerror"' : '' ) .' type="text" name="SectionName" size="30" maxlength="30" value="' . $_POST['SectionName'] . '" /></td>
</tr>';
- echo '<tr><td colspan="2"><div class="centre"><input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') . '" /></div></td></tr>';
+ echo '<tr><td colspan="2"><div class="centre"><button tabindex="3" type="submit" name="submit">' . _('Enter Information') . '</button></div></td></tr>';
echo '</table><br />';
if (!isset($_GET['SelectedSectionID']) or $_GET['SelectedSectionID']=='') {
Modified: trunk/AddCustomerNotes.php
===================================================================
--- trunk/AddCustomerNotes.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/AddCustomerNotes.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -238,7 +238,7 @@
echo '<tr>
<td colspan="2">
<div class="centre">
- <input type="submit" name="submit" value="'._('Enter Information').'" />
+ <button type="submit" name="submit">'._('Enter Information').'</button>
</div>
</td>
</tr>
Modified: trunk/AgedDebtors.php
===================================================================
--- trunk/AgedDebtors.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/AgedDebtors.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -508,8 +508,8 @@
</table>
<br />
<div class="centre">
- <input tabindex="7" type="submit" name="PrintPDF" value="' . _('Print PDF') , '" />
- </div>';
+ <button tabindex="7" type="submit" name="PrintPDF">' . _('Print PDF') , '</button>
+ </div><br />';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/AgedSuppliers.php
===================================================================
--- trunk/AgedSuppliers.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/AgedSuppliers.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -320,8 +320,8 @@
</table>
<br />
<div class="centre">
- <input tabindex="6" type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ <button tabindex="6" type="submit" name="PrintPDF">' . _('Print PDF') . '</button>
+ </div><br />';
}
include('includes/footer.inc');
} /*end of else not PrintPDF */
Modified: trunk/Areas.php
===================================================================
--- trunk/Areas.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/Areas.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -178,9 +178,11 @@
if (!isset($_GET['delete'])) {
- echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '"><br />';
+ echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
+ echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
+
if (isset($SelectedArea)) {
//editing an existing area
@@ -224,7 +226,7 @@
echo '<tr>
<td colspan="2">
<div class="centre">
- <input tabindex="3" type="submit" name="submit" value="' . _('Enter Information') .'" />
+ <button tabindex="3" type="submit" name="submit">' . _('Enter Information') .'</button>
</div>
</td>
</tr>
Modified: trunk/AuditTrail.php
===================================================================
--- trunk/AuditTrail.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/AuditTrail.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -77,7 +77,7 @@
echo '<td><input type="text" name="ContainingText" size="20" maxlength="20" value="'. $_POST['ContainingText'] . '"></td></tr>';
echo '</table><br />';
-echo '<div class="centre"><input tabindex="5" type="submit" name="View" value="' . _('View') . '" /></div>';
+echo '<div class="centre"><button tabindex="5" type="submit" name="View">' . _('View') . '</button></div><br />';
echo '</form>';
// View the audit trail
Modified: trunk/BOMExtendedQty.php
===================================================================
--- trunk/BOMExtendedQty.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/BOMExtendedQty.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -250,9 +250,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br />
- <br />
- <form action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . ' method="post">
+ echo '<form action=' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . ' method="post">
<table class="selection">
<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />
<tr>
@@ -278,12 +276,10 @@
</select></td>
</tr>
</table>
- <br />
- <br />
<div class="centre">
<br />
- <input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" />
- </div>';
+ <button type="submit" name="PrintPDF">' . _('Print PDF') . '</button>
+ </div><br />';
include('includes/footer.inc');
Modified: trunk/BOMIndented.php
===================================================================
--- trunk/BOMIndented.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/BOMIndented.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -252,7 +252,7 @@
include('includes/header.inc');
echo '<p class="page_title_text"><img src="'.$rootpath.'/css/'.$theme.'/images/maintenance.png" title="' . _('Search') . '" alt="" />' . ' ' . $title.'</p><br />';
- echo '<br /><br /><form action=' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . ' method="post"><table class="selection">';
+ echo '<form action=' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . ' method="post"><table class="selection">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
echo '<tr><td>' . _('Part') . ':</td>';
echo '<td><input type ="text" name="Part" size="20" />';
@@ -266,7 +266,7 @@
echo '<option selected="True" value="yes">' . _('Print With Alternating Highlighted Lines') . '</option>';
echo '<option value="no">' . _('Plain Print') . '</option>';
echo '</select></td></tr>';
- echo '</table><br /><div class="centre"><input type="submit" name="PrintPDF" value="' . _('Print PDF') . '" /></div>';
+ echo '</table><br /><div class="centre"><button type="submit" name="PrintPDF">' . _('Print PDF') . '</button></div><br />';
include('includes/footer.inc');
Modified: trunk/BankAccounts.php
===================================================================
--- trunk/BankAccounts.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/BankAccounts.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -213,7 +213,7 @@
} elseif ($myrow['invoice']==2) {
$DefaultBankAccount=_('Currency Default');
}
- printf('<td>%s<br /><font size="2">%s</font></td>
+ printf('<td>%s<br />%s</td>
<td>%s</td>
<td>%s</td>
<td>%s</td>
@@ -395,7 +395,7 @@
echo '</select></td>';
echo '</tr></table><br />
- <div class="centre"><input tabindex="7" type="submit" name="submit" value="'. _('Enter Information') .'" /></div>';
+ <div class="centre"><button tabindex="7" type="submit" name="submit">'. _('Enter Information') .'</button></div><br />';
echo '</form>';
include('includes/footer.inc');
Modified: trunk/BankMatching.php
===================================================================
--- trunk/BankMatching.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/BankMatching.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -149,7 +149,7 @@
echo '</table>
<br />
<div class="centre">
- <input tabindex="6" type="submit" name="ShowTransactions" value="' . _('Show selected') . ' ' . $TypeName . '" />
+ <button tabindex="6" type="submit" name="ShowTransactions">' . _('Show selected') . ' ' . $TypeName . '</button>
<p>
<a href="' . $rootpath . '/BankReconciliation.php">' . _('Show reconciliation') . '</a>
</p>
@@ -330,8 +330,8 @@
<br />
<div class="centre">
<input type="hidden" name="RowCounter" value="' . $i . '" />
- <input type="submit" name="Update" value="' . _('Update Matching') . '" />
- </div>';
+ <button type="submit" name="Update">' . _('Update Matching') . '</button>
+ </div><br />';
}
echo '</form>';
include('includes/footer.inc');
Modified: trunk/BankReconciliation.php
===================================================================
--- trunk/BankReconciliation.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/BankReconciliation.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -123,7 +123,7 @@
include ('includes/GLPostings.inc');
-echo '</table><br /><div class="centre"><input type="submit" tabindex="2" name="ShowRec" value="' . _('Show bank reconciliation statement') . '"></div><br />';
+echo '</table><br /><div class="centre"><button type="submit" tabindex="2" name="ShowRec">' . _('Show bank reconciliation statement') . '</button></div><br />';
if (isset($_POST['ShowRec']) OR isset($_POST['DoExchangeDifference'])){
@@ -323,7 +323,7 @@
echo '<input type="hidden" name="DoExchangeDifference" value="' . $FXStatementBalance . '" />';
echo '<tr><td colspan="6">' . _('Enter the actual bank statement balance') . ' (' . $BankCurrCode . ')</b></td>
<td class="number"><input type="text" name="BankStatementBalance" maxlength="15" size="15" value="' . $_POST['BankStatementBalance'] . '" /><td></tr>';
- echo '<tr><td colspan="7" align="center"><input type="submit" name="PostExchangeDifference" value="' . _('Calculate and Post Exchange Difference') . '" onclick="return confirm(\'' . _('This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency') . ' - ' . _('Are You Sure?') . '\');" /></td></tr>';
+ echo '<tr><td colspan="7" align="center"><button type="submit" name="PostExchangeDifference" onclick="return confirm(\'' . _('This will create a general ledger journal to write off the exchange difference in the current balance of the account. It is important that the exchange rate above reflects the current value of the bank account currency') . ' - ' . _('Are You Sure?') . '\');">' . _('Calculate and Post Exchange Difference') . '</button></td></tr>';
}
@@ -333,7 +333,7 @@
echo '<tr><td colspan="7"><hr></td></tr>
<tr><td colspan="7">' . _('It is normal for foreign currency accounts to have exchange differences that need to be reflected as the exchange rate varies. This reconciliation is prepared using the exchange rate set up in the currencies table (see the set-up tab). This table must be maintained with the current exchange rate before running the reconciliation. If you wish to create a journal to reflect the exchange difference based on the current exchange rate to correct the reconciliation to the actual bank statement balance click below.') . '</td></tr>';
- echo '<tr><td colspan="7" align="center"><input type="submit" name="DoExchangeDifference" value="' . _('Calculate and Post Exchange Difference') . '" /></td></tr>';
+ echo '<tr><td colspan="7" align="center"><button type="submit" name="DoExchangeDifference">' . _('Calculate and Post Exchange Difference') . '</button></td></tr>';
}
echo '</table>';
}
Modified: trunk/ConfirmDispatch_Invoice.php
===================================================================
--- trunk/ConfirmDispatch_Invoice.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/ConfirmDispatch_Invoice.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -625,7 +625,7 @@
if ($NegativesFound){
echo '<div class="centre">
- <button type="submit" name=Update>' . _('Update'). '</button></div>';
+ <button type="submit" name="Update">' . _('Update'). '</button></div>';
include('includes/footer.inc');
exit;
}
Modified: trunk/CopyBOM.php
===================================================================
--- trunk/CopyBOM.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/CopyBOM.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -161,7 +161,7 @@
echo '</select>';
}
echo '</table>';
- echo '<br /><div class="centre"><button type="submit" name="Submit" value="" />' , _('Submit') . '</button></div><br /></form>';
+ echo '<br /><div class="centre"><button type="submit" name="Submit">' , _('Submit') . '</button></div><br /></form>';
include('includes/footer.inc');
}
Modified: trunk/DeliveryDetails.php
===================================================================
--- trunk/DeliveryDetails.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/DeliveryDetails.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -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><button type="submit" name="Update" value="" />' . _('Recalc Freight Cost') . '</button></td></tr>';
+ echo '<td><button type="submit" name="Update">' . _('Recalc Freight Cost') . '</button></td></tr>';
}
if ((!isset($_POST['ShipVia']) OR $_POST['ShipVia']=='') AND isset($_SESSION['Items'.$identifier]->ShipVia)){
Modified: trunk/PcTypeTabs.php
===================================================================
--- trunk/PcTypeTabs.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/PcTypeTabs.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -122,7 +122,7 @@
echo '<br />';
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'], ENT_QUOTES, 'UTF-8') . '">';
echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';
- echo '<br /><div class="centre"><button type="submit" name=return value="' . _('Return to list of tab types') . '" /></button></div>';
+ echo '<br /><div class="centre"><button type="submit" name="return">' . _('Return to list of tab types') . '</button></div>';
echo '</form>';
include('includes/footer.inc');
exit;
Modified: trunk/SelectCustomer.php
===================================================================
--- trunk/SelectCustomer.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/SelectCustomer.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -317,7 +317,7 @@
$result = DB_query($sql, $db);
if (DB_num_rows($result) <> 0) {
echo '<br /><div class="centre"><img src="' . $rootpath . '/css/' . $theme . '/images/note_add.png" title="' . _('Customer Notes') . '" alt="" />' . ' ' . _('Customer Notes') . '</div><br />';
- echo '<table width="45%" class+"selection">';
+ echo '<table width="45%" class="selection">';
echo '<tr>
<th>' . _('date') . '</th>
<th>' . _('note') . '</th>
Modified: trunk/SelectOrderItems.php
===================================================================
--- trunk/SelectOrderItems.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/SelectOrderItems.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -661,7 +661,7 @@
echo '</tr>';
echo '</table>';
echo '<br /><div class="centre"><button tabindex="4" type="submit" name="SearchCust">' . _('Search Now') . '</button>';
- echo '<button tabindex="5" type="submit" value="" />' . _('Reset') . '</button></div>';
+ echo '<button tabindex="5" type="submit">' . _('Reset') . '</button></div>';
if (isset($result_CustSelect)) {
@@ -1966,7 +1966,7 @@
}
echo '<script type="text/javascript">if (document.SelectParts) {defaultControl(document.SelectParts.part_1);}</script>';
- echo '</table><br /><div class="centre"><button type="submit" name="QuickEntry" value="" />' . _('Quick Entry') . '</button>
+ echo '</table><br /><div class="centre"><button type="submit" name="QuickEntry">' . _('Quick Entry') . '</button>
<button type="submit" name="PartSearch">' . _('Search Parts') . '</button></div>';
} elseif (isset($_POST['SelectAsset'])){
@@ -1986,7 +1986,7 @@
echo '<option value="' . $AssetRow['assetid'] . '">' . $AssetRow['assetid'] . ' - ' . $AssetRow['description'] . '</option>';
}
echo '</select></td></tr></table>
- <br /><div class="centre"><button type="submit" name="AssetDisposalEntered" value="" />' . _('Add Asset To Order') . '</button>
+ <br /><div class="centre"><button type="submit" name="AssetDisposalEntered">' . _('Add Asset To Order') . '</button>
<button type="submit" name="PartSearch">' . _('Search Parts') . '</button></div>';
} //end of if it is a Quick Entry screen/part search or asset selection form to display
Modified: trunk/SelectSalesOrder.php
===================================================================
--- trunk/SelectSalesOrder.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/SelectSalesOrder.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -592,7 +592,7 @@
$k++;
}
- printf('<td><button type="submit" name="SelectedStockItem" value="%s">%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>
@@ -974,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">
- <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>';
+ <button type="submit" name="PlacePO" 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/Shippers.php
===================================================================
--- trunk/Shippers.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/Shippers.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -190,7 +190,7 @@
</table>
- <br /><div class="centre"><button type="submit" name="submit" value="'. _('Enter Information').'" /></button></div>
+ <br /><div class="centre"><button type="submit" name="submit">'. _('Enter Information').'</button></div>
</form>';
Modified: trunk/SpecialOrder.php
===================================================================
--- trunk/SpecialOrder.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/SpecialOrder.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -741,7 +741,7 @@
<br />
<button type="submit" name="Cancel">' . _('Start Again') . '</button>
<br />
- <button type="submit" name="Commit" value="" />' . _('Process This Order') . '</button>
+ <button type="submit" name="Commit">' . _('Process This Order') . '</button>
</div>
</form>';
Modified: trunk/SupplierAllocations.php
===================================================================
--- trunk/SupplierAllocations.php 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/SupplierAllocations.php 2012-05-03 13:40:22 UTC (rev 8770)
@@ -529,7 +529,7 @@
echo '<div class="centre"><input type="hidden" name="TotalNumberOfAllocs" value="' . $Counter . '" />';
echo '<br /><button type="submit" name="RefreshAllocTotal">' . _('Recalculate Total To Allocate') . '</button>';
- echo '<button type="submit" name="UpdateDatabase">' . _('Process Allocations') . '</button></div></button>';
+ echo '<button type="submit" name="UpdateDatabase">' . _('Process Allocations') . '</button></div>';
} elseif(isset($_GET['SupplierID'])){
Modified: trunk/css/silverwolf/default.css
===================================================================
--- trunk/css/silverwolf/default.css 2012-05-03 08:52:24 UTC (rev 8769)
+++ trunk/css/silverwolf/default.css 2012-05-03 13:40:22 UTC (rev 8770)
@@ -601,10 +601,12 @@
.main_menu_unselected {
background: #aaa;
border: 1px solid #777;
+ border-radius: 5px;
/* position: relative; it's not a div but a table */
text-align: center;
white-space: nowrap;
height: 16pt;
+ margin-bottom: 10px;
}
.main_menu_unselected:hover {
@@ -623,6 +625,7 @@
.main_menu_selected {
background: #241D1D;
border: 1px solid #888;
+ border-radius: 5px;
/* position: relative; it's not a div but a table */
text-align: center;
white-space: nowrap;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
